Merge branch 'master' into test-playwright

- Added editing to test
- Added variables for other values

CHANGELOG.md

@@ -6,9 +6,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 
-## ?
+## [0.3.21] - 2024.08.24
 ### Added
-- Send list of contacts to someone
+- Send list of contacts to someone.
+- Prompt for name in pop-up, and send to different contact-sharing screens.
 ### Changed
 - Moved contact actions from list onto detail page
 

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.21-beta",
+  "version": "0.3.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "TimeSafari",
-      "version": "0.3.21-beta",
+      "version": "0.3.21",
       "dependencies": {
         "@dicebear/collection": "^5.4.1",
         "@dicebear/core": "^5.4.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.21-beta",
+  "version": "0.3.21",
   "scripts": {
     "dev": "vite",
     "serve": "vite preview",

playwright.config-local.ts

@@ -74,7 +74,7 @@ export default defineConfig({
 
   /* Configure global timeout; default is 30000 milliseconds */
   // the image upload will often not succeed at 5 seconds
-  timeout: 20000,
+  // timeout: 5000,
 
   /* Run your local dev server before starting the tests */
   /**

src/App.vue

@@ -180,8 +180,9 @@
                   "
                   class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
                 >
-                  Yes
-                  {{ notification.yesText ? ", " + notification.yesText : "" }}
+                  Yes{{
+                    notification.yesText ? ", " + notification.yesText : ""
+                  }}
                 </button>
 
                 <button
@@ -193,7 +194,7 @@
                   "
                   class="block w-full text-center text-md font-bold uppercase bg-yellow-600 text-white px-2 py-2 rounded-md mb-2"
                 >
-                  No {{ notification.noText ? ", " + notification.noText : "" }}
+                  No{{ notification.noText ? ", " + notification.noText : "" }}
                 </button>
 
                 <label

src/components/ImageMethodDialog.vue

@@ -6,7 +6,7 @@
           id="ViewHeading"
           class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-0.5 bg-black/50 text-white leading-none"
         >
-          Camera or Other?
+          Add Photo
         </div>
         <div
           class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"

src/components/UserNameDialog.vue

@@ -0,0 +1,96 @@
+<template>
+  <div v-if="visible" class="dialog-overlay">
+    <div class="dialog">
+      <h1 class="text-xl font-bold text-center mb-4">Set Your Name</h1>
+
+      Note that this is not sent to servers. It is only shared with people when
+      you choose to send it to them.
+      <input
+        type="text"
+        placeholder="Name"
+        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+        v-model="givenName"
+      />
+
+      <div class="mt-8">
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+          <button
+            type="button"
+            class="block w-full text-center text-lg font-bold uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
+            @click="onClickSaveChanges()"
+          >
+            Save
+          </button>
+          <!-- SHOW ME instead while processing saving changes -->
+          <button
+            type="button"
+            class="block w-full text-center text-md uppercase bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2"
+            @click="onClickCancel()"
+          >
+            Cancel
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component } from "vue-facing-decorator";
+
+import { NotificationIface } from "@/constants/app";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+
+@Component
+export default class UserNameDialog extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  callback: (string?) => void = () => {};
+  givenName = "";
+  visible = false;
+
+  async open(aCallback?: (name?: string) => void) {
+    this.callback = aCallback || this.callback;
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    this.givenName = settings?.firstName || "";
+    this.visible = true;
+  }
+
+  async onClickSaveChanges() {
+    await db.settings.update(MASTER_SETTINGS_KEY, {
+      firstName: this.givenName,
+    });
+    this.visible = false;
+    this.callback(this.givenName);
+  }
+
+  onClickCancel() {
+    this.visible = false;
+  }
+}
+</script>
+
+<style>
+.dialog-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  padding: 1.5rem;
+}
+
+.dialog {
+  background-color: white;
+  padding: 1rem;
+  border-radius: 0.5rem;
+  width: 100%;
+  max-width: 500px;
+}
+</style>

src/constants/app.ts

@@ -49,8 +49,8 @@ export interface NotificationIface {
   title: string;
   text?: string;
   noText?: string;
-  onCancel?: (stopAsking: boolean) => Promise<void>;
-  onNo?: (stopAsking: boolean) => Promise<void>;
+  onCancel?: (stopAsking?: boolean) => Promise<void>;
+  onNo?: (stopAsking?: boolean) => Promise<void>;
   onYes?: () => Promise<void>;
   promptToStopAsking?: boolean;
   yesText?: string;

src/libs/endorserServer.ts

@@ -1,13 +1,16 @@
 import { Axios, AxiosRequestConfig, AxiosResponse } from "axios";
+import { Buffer } from "buffer";
+import { sha256 } from "ethereum-cryptography/sha256";
 import { LRUCache } from "lru-cache";
 import * as R from "ramda";
 
 import { DEFAULT_IMAGE_API_SERVER } from "@/constants/app";
 import { Contact } from "@/db/tables/contacts";
-import { accessToken } from "@/libs/crypto";
+import { accessToken, deriveAddress, nextDerivationPath } from "@/libs/crypto";
 import { NonsensitiveDexie } from "@/db/index";
 import { getAccount, getPasskeyExpirationSeconds } from "@/libs/util";
 import { createEndorserJwtForKey, KeyMeta } from "@/libs/crypto/vc";
+import { Account } from "@/db/tables/accounts";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 // the object in RegisterAction claims
@@ -925,6 +928,53 @@ export async function createAndSubmitClaim(
   }
 }
 
+export async function generateEndorserJwtForAccount(
+  account: Account,
+  isRegistered?: boolean,
+  name?: string,
+  profileImageUrl?: string,
+) {
+  const publicKeyHex = account.publicKeyHex;
+  const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
+
+  interface UserInfo {
+    name: string;
+    publicEncKey: string;
+    registered: boolean;
+    profileImageUrl?: string;
+    nextPublicEncKeyHash?: string;
+  }
+  const contactInfo = {
+    iat: Date.now(),
+    iss: account.did,
+    own: {
+      name: name ?? "",
+      publicEncKey,
+      registered: !!isRegistered,
+    } as UserInfo,
+  };
+  if (profileImageUrl) {
+    contactInfo.own.profileImageUrl = profileImageUrl;
+  }
+
+  if (account?.mnemonic && account?.derivationPath) {
+    const newDerivPath = nextDerivationPath(account.derivationPath as string);
+    const nextPublicHex = deriveAddress(
+      account.mnemonic as string,
+      newDerivPath,
+    )[2];
+    const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
+    const nextPublicEncKeyHash = sha256(nextPublicEncKey);
+    const nextPublicEncKeyHashBase64 =
+      Buffer.from(nextPublicEncKeyHash).toString("base64");
+    contactInfo.own.nextPublicEncKeyHash = nextPublicEncKeyHashBase64;
+  }
+  const vcJwt = await createEndorserJwtForDid(account.did, contactInfo);
+
+  const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
+  return viewPrefix + vcJwt;
+}
+
 export async function createEndorserJwtForDid(
   issuerDid: string,
   payload: object,

src/router/index.ts

@@ -189,6 +189,11 @@ const routes: Array<RouteRecordRaw> = [
     name: "seed-backup",
     component: () => import("../views/SeedBackupView.vue"),
   },
+  {
+    path: "/share-my-contact-info",
+    name: "share-my-contact-info",
+    component: () => import("@/views/ShareMyContactInfoView.vue"),
+  },
   {
     path: "/shared-photo",
     name: "shared-photo",

src/views/AccountViewView.vue

@@ -5,11 +5,11 @@
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-4">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light">
       Your Identity
     </h1>
 
-    <div class="flex justify-between">
+    <div class="flex justify-between mb-2 mt-4">
       <span />
       <span class="whitespace-nowrap">
         <router-link
@@ -55,14 +55,17 @@
       </div>
       <span
         v-else
-        class="block w-full text-center text-md bg-amber-200 text-blue-500 uppercase border border-dashed border-slate-400 px-1.5 py-2 rounded-md mb-2"
+        class="block w-full text-center text-md bg-amber-200 border border-dashed border-slate-400 px-1.5 py-2 rounded-md mb-2"
       >
-        <router-link
-          :to="{ name: 'new-edit-account' }"
-          class="inline-block text-md bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
+        <button
+          @click="
+            () => $refs.userNameDialog.open((name) => (this.givenName = name))
+          "
+          class="inline-block text-md uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
         >
           Set Your Name
-        </router-link>
+        </button>
+        <UserNameDialog ref="userNameDialog" />
       </span>
       <div class="flex justify-center mt-4">
         <span v-if="profileImageUrl" class="flex justify-between">
@@ -129,7 +132,10 @@
       </div>
 
       <div class="text-slate-500 text-sm font-bold">ID</div>
-      <div class="text-sm text-slate-500 flex justify-start items-center mb-1">
+      <div
+        class="text-sm text-slate-500 flex justify-start items-center mb-1"
+        data-testId="didWrapper"
+      >
         <code class="truncate">{{ activeDid }}</code>
         <button
           @click="
@@ -717,6 +723,7 @@ import EntityIcon from "@/components/EntityIcon.vue";
 import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
+import UserNameDialog from "@/components/UserNameDialog.vue";
 import {
   AppString,
   DEFAULT_IMAGE_API_SERVER,
@@ -747,7 +754,13 @@ import { getAccount } from "@/libs/util";
 const inputImportFileNameRef = ref<Blob>();
 
 @Component({
-  components: { EntityIcon, ImageMethodDialog, QuickNav, TopMessage },
+  components: {
+    EntityIcon,
+    ImageMethodDialog,
+    QuickNav,
+    TopMessage,
+    UserNameDialog,
+  },
 })
 export default class AccountViewView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;

src/views/ContactQRScanShowView.vue

@@ -1,5 +1,5 @@
 <template>
-  <QuickNav selected="Profile"></QuickNav>
+  <QuickNav selected="Profile" />
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Breadcrumb -->
@@ -25,13 +25,16 @@
         <span class="text-red">Beware!</span>
         You aren't sharing your name, so quickly
         <br />
-        <router-link
-          :to="{ name: 'new-edit-account' }"
+        <span
+          @click="
+            () => $refs.userNameDialog.open((name) => (this.givenName = name))
+          "
           class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-1 rounded-md"
         >
           click here to set it for them.
-        </router-link>
+        </span>
       </p>
+      <UserNameDialog ref="userNameDialog" />
     </div>
 
     <div
@@ -50,7 +53,7 @@
         class="flex justify-center"
       />
       <span>
-        Click this or QR code to copy your contact URL to your clipboard.
+        Click the QR code to copy your contact info to your clipboard.
       </span>
     </div>
     <div v-else-if="activeDid" class="text-center">
@@ -96,6 +99,7 @@ import { QrcodeStream } from "vue-qrcode-reader";
 import { useClipboard } from "@vueuse/core";
 
 import QuickNav from "@/components/QuickNav.vue";
+import UserNameDialog from "@/components/UserNameDialog.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
@@ -109,6 +113,7 @@ import {
   CONTACT_URL_PREFIX,
   createEndorserJwtForDid,
   ENDORSER_JWT_URL_LOCATION,
+  generateEndorserJwtForAccount,
   isDid,
   register,
   setVisibilityUtil,
@@ -120,6 +125,7 @@ import { ETHR_DID_PREFIX } from "@/libs/crypto/vc";
     QrcodeStream,
     QRCodeVue3,
     QuickNav,
+    UserNameDialog,
   },
 })
 export default class ContactQRScanShow extends Vue {
@@ -157,7 +163,7 @@ export default class ContactQRScanShow extends Vue {
         own: {
           name:
             (settings?.firstName || "") +
-            (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
+            (settings?.lastName ? ` ${settings.lastName}` : ""), // lastName is deprecated, pre v 0.1.3
           publicEncKey,
           profileImageUrl: settings?.profileImageUrl,
           registered: settings?.isRegistered,
@@ -182,7 +188,18 @@ export default class ContactQRScanShow extends Vue {
       const vcJwt = await createEndorserJwtForDid(this.activeDid, contactInfo);
 
       const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
-      this.qrValue = viewPrefix + vcJwt;
+      viewPrefix + vcJwt;
+
+      const name =
+        (settings?.firstName || "") +
+        (settings?.lastName ? ` ${settings.lastName}` : ""); // lastName is deprecated, pre v 0.1.3
+
+      this.qrValue = await generateEndorserJwtForAccount(
+        account,
+        !!settings?.isRegistered,
+        name,
+        settings?.profileImageUrl as string,
+      );
     }
   }
 

src/views/ContactsView.vue

@@ -4,11 +4,11 @@
 
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light">
       Your Contacts
     </h1>
 
-    <div class="flex justify-between py-2">
+    <div class="flex justify-between py-2 mt-8">
       <span />
       <span>
         <a
@@ -1128,8 +1128,8 @@ export default class ContactsView extends Vue {
       this.contactsSelected.includes(c.did),
     );
     const message =
-      "To add contacts, paste this into the box on the 'People' screen.\n\n" +
-      JSON.stringify(selectedContacts, null, 2);
+      "To add contacts, paste this into the box on the 'Contacts' screen.\n\n" +
+      JSON.stringify(selectedContacts);
     useClipboard()
       .copy(message)
       .then(() => {
@@ -1138,7 +1138,7 @@ export default class ContactsView extends Vue {
             group: "alert",
             type: "info",
             title: "Copied",
-            text: "Those contacts were copied to the clipboard. Have them paste it in the box on their 'People' screen.",
+            text: "Those contacts were copied to the clipboard. Have them paste it in the box on their 'Contacts' screen.",
           },
           5000,
         );

src/views/DiscoverView.vue

@@ -1,16 +1,20 @@
 <template>
-  <QuickNav selected="Discover"></QuickNav>
+  <QuickNav selected="Discover" />
   <TopMessage />
 
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light">
       Discover Projects
     </h1>
 
     <!-- Quick Search -->
-    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="searchSelected()">
+    <div
+      id="QuickSearch"
+      class="mt-8 mb-4 flex"
+      v-on:keyup.enter="searchSelected()"
+    >
       <input
         type="text"
         v-model="searchTerms"
@@ -181,6 +185,8 @@ export default class DiscoverView extends Vue {
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
 
+    this.searchTerms = (this.$route as Router).query["searchText"] || "";
+
     if (this.searchBox) {
       await this.searchLocal();
     } else {

src/views/HelpView.vue

@@ -24,50 +24,181 @@
     <!-- eslint-disable prettier/prettier -->
     <div>
       <p>
-        This app focuses on gifts & gratitude, using them to build cool things with your network.
+        This app focuses on gifts & gratitude, using them to build cool things together with your network.
       </p>
 
       <h2 class="text-xl font-semibold">What is the idea here?</h2>
       <p>
-        We are building networks of people who want to grow a giving society.
-        First of all, let's build gratitude: see what people have given, and recognize
+        We are building networks of people who want to grow good society from the ground up, using modern
+        technology that connects people peer-to-peer.
+        First of all, let's showcase gratitude: see what people have given, and recognize
         gifts you've seen. This is done in a way that leaves a permanent record -- one that
-        came from you, and one that the recipient can prove it was for them. This is
+        came from you, and one that the recipient can prove it was for them. This can be
         personally gratifying, but it extends to broader work: volunteers get
-        confirmation of activity, and selectively show off their contributions
+        confirmation of activity, and they can selectively show off their contributions
         and network.
       </p>
-      <p>
-        With this, you highlight giving and also offer help --
-        which could be conditional on others' willingness to help, too.
+      <p class="mt-2">
+        With this, you highlight giving and you also offer help --
+        which could be conditional on others' contributions, too.
         You can record your own ideas and invite others to collaborate.
+        It's a way to organize & build with the resource that everyone has in equal amounts: time.
       </p>
-      <p>
-        This app uses the power of cryptography to build a reputation, recording
-        activity that you can share at your discretion. You put some activity
-        public, but these services don't share your ID with others without explicit consent.
-        This is in contrast to Meta and Google, who hold
-        your data and allow you use it while they manage sharing...
-        those services are useful but they have the control, whereas this app gives you the control.
+      <p class="mt-2">
+        Note that your personal data is safe: your ID is only shared with those you allow. Neither
+        your name nor your contacts' names are shared with anyone -- even our servers --
+        though you can explicitly share it with other individuals if you choose.
       </p>
 
+      <h2 class="text-xl font-semibold">I want to know more because...</h2>
+      <ul class="list-disc list-outside ml-4">
+        <li class="p-2">
+          <div @click="showAlpha = !showAlpha" class="text-blue-500">... I'm a member of Alpha chat.</div>
+          <div v-if="showAlpha">
+            <p>
+              This is a project for public benefit. You are invited to add your gratitude
+              and propose projects on a distributable ledger.
+            </p>
+            <p>
+              The underlying data is on a merkle tree with each verifiable claim, signature and all.
+              The chain includes individual IDs for discovery & visibility, so not all data is distributed -- yet.
+              The goal is to eventually distribute the data on people's devices with their chosen network,
+              where anyone could host their own chain of provenance if they choose.
+              The formats follow standard schemas (eg. schema.org) to encourage interoperability.
+              We're currently at the beginning phase where we're trusting the server to keep IDs private.
+              It's all open-source, and we expect to have a professional audit someday.
+            </p>
+            <p>
+              A person's network of contacts is similar: the server currently knows some of the links between people
+              to allow discovery and visibility. However, even that will be manageable on personal devices someday.
+            </p>
+            <p>
+              There are no tokens to maintain the chain: the purpose is to create software that communities
+              and activists can easily join and use. We're betting that this is a case where network
+              participants have the motivation to run the software. The protocol is meant to be lightweight enough that
+              non-technical people can run it on inexpensive devices they already own. There may be cases for
+              MPC or ZKP in the future when they are more widespread and standard,
+              but our preference is to engineer as simply as possible with "white-magic" cryptography
+              over those "black-magic" functions.
+            </p>
+            <p>
+              Let's make real distributed computing and shared data happen, starting with our own small networks.
+            </p>
+            <p>
+              ... and exemplify the fun along the way.
+            </p>
+          </div>
+        </li>
+        <li class="p-2">
+          <div @click="showGroup = !showGroup" class="text-blue-500">... I want to find a group I'll enjoy working with.</div>
+          <div v-if="showGroup">
+            <p>
+              This app encourages people to offer small bits of time to one another. It's a way to
+              run experiments with other people... tests of working together, which can start small
+              and easy but build into cooperation with people who are like-minded and who work well together.
+            </p>
+            <p>
+              Search the projects and place an offer on an interesting one
+              -- or create your own project and see who offers to help.
+              After your first experiment, you can give and get confirmation about the work, which you might choose
+              to show to future contacts.
+            </p>
+          </div>
+        </li>
+        <li class="p-2">
+          <div @click="showCommunity = !showCommunity" class="text-blue-500">... I want to participate in community projects.</div>
+          <div v-if="showCommunity">
+            <p>
+              These are mostly at the beginning stages, so any of them will appreciate your offers that show interest.
+              In fact, your offers can include your preferences, which give the project owners indications of how to proceed.
+            </p>
+            <p>
+              Search through the projects for issues of interest, locally as well as globally.
+              If you don't see any projects that interest you, create your own and see what kind of offers you get.
+            </p>
+          </div>
+        </li>
+        <li class="p-2">
+          <div @click="showVerifiable = !showVerifiable" class="text-blue-500">... I want to build with verifiable, private data.</div>
+          <div v-if="showVerifiable">
+            <p>
+              Make your claims and get others to confirm them. Then you can use the API to pull your copy of all that
+              data, both claims from you and claims from others about you. These are hard-and-fast credentials that can
+              be shown to others, along with their verifiable time and signature.
+            </p>
+            <p>
+              Furthermore, you can use your network to verify claims by other people, even if they haven't given you
+              visibility. First, on the claim screen you can see if the server detects anyone who is a direct link
+              between you, so you can reach out to those in-between people for more info. If there isn't anyone
+              who is directly in between then you can reach out with a message to your network.
+            </p>
+            <p>
+              This app generated an identifier, based on public & private keys located on your device.
+              That ID is only shared with our server and with people you explicitly allow.
+              The other information -- like gratitude and contributions and projects --
+              are published to a server that protects your ID. (Someday, your devices
+              will share directly P2P and not need a server... you can choose your levels
+              of discovery and privacy.) What this means is that you are in charge of your
+              network, and we provide tools and reporting to help you connect with your network for
+              references and reputation.
+            </p>
+          </div>
+        </li>
+        <li class="p-2">
+          <div @click="showGovernance = !showGovernance" class="text-blue-500">... I want to build governance organically.</div>
+          <div v-if="showGovernance">
+            <p>
+              This requires motivated, dedicated citizens. The good thing is that dedication the primary ingredient;
+              add coordination and we can find ways to replace monopolistic systems.
+            </p>
+            <p>
+              Add projects for your main areas of interest, and offer commitments to projects to kick-start some initiatives.
+            </p>
+            <p>
+              One other feature worth emphasizing: you build a history of credentials, ones that are verifiably
+              yours. But one other good thing is that you get support from those who confirm your activity.
+              You can share this support in a way that others can validate the data for themselves from people
+              in their own network. This kind of reputable project and history of performance is good evidence
+              for your ability to take responsibility for important initiatives.
+            </p>
+          </div>
+        </li>
+        <li class="p-2">
+          <div @click="showBasics = !showBasics" class="text-blue-500">... I want to supply life's basics freely.</div>
+          <div v-if="showBasics">
+            <p>
+              This platform is not optimal for balancing needs and resources at this point,
+              but we continuously seek out and list
+              those kinds of projects. Watch our blog, and watch the project list for words like
+              <router-link class="text-blue-500" to="/discover?searchText=sharing">"sharing"</router-link>
+              or
+              <router-link class="text-blue-500" to="/discover?searchText=basic">"basic"</router-link>
+              or
+              <router-link class="text-blue-500" to="/discover?searchText=free">"free"</router-link>.
+            </p>
+          </div>
+        </li>
+      </ul>
+
       <h2 class="text-xl font-semibold">How do I get started?</h2>
       <p>
-        You need someone to register you, like the person who told you
-        about this app, on the Contacts <fa icon="users" class="fa-fw" /> page.
+        Someone -- like the person who told you about this app -- needs to register you
+        on the Contacts <fa icon="users" class="fa-fw" /> page.
         If you heard about this from our outreach, feel free to contact us (below) for a chat.
-        After someone registers you, you can
-        select any contact on the home page (or "anonymous") and record your
-        appreciation for... whatever. The main goal is to record what people
-        have given you, to grow giving economies. You can also record your own
-        ideas for projects. Each claim is recorded on a
-        custom ledger. The day after being registered, you'll be able to able to
-        register others, too.
+        After someone registers you, you can register others.
       </p>
       <p>
+        Then you can record your appreciation for... whatever: select any contact on the home page
+        (or "Unnamed") and send it. The main goal is to record what people
+        have given you, to grow giving economies. You can also record your own
+        ideas for projects. Each claim is recorded on a
+        custom ledger.
+      </p>
+      <p>
+        The day after being registered, you'll be able to able to register others, too.
         Note that there are limits to how many others you can register.
         Take your time to bring people on... make it an opportunity to get to
-        know their projects, and to show your own.
+        know their projects, and to show off your own.
       </p>
 
       <h2 class="text-xl font-semibold">How do I add someone else?</h2>
@@ -95,7 +226,7 @@
       <h2 class="text-xl font-semibold">How do I backup all my data?</h2>
       <p>
         There are four sets of data to backup: the identifier secrets;
-        the private text data that isn't quite as secret such as settings and contacts;
+        the private text data that isn't as sensitive such as settings and contacts;
         the private image for yourself; and the data that you have sent to the public.
       </p>
 
@@ -185,15 +316,14 @@
 
       <h2 class="text-xl font-semibold">How do I create another identity?</h2>
       <p>
-        Before doing this, note that it is an advanced feature that affects
-        functionality (eg. the words "Alt ID" next to results, backup features)
-        so beware. You can
+        Before doing this, beware that it is an advanced feature that affects
+        functionality (eg. the words "Alt ID" next to results, backup features). You can
         <router-link to="start" class="text-blue-500">
           create another identity here.
         </router-link>
       </p>
 
-      <h2 class="text-xl font-semibold">How do I erase my data?</h2>
+      <h2 class="text-xl font-semibold">How do I erase my data from my device?</h2>
       <p>
         Before doing this, you may want to back up your data with the instructions above.
       </p>
@@ -401,7 +531,7 @@
       <p>{{ package.version }} ({{ commitHash }})</p>
 
       <h2 class="text-xl font-semibold">
-        For any other questions, like getting a new account or removing all your data from the public ledger:
+        I have other questions, like getting a new account or removing all my data from the public ledger.
       </h2>
       <p>
         Contact us at
@@ -428,7 +558,13 @@ export default class Help extends Vue {
 
   package = Package;
   commitHash = import.meta.env.VITE_GIT_HASH;
+  showAlpha = false;
+  showBasics = false;
+  showCommunity = false;
+  showGovernance = false;
+  showGroup = false;
   showDidCopy = false;
+  showVerifiable = false;
 
   // call fn, copy text to the clipboard, then redo fn after 2 seconds
   doCopyTwoSecRedo(text: string, fn: () => void) {

src/views/HomeView.vue

@@ -4,14 +4,14 @@
 
   <!-- CONTENT -->
   <section id="Content" class="p-2 pb-24 max-w-3xl mx-auto">
-    <h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-8">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light mb-8">
       {{ AppString.APP_NAME }}
     </h1>
 
-    <!-- prompt to install notifications -->
-    <div class="mb-8">
+    <!-- prompt to install notifications with notificationsSupported, which we're making an advanced feature -->
+    <div class="mb-8 mt-8">
       <div
-        v-if="!notificationsSupported()"
+        v-if="false"
         class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
       >
         <p style="display: inline; align-items: center">
@@ -86,13 +86,16 @@
           >
             <!-- activeDid && !isRegistered -->
             To share, someone must register you.
-            <router-link
-              :to="{ name: 'contact-qr' }"
-              class="block text-center text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
-            >
-              Show Them {{ PASSKEYS_ENABLED ? "Default" : "Your" }} Identifier
-              Info
-            </router-link>
+            <div class="block text-center">
+              <button
+                @click="showNameDialog()"
+                class="text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
+              >
+                Show them {{ PASSKEYS_ENABLED ? "default" : "your" }} identifier
+                info
+              </button>
+            </div>
+            <UserNameDialog ref="userNameDialog" />
             <div v-if="PASSKEYS_ENABLED" class="flex justify-end w-full">
               <router-link
                 :to="{ name: 'start' }"
@@ -107,12 +110,20 @@
             <!-- activeDid && isRegistered -->
 
             <!-- show the actions for recognizing a give -->
-            <div class="mb-4">
+            <div class="flex justify-between">
               <h2 class="text-xl font-bold">Record Something Given By:</h2>
+              <div class="flex justify-end">
+                <button
+                  @click="openGiftedPrompts()"
+                  class="block text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
+                >
+                  Ideas...
+                </button>
+              </div>
             </div>
 
             <ul
-              class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
+              class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mt-4"
             >
               <li @click="openDialog()">
                 <img
@@ -126,7 +137,7 @@
                 </h3>
               </li>
               <li
-                v-for="contact in allContacts.slice(0, 7)"
+                v-for="contact in allContacts.slice(0, 6)"
                 :key="contact.did"
                 @click="openDialog(contact)"
               >
@@ -141,23 +152,16 @@
                   {{ contact.name || contact.did }}
                 </h3>
               </li>
+              <li>
+                <router-link
+                  v-if="allContacts.length >= 6"
+                  :to="{ name: 'contact-gift' }"
+                  class="block text-center text-md font-bold bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+                >
+                  Choose From All Contacts
+                </router-link>
+              </li>
             </ul>
-
-            <div class="flex justify-between">
-              <router-link
-                v-if="allContacts.length >= 7"
-                :to="{ name: 'contact-gift' }"
-                class="block text-center text-md font-bold bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
-              >
-                Choose From All Contacts
-              </router-link>
-              <button
-                @click="openGiftedPrompts()"
-                class="block text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
-              >
-                Ideas...
-              </button>
-            </div>
           </div>
         </div>
       </div>
@@ -168,7 +172,7 @@
     <FeedFilters ref="feedFilters" />
 
     <!-- Results List -->
-    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mt-4 mb-4">
       <div class="flex items-center mb-4">
         <h2 class="text-xl font-bold">Latest Activity</h2>
         <button @click="openFeedFilters()" class="block text-center ml-auto">
@@ -312,6 +316,7 @@ import FeedFilters from "@/components/FeedFilters.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
+import UserNameDialog from "@/components/UserNameDialog.vue";
 import {
   AppString,
   NotificationIface,
@@ -369,6 +374,7 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
     EntityIcon,
     InfiniteScroll,
     TopMessage,
+    UserNameDialog,
   },
 })
 export default class HomeView extends Vue {
@@ -425,6 +431,7 @@ export default class HomeView extends Vue {
       this.showShortcutBvc = !!settings?.showShortcutBvc;
 
       this.isAnyFeedFilterOn = isAnyFeedFilterOn(settings);
+      console.log("getting through mounted");
 
       // someone may have have registered after sharing contact info, so recheck
       if (!this.isRegistered && this.activeDid) {
@@ -448,7 +455,7 @@ export default class HomeView extends Vue {
       }
 
       // this returns a Promise but we don't need to wait for it
-      await this.updateAllFeed();
+      this.updateAllFeed();
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
@@ -494,7 +501,7 @@ export default class HomeView extends Vue {
 
     this.feedData = [];
     this.feedPreviousOldestId = undefined;
-    this.updateAllFeed();
+    await this.updateAllFeed();
   }
 
   /**
@@ -506,7 +513,7 @@ export default class HomeView extends Vue {
     // and the InfiniteScroll component triggers a load before finished.
     // One alternative is to totally separate the project link loading.
     if (payload && !this.isFeedLoading) {
-      this.updateAllFeed();
+      await this.updateAllFeed();
     }
   }
 
@@ -526,6 +533,7 @@ export default class HomeView extends Vue {
   async updateAllFeed() {
     this.isFeedLoading = true;
     let endOfResults = true;
+    console.log("about to retrieveGives");
     await this.retrieveGives(this.apiServer, this.feedPreviousOldestId)
       .then(async (results) => {
         if (results.data.length > 0) {
@@ -619,7 +627,7 @@ export default class HomeView extends Vue {
       });
     if (this.feedData.length === 0 && !endOfResults) {
       // repeat until there's at least some data
-      this.updateAllFeed();
+      await this.updateAllFeed();
     }
     this.isFeedLoading = false;
   }
@@ -769,5 +777,36 @@ export default class HomeView extends Vue {
   computeKnownPersonIconStyleClassNames(known: boolean) {
     return known ? "text-slate-500" : "text-slate-100";
   }
+
+  showNameDialog() {
+    if (!this.givenName) {
+      (this.$refs.userNameDialog as UserNameDialog).open(() => {
+        this.promptForShareMethod();
+      });
+    } else {
+      this.promptForShareMethod();
+    }
+  }
+
+  promptForShareMethod() {
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Are you nearby with cameras?",
+        text: "If so, we'll use those with QR codes to share.",
+        onCancel: async () => {},
+        onNo: async () => {
+          (this.$router as Router).push({ name: "share-my-contact-info" });
+        },
+        onYes: async () => {
+          (this.$router as Router).push({ name: "contact-qr" });
+        },
+        noText: "we will share another way",
+        yesText: "we are nearby with cameras",
+      },
+      -1,
+    );
+  }
 }
 </script>

src/views/NewIdentifierView.vue

@@ -22,8 +22,8 @@
     </div>
 
     <div class="flex justify-center py-12">
-      <span />
-      <span v-if="loading">
+      <div />
+      <div v-if="loading">
         <span class="text-xl">Creating...&nbsp;</span>
         <fa
           icon="spinner"
@@ -31,8 +31,8 @@
           color="green"
           size="128"
         ></fa>
-      </span>
-      <span v-else>
+      </div>
+      <div v-else>
         <span class="text-xl">Created!</span>
         <fa
           icon="burst"
@@ -45,8 +45,8 @@
             --fa-beat-scale: 6;
           "
         ></fa>
-      </span>
-      <span />
+      </div>
+      <div />
     </div>
   </section>
 </template>

src/views/ProjectsView.vue

@@ -1,15 +1,13 @@
 <template>
-  <QuickNav selected="Projects"></QuickNav>
+  <QuickNav selected="Projects" />
   <TopMessage />
 
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Your Ideas
-    </h1>
+    <h1 id="ViewHeading" class="text-4xl text-center font-light">Your Ideas</h1>
 
     <!-- Result Tabs -->
-    <div class="text-center text-slate-500 border-b border-slate-300">
+    <div class="text-center text-slate-500 border-b border-slate-300 mt-8">
       <ul class="flex flex-wrap justify-center gap-4 -mb-px">
         <li>
           <a

src/views/ShareMyContactInfoView.vue

@@ -0,0 +1,123 @@
+<template>
+  <QuickNav />
+  <TopMessage />
+
+  <!-- CONTENT -->
+  <section id="Content" class="p-2 pb-24 max-w-3xl mx-auto">
+    <!-- Breadcrumb -->
+    <div>
+      <!-- Back -->
+      <div class="text-lg text-center font-light relative px-7">
+        <h1
+          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
+          @click="$router.back()"
+        >
+          <fa icon="chevron-left" class="fa-fw" />
+        </h1>
+      </div>
+
+      <!-- Heading -->
+      <h1 id="ViewHeading" class="text-4xl text-center font-light">
+        Share Your Contact Info
+      </h1>
+    </div>
+
+    <div class="flex justify-center mt-8">
+      <button
+        class="block w-fit text-center text-lg font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md"
+        @click="onClickShare()"
+      >
+        Copy to Clipboard
+      </button>
+    </div>
+    <div class="ml-12">
+      <div class="mt-8">Click to copy your info, then send it to them.</div>
+      <div>
+        They will paste it in the input box on the Contacts
+        <fa icon="users" /> screen.
+      </div>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import * as R from "ramda";
+import { Component, Vue } from "vue-facing-decorator";
+import { Router } from "vue-router";
+import { useClipboard } from "@vueuse/core";
+
+import QuickNav from "@/components/QuickNav.vue";
+import TopMessage from "@/components/TopMessage.vue";
+import { NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { generateEndorserJwtForAccount } from "@/libs/endorserServer";
+
+@Component({
+  components: { QuickNav, TopMessage },
+})
+export default class ShareMyContactInfoView extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  async onClickShare() {
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    const activeDid = settings?.activeDid || "";
+    const givenName = settings?.firstName || "";
+    const isRegistered = !!settings?.isRegistered;
+    const profileImageUrl = settings?.profileImageUrl || "";
+
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    const account = R.find((acc) => acc.did === activeDid, accounts);
+
+    const numContacts = await db.contacts.count();
+
+    if (account) {
+      const message = await generateEndorserJwtForAccount(
+        account,
+        isRegistered,
+        givenName,
+        profileImageUrl,
+      );
+      useClipboard()
+        .copy(message)
+        .then(() => {
+          this.$notify(
+            {
+              group: "alert",
+              type: "info",
+              title: "Copied",
+              text: "Your contact info was copied to the clipboard. Have them paste it in the box on their 'Contacts' screen.",
+            },
+            5000,
+          );
+          if (numContacts > 0) {
+            setTimeout(() => {
+              this.$notify(
+                {
+                  group: "alert",
+                  type: "success",
+                  title: "Share Other Contacts",
+                  text: "You may want to share some of your contacts with them. Select them below to copy and send.",
+                },
+                10000,
+              );
+            }, 3000);
+          }
+        });
+      (this.$router as Router).push({ name: "contacts" });
+    } else {
+      this.$notify(
+        {
+          group: "alert",
+          type: "error",
+          title: "Error",
+          text: "No account was found for the active DID.",
+        },
+        5000,
+      );
+    }
+  }
+}
+</script>

src/views/StartView.vue

@@ -58,6 +58,7 @@
           <a
             @click="onClickNewSeed()"
             class="block w-full text-center text-lg uppercase bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-3 rounded-md mb-2 cursor-pointer"
+            data-testId="newSeed"
           >
             Generate one with a new seed
           </a>

test-playwright/00-noid-tests.spec.ts

@@ -1,20 +1,5 @@
 import { test, expect } from '@playwright/test';
-
-test('Confirm usage of test API (may fail if you are running your own Time Safari)', async ({ page }, testInfo) => {
-  // Load account view
-  await page.goto('./account');
-  await page.getByRole('heading', { name: 'Advanced' }).click();
-
-  // look into the config file: if it starts Time Safari, it might say which server it should set by default
-  const webServer = testInfo.config.webServer;
-  const endorserWords = webServer?.command.split(' ');
-  const ENDORSER_ENV_NAME = 'VITE_DEFAULT_ENDORSER_API_SERVER';
-  const endorserTerm = endorserWords?.find(word => word.startsWith(ENDORSER_ENV_NAME + '='));
-  const endorserTermInConfig = endorserTerm?.substring(ENDORSER_ENV_NAME.length + 1);
-
-  const endorserServer = endorserTermInConfig || 'https://test-api.endorser.ch';
-  await expect(page.getByRole('textbox').nth(1)).toHaveValue(endorserServer);
-});
+import { generateEthrUser, importUser } from './testUtils';
 
 test('Check activity feed', async ({ page }) => {
   // Load app homepage
@@ -38,14 +23,6 @@ test('Check discover results', async ({ page }) => {
   await page.locator('ul#listDiscoverResults li.border-b:nth-child(20)').scrollIntoViewIfNeeded();
 });
 
-test('Check no-ID messaging in homepage', async ({ page }) => {
-  // Load app homepage
-  await page.goto('./');
-
-  // Check 'someone must register you' notice
-  await expect(page.getByText('To share, someone must register you.')).toBeVisible();
-});
-
 test('Check no-ID messaging in account', async ({ page }) => {
   // Load account view
   await page.goto('./account');
@@ -73,9 +50,66 @@ test('Check ID generation', async ({ page }) => {
   // Wait for activity feed to start loading, as a delay
   await expect(page.locator('ul#listLatestActivity li:nth-child(10)')).toBeVisible();
 
+  // Check 'someone must register you' notice
+  await expect(page.getByText('To share, someone must register you.')).toBeVisible();
+
   // Go back to Account view
   await page.goto('./account');
 
   // Check that ID is now generated
   await expect(page.locator('#sectionIdentityDetails code.truncate')).toContainText('did:ethr:');
-});
+});
+
+
+test('Check setting name & sharing info', async ({ page }) => {
+  // Load homepage to trigger ID generation (?)
+  await page.goto('./');
+  // Check 'someone must register you' notice
+  await expect(page.getByText('someone must register you.')).toBeVisible();
+  await page.getByRole('button', { name: /Show them/}).click();
+  // fill in a name
+  await expect(page.getByText('Set Your Name')).toBeVisible();
+  await page.getByRole('textbox').fill('Me Test User');
+  await page.locator('button:has-text("Save")').click();
+  await expect(page.getByText('share another way')).toBeVisible();
+  await page.getByRole('button', { name: /share another way/ }).click();
+  await expect(page.getByRole('button', { name: 'copy to clipboard' })).toBeVisible();
+  await page.getByRole('button', { name: 'copy to clipboard' }).click();
+  await expect(page.getByText('contact info was copied')).toBeVisible();
+  // dismiss alert and wait for it to go away
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click();
+  await expect(page.getByText('contact info was copied')).toBeHidden();
+  // check that they're on the Contacts screen
+  await expect(page.getByText('your contacts')).toBeVisible();
+});
+
+test('Confirm usage of test API (may fail if you are running your own Time Safari)', async ({ page }, testInfo) => {
+  // Load account view
+  await page.goto('./account');
+  await page.getByRole('heading', { name: 'Advanced' }).click();
+
+  // look into the config file: if it starts Time Safari, it might say which server it should set by default
+  const webServer = testInfo.config.webServer;
+  const endorserWords = webServer?.command.split(' ');
+  const ENDORSER_ENV_NAME = 'VITE_DEFAULT_ENDORSER_API_SERVER';
+  const endorserTerm = endorserWords?.find(word => word.startsWith(ENDORSER_ENV_NAME + '='));
+  const endorserTermInConfig = endorserTerm?.substring(ENDORSER_ENV_NAME.length + 1);
+
+  const endorserServer = endorserTermInConfig || 'https://test-api.endorser.ch';
+  await expect(page.getByRole('textbox').nth(1)).toHaveValue(endorserServer);
+});
+
+test('Check User 0 can register a random person', async ({ page }) => {
+  await importUser(page, '00');
+  const newDid = await generateEthrUser(page);
+  expect(newDid).toContain('did:ethr:');
+
+  await page.goto('./');
+  await page.getByRole('heading', { name: 'Unnamed/Unknown' }).click();
+  await page.getByPlaceholder('What was given').fill('Access!');
+  await page.getByRole('button', { name: 'Sign & Send' }).click();
+  await expect(page.getByText('That gift was recorded.')).toBeVisible();
+  // now ensure that alert goes away
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss alert
+  await expect(page.getByText('That gift was recorded.')).toBeHidden();
+});

test-playwright/05-install-pwa.spec.ts

@@ -1,27 +0,0 @@
-const { test, expect } = require('@playwright/test');
-
-test('Install PWA', async ({ page, context }) => {
-  await page.goto('./');
-
-  // Wait for the service worker to register
-  await page.waitForSelector('service-worker-registered-indicator', {
-    timeout: 10000, // Adjust timeout according to your needs
-  });
-
-  // Trigger the install prompt manually
-  const [installPrompt] = await Promise.all([
-    page.waitForEvent('beforeinstallprompt'),
-    page.evaluate(() => {
-      window.dispatchEvent(new Event('beforeinstallprompt'));
-    }),
-  ]);
-
-  // Accept the install prompt
-  await installPrompt.prompt();
-
-  // Check if the PWA was installed successfully
-  const result = await installPrompt.userChoice;
-  expect(result.outcome).toBe('accepted');
-  
-  // Additional checks go here
-});

test-playwright/10-check-usage-limits.spec.ts

@@ -7,12 +7,22 @@ test('Check usage limits', async ({ page }) => {
   await expect(page.locator('div.bg-slate-100.rounded-md').filter({ hasText: 'Usage Limits' })).toBeHidden();
 
   // Import user 01
-  await importUser(page, '01');
+  const did = await importUser(page, '01');
 
   // Verify that "Usage Limits" section is visible
   await expect(page.locator('#sectionUsageLimits')).toBeVisible();
+  await expect(page.locator('#sectionUsageLimits')).toContainText('You have done');
+  await expect(page.locator('#sectionUsageLimits')).toContainText('You have uploaded');
+
   await expect(page.getByText('Your claims counter resets')).toBeVisible();
   await expect(page.getByText('Your registration counter resets')).toBeVisible();
   await expect(page.getByText('Your image counter resets')).toBeVisible();
   await expect(page.getByRole('button', { name: 'Recheck Limits' })).toBeVisible();
+
+  // Set name
+  await page.getByRole('button', { name: 'Set Your Name' }).click();
+  const name = 'User ' + did.slice(11, 14);
+  await page.getByPlaceholder('Name').fill(name);
+  await page.getByRole('button', { name: 'Save' }).click();
+
 });

test-playwright/20-create-project.spec.ts

@@ -2,6 +2,8 @@ import { test, expect } from '@playwright/test';
 import { importUser } from './testUtils';
 
 test('Create new project, then search for it', async ({ page }) => {
+  test.slow();
+
   // Generate a random string of 16 characters
   let randomString = Math.random().toString(36).substring(2, 18);
 
@@ -14,26 +16,45 @@ test('Create new project, then search for it', async ({ page }) => {
   // Standard texts
   const standardTitle = 'Idea ';
   const standardDescription = 'Description of Idea ';
+  const standardEdit = ' EDITED';
+  const standardWebsite = 'https://example.com';
+  const editedWebsite = 'https://example.com/edited';
+
+  // Set dates
+  const today = new Date();
+  const oneMonthAhead = new Date(today.setDate(today.getDate() + 30));
+  const twoMonthsAhead = new Date(today.setDate(today.getDate() + 30));
+  const finalDate = oneMonthAhead.toISOString().split('T')[0];
+  const editedDate = twoMonthsAhead.toISOString().split('T')[0];
+
+  // Set times
+  const now = new Date();
+  const oneHourAhead = new Date(now.setHours(now.getHours() + 1));
+  const twoHoursAhead = new Date(now.setHours(now.getHours() + 1));
+  const finalHour = oneHourAhead.getHours().toString().padStart(2, '0');
+  const editedHour = twoHoursAhead.getHours().toString().padStart(2, '0');
+  const finalMinute = oneHourAhead.getMinutes().toString().padStart(2, '0');
+  const finalTime = `${finalHour}:${finalMinute}`;
+  const editedTime = `${editedHour}:${finalMinute}`;
 
   // Combine texts with the random string
   const finalTitle = standardTitle + finalRandomString;
   const finalDescription = standardDescription + finalRandomString;
+  const editedTitle = finalTitle + standardEdit;
+  const editedDescription = finalDescription + standardEdit;
 
   // Import user 00
   await importUser(page, '00');
 
-  // Pause for 5 seconds
-  await page.waitForTimeout(5000); // I have to wait, otherwise the (+) button to add a new project doesn't appear
-
   // Create new project
   await page.goto('./projects');
   await page.getByRole('link', { name: 'Projects', exact: true }).click();
   await page.getByRole('button').click();
-  await page.getByPlaceholder('Idea Name').fill(finalTitle); // Add random suffix
+  await page.getByPlaceholder('Idea Name').fill(finalTitle);
   await page.getByPlaceholder('Description').fill(finalDescription);
-  await page.getByPlaceholder('Website').fill('https://example.com');
-  await page.getByPlaceholder('Start Date').fill('2025-12-01');
-  await page.getByPlaceholder('Start Time').fill('12:00');
+  await page.getByPlaceholder('Website').fill(standardWebsite);
+  await page.getByPlaceholder('Start Date').fill(finalDate);
+  await page.getByPlaceholder('Start Time').fill(finalTime);
   await page.getByRole('button', { name: 'Save Project' }).click();
 
   // Check texts
@@ -43,11 +64,27 @@ test('Create new project, then search for it', async ({ page }) => {
   // Search for newly-created project in /projects
   await page.goto('./projects');
   await page.getByRole('link', { name: 'Projects', exact: true }).click();
-  await expect(page.locator('ul#listProjects li.border-b:nth-child(1)')).toContainText(finalRandomString); // Assumes newest project always appears first in the Projects tab list
+  await expect(page.locator('ul#listProjects li').filter({ hasText: finalTitle })).toBeVisible();
 
   // Search for newly-created project in /discover
   await page.goto('./discover');
   await page.getByPlaceholder('Search…').fill(finalRandomString);
   await page.locator('#QuickSearch button').click();
-  await expect(page.locator('ul#listDiscoverResults li.border-b:nth-child(1)')).toContainText(finalRandomString);
+  await expect(page.locator('ul#listDiscoverResults li').filter({ hasText: finalTitle })).toBeVisible();
+
+  // Edit the project
+  await page.locator('a').filter({ hasText: finalTitle }).first().click();
+  await page.getByRole('button', { name: 'Edit' }).click();
+  await expect(page.getByPlaceholder('Idea Name')).toHaveValue(finalTitle); // Check that textfield value has loaded before proceeding
+  await page.getByPlaceholder('Idea Name').fill(editedTitle);
+  await page.getByPlaceholder('Description').fill(editedDescription);
+  await page.getByPlaceholder('Website').fill(editedWebsite);
+  await page.getByPlaceholder('Start Date').fill(editedDate);
+  await page.getByPlaceholder('Start Time').fill(editedTime);
+  await page.getByRole('button', { name: 'Save Project' }).click();
+
+  // Check edits
+  await expect(page.locator('h2')).toContainText(editedTitle);
+  await page.getByText('Read More').click();
+  await expect(page.locator('#Content')).toContainText(editedDescription);
 });

test-playwright/25-create-project-x10.spec.ts

@@ -1,26 +1,7 @@
 import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-// Function to generate a random string of specified length
-function generateRandomString(length) {
-  return Math.random().toString(36).substring(2, 2 + length);
-}
-
-// Function to create an array of unique strings
-function createUniqueStringsArray(count) {
-  const stringsArray = [];
-  const stringLength = 16;
-
-  for (let i = 0; i < count; i++) {
-    let randomString = generateRandomString(stringLength);
-    stringsArray.push(randomString);
-  }
-
-  return stringsArray;
-}
+import { importUser, createUniqueStringsArray } from './testUtils';
 
 test('Create 10 new projects', async ({ page }) => {
-  test.slow(); // Extend the test timeout
   const projectCount = 10;
 
   // Standard texts
@@ -32,7 +13,7 @@ test('Create 10 new projects', async ({ page }) => {
   const finalDescriptions = [];
 
   // Create an array of unique strings
-  const uniqueStrings = createUniqueStringsArray(projectCount);
+  const uniqueStrings = await createUniqueStringsArray(projectCount);
 
   // Populate arrays with titles and descriptions
   for (let i = 0; i < projectCount; i++) {
@@ -45,9 +26,6 @@ test('Create 10 new projects', async ({ page }) => {
   // Import user 00
   await importUser(page, '00');
 
-  // Pause a bit
-  await page.waitForTimeout(3000); // I have to wait, otherwise the (+) button to add a new project doesn't appear
-
   // Create new projects
   for (let i = 0; i < projectCount; i++) {
     await page.goto('./projects');
@@ -59,7 +37,6 @@ test('Create 10 new projects', async ({ page }) => {
     await page.getByPlaceholder('Start Date').fill('2025-12-01');
     await page.getByPlaceholder('Start Time').fill('12:00');
     await page.getByRole('button', { name: 'Save Project' }).click();
-    await page.waitForTimeout(1000); // Compensate for delay in loading Idea Name heading
 
     // Check texts
     await expect(page.locator('h2')).toContainText(finalTitles[i]);

test-playwright/33-record-gift-x10.spec.ts

@@ -1,38 +1,7 @@
 import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-// Function to generate a random string of specified length
-function generateRandomString(length) {
-  return Math.random().toString(36).substring(2, 2 + length);
-}
-
-// Function to create an array of unique strings
-function createUniqueStringsArray(count) {
-  const stringsArray = [];
-  const stringLength = 16;
-
-  for (let i = 0; i < count; i++) {
-    let randomString = generateRandomString(stringLength);
-    stringsArray.push(randomString);
-  }
-
-  return stringsArray;
-}
-
-// Function to create an array of two-digit non-zero numbers
-function createRandomNumbersArray(count) {
-  const numbersArray = [];
-
-  for (let i = 0; i < count; i++) {
-    let randomNumber = Math.floor(Math.random() * 99) + 1;
-    numbersArray.push(randomNumber);
-  }
-
-  return numbersArray;
-}
+import { importUser, createUniqueStringsArray, createRandomNumbersArray  } from './testUtils';
 
 test('Record 10 new gifts', async ({ page }) => {
-  test.slow(); // Extend the test timeout
   const giftCount = 10;
 
   // Standard text
@@ -43,8 +12,8 @@ test('Record 10 new gifts', async ({ page }) => {
   const finalNumbers = [];
 
   // Create arrays for field input
-  const uniqueStrings = createUniqueStringsArray(giftCount);
-  const randomNumbers = createRandomNumbersArray(giftCount);
+  const uniqueStrings = await createUniqueStringsArray(giftCount);
+  const randomNumbers = await createRandomNumbersArray(giftCount);
 
   // Populate array with titles
   for (let i = 0; i < giftCount; i++) {
@@ -57,9 +26,6 @@ test('Record 10 new gifts', async ({ page }) => {
   // Import user 00
   await importUser(page, '00');
 
-  // Pause a bit
-  await page.waitForTimeout(3000); // I have to wait, otherwise the (+) button to add a new project doesn't appear
-
   // Record new gifts
   for (let i = 0; i < giftCount; i++) {
     // Record something given

test-playwright/40-add-contact.spec.ts

@@ -2,6 +2,7 @@ import { test, expect } from '@playwright/test';
 import { importUser } from './testUtils';
 
 test('Add contact, record gift, confirm gift', async ({ page }) => {
+
   // Generate a random string of 16 characters
   let randomString = Math.random().toString(36).substring(2, 18);
 
@@ -31,8 +32,9 @@ test('Add contact, record gift, confirm gift', async ({ page }) => {
   await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F, User #000');
   await page.locator('button > svg.fa-plus').click();
   await expect(page.locator('div[role="alert"]')).toBeVisible();
-  
-  await page.locator('div[role="alert"] button:has-text("Yes")').click();
+  await page.locator('div[role="alert"] button:has-text("No")').click(); // don't register
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
+  await expect(page.locator('div[role="alert"] button > svg.fa-xmark')).toBeHidden(); // ensure alert is gone
 
   // Verify added contact
   await expect(page.locator('li.border-b')).toContainText('User #000');
@@ -94,8 +96,8 @@ test('Add contact, copy details, delete, and import various ways', async ({ page
   await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x111d15564f824D56C7a07b913aA7aDd03382aA39, User #111');
   await page.locator('button > svg.fa-plus').click();
   await expect(page.locator('div[role="alert"]')).toBeVisible();
-  await page.locator('div[role="alert"] button:has-text("No")').click();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click();
+  await page.locator('div[role="alert"] button:has-text("No")').click(); // don't register
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
   // wait for the alert to disappear
   await expect(page.locator('div[role="alert"]')).toBeHidden();
 
@@ -103,8 +105,8 @@ test('Add contact, copy details, delete, and import various ways', async ({ page
   await page.getByPlaceholder('URL or DID, Name, Public Key').fill('did:ethr:0x222BB77E6Ff3774d34c751f3c1260866357B677b, User #222, asdf1234');
   await page.locator('button > svg.fa-plus').click();
   await expect(page.locator('div[role="alert"]')).toBeVisible();
-  await page.locator('div[role="alert"] button:has-text("No")').click();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click();
+  await page.locator('div[role="alert"] button:has-text("No")').click(); // don't register
+  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
   await expect(page.locator('div[role="alert"]')).toBeHidden();
 
   await expect(page.getByTestId('contactListItem')).toHaveCount(2);

test-playwright/testUtils.ts

@@ -1,6 +1,9 @@
 import { expect, Page } from '@playwright/test';
 
-export async function importUser(page: Page, id?: string): Promise<void> {
+// Import the seed and switch to the user based on the ID.
+// '01' -> 111
+// otherwise -> 000
+export async function importUser(page: Page, id?: string): Promise<string> {
   let seedPhrase, userName, did;
 
   // Set seed phrase and DID based on user ID
@@ -21,14 +24,75 @@ export async function importUser(page: Page, id?: string): Promise<void> {
   await page.getByText('You have a seed').click();
   await page.getByPlaceholder('Seed Phrase').fill(seedPhrase);
   await page.getByRole('button', { name: 'Import' }).click();
-  await expect(page.locator('#sectionUsageLimits')).toContainText('You have done');
-  await expect(page.locator('#sectionUsageLimits')).toContainText('You have uploaded');
-
-  // Set name
-  await page.getByRole('link', { name: 'Set Your Name' }).click();
-  await page.getByPlaceholder('Name').fill(userName);
-  await page.getByRole('button', { name: 'Save Changes' }).click();
 
   // Check DID
   await expect(page.getByRole('code')).toContainText(did);
+  // ... and ensure the app retrieves the registration status
+  await expect(page.getByText('Your claims counter resets')).toBeVisible();
+  return did;
+}
+
+// This is to switch to someone already in the identity table. It doesn't include registration.
+export async function switchToUser(page: Page, did: string): Promise<void> {
+  await page.goto('./account');
+  await page.getByRole('heading', { name: 'Advanced' }).click();
+  await page.getByRole('link', { name: 'Switch Identifier' }).click();
+  await page.getByRole('code', { name: did }).click();
+}
+
+// Generate a new random user and register them.
+// Note that this makes 000 the active user. Use switchToUser to switch to this DID.
+export async function generateEthrUser(page: Page): Promise<string> {
+  await page.goto('./start');
+  await page.getByTestId('newSeed').click();
+  await expect(page.locator('span:has-text("Created")')).toBeVisible();
+
+  await page.goto('./account');
+  // wait until the DID shows on the page in the 'did' element
+  const didElem = await page.getByTestId('didWrapper').locator('code:has-text("did:")');
+  const newDid = await didElem.innerText();
+
+  await importUser(page, '000'); // switch to user 000
+
+  await page.goto('./contacts');
+  const threeChars = newDid.slice(11, 14);
+  await page.getByPlaceholder('URL or DID, Name, Public Key').fill(`${newDid}, User ${threeChars}`);
+  await page.locator('button > svg.fa-plus').click();
+  await page.locator('li', { hasText: threeChars }).click();
+  // register them
+  await page.locator('div[role="alert"] button:has-text("Yes")').click();
+  // wait for it to disappear because the next steps may depend on alerts being gone
+  await expect(page.locator('div[role="alert"] button:has-text("Yes")')).toBeHidden();
+
+  return newDid;
+}
+
+// Function to generate a random string of specified length
+export async function generateRandomString(length: number): Promise<string> {
+  return Math.random().toString(36).substring(2, 2 + length);
+}
+
+// Function to create an array of unique strings
+export async function createUniqueStringsArray(count: number): Promise<string[]> {
+  const stringsArray = [];
+  const stringLength = 16;
+
+  for (let i = 0; i < count; i++) {
+    let randomString = await generateRandomString(stringLength);
+    stringsArray.push(randomString);
+  }
+
+  return stringsArray;
+}
+
+// Function to create an array of two-digit non-zero numbers
+export async function createRandomNumbersArray(count: number): Promise<number[]> {
+  const numbersArray = [];
+
+  for (let i = 0; i < count; i++) {
+    let randomNumber = Math.floor(Math.random() * 99) + 1;
+    numbersArray.push(randomNumber);
+  }
+
+  return numbersArray;
 }