create an identifier by default, while letting them choose if passkeys are enabled

Co-authored-by: Trent Larson <trent@trentlarson.com>
Reviewed-on: #120
Co-authored-by: trentlarson <trent@trentlarson.com>
Co-committed-by: trentlarson <trent@trentlarson.com>

.env.production

@@ -1,4 +1,4 @@
-# Only the variables that start with VITE_ are seen in the application import.meta.env in Vue.
+# Only the variables that start with VITE_ are seen in the application process.env in Vue.
 VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01GXYPFF7FA03NXKPYY142PY4H
 VITE_DEFAULT_ENDORSER_API_SERVER=https://api.endorser.ch
 VITE_DEFAULT_IMAGE_API_SERVER=https://image-api.timesafari.app

.github/workflows/playwright.yml

@@ -1,27 +0,0 @@
-name: Playwright Tests
-on:
-  push:
-    branches: [ main, master ]
-  pull_request:
-    branches: [ main, master ]
-jobs:
-  test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - uses: actions/setup-node@v4
-      with:
-        node-version: lts/*
-    - name: Install dependencies
-      run: npm ci
-    - name: Install Playwright Browsers
-      run: npx playwright install --with-deps
-    - name: Run Playwright tests
-      run: npx playwright test
-    - uses: actions/upload-artifact@v4
-      if: always()
-      with:
-        name: playwright-report
-        path: playwright-report/
-        retention-days: 30

.gitignore

@@ -27,7 +27,3 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/

CHANGELOG.md

@@ -6,59 +6,7 @@ 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.
-- Prompt for name in pop-up, and send to different contact-sharing screens.
-### Changed
-- Moved contact actions from list onto detail page
-
-
-## [0.3.20] - 2024.08.18 - 4064eb75a9743ca268bf00016fa0a5fc5dec4e30
-### Fixed
-- Bad "give" verbiage on offer page
-- Failing offer test
-
-
-## [0.3.19] - 2024.08.18 - ee9c14942ceba993bf21a11249601f205158ec71
-### Added
-- Update of an offer
-- Recipient description in offer list
-### Fixed
-- List of offers wasn't showing.
-- Destination page after sharing photo was wrong.
-
-
-## [0.3.17] - 2024.07.11 - cefa384ff1a2d922848c370640c096c529920fab
-### Added
-- Photos on more screens
-### Fixed
-- Share of a photo, including sharing a photo from webkit/Safari which never worked
-### Changed in DB or environment
-- Nothing (though there's a new temp field in IndexedDB)
-
-
-## [0.3.15] - 2024.08.04 - c8f0f2c2b16b9f0b4b47d40f7bf29058c7baa68e
-### Added
-- Edit gives
-- Page to edit claim JSON before submitting
-- Update of imported contacts
-- Improve messaging on give dialog
-- Section for gives provided by plan
-- Deletion of an identity
-- UI for choosing a passkey creation (not enabled on prod)
-- Cache signatures for reports for passkey-signed requests
-- Refactor: consolidate alternative signing, eg. for passkeys & did:peer
-- Playwright tests
-### Changed
-- Linked projects display below description (instead of at bottom)
-### Fixed
-- Visibility toggle appearance
-### Changed in DB or environment
-- Nothing
-
-
-## [0.3.14] - 2024.06.22 - 1611d22892f683f43856d2503eee7f391b6bbce8
+## [0.3.14]
 ### Added
 - Clearer give-confirmation screen
 - BX currency https://thebx.medium.com/

CONTRIBUTING.md

@@ -2,10 +2,5 @@
 
 Welcome! We are happy to have your help with this project.
 
-We expect contributions to include automated tests and pass linting. Run the `test-all` task.
-Note that some previous features don't have tests and adding more will make you friends quick.
-
-Note that all contributions will be under our [license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).
-
-If you want to see a code of conduct, we're probably not the people you want to hang with.
-Basically, we'll work together as long as we both enjoy it, and we'll stop when that stops.
+Note that all contributions will be under our
+[license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).

README.md

@@ -39,17 +39,15 @@ npm run lint
 
 * Update the ClickUp tasks & CHANGELOG.md & the version in package.json, run `npm install`.
 
-* Commit everything (since the commit hash is used the app).
-
 * Record what version is currently on production.
 
 * Run the correct build:
 
-  * Staging
+  * Test
 ```
 # (Let's replace this with a .env.development or .env.staging file.)
 # The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.
-TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=yep npm run build
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app PASSKEYS_ENABLED=yep npm run build
 ```
 
   * Production
@@ -58,7 +56,7 @@ TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https:
 npm run build
 ```
 
-* Get on the server and back up the time-safari/dist folder.
+* Get on the server and back up 3 DBs and the time-safari folder.
 
 * `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari`
 
@@ -71,41 +69,6 @@ npm run build
 
 ## Tests
 
-### Automated
-
-Use the locally running Endorser server:
-
-* Clone and set up https://github.com/trentlarson/endorser-ch and run the following in that directory:
-```
-test/test.sh
-NODE_ENV=test-local npm run dev
-```
-
-* Now run the local tests:
-```
-npm run test-all
-```
-
-Note that a test will sometimes fail and rerunning may succeed (and repeat if a different test fails).
-
-
-
-
-It's possible to use the global test Endorser (ledger) server (but currently the tests don't all succeed):
-`npx playwright test`
-
-
-
-
-It's possible to run with a minimal set of data: the following starts with the bare minimum of test data (but currently the tests don't all succeed):
-```
-rm ../endorser-ch-test-local.sqlite3
-NODE_ENV=test-local npm run flyway migrate
-NODE_ENV=test-local npm run test test/controller0
-NODE_ENV=test-local npm run dev
-```
-
-
 ### Register new user on test server
 
 On the test server, User #0 has rights to register others, so you can start

doc/README.md

@@ -1,76 +0,0 @@
-# TimeSafari Docs
-
-## Generating PDF from Markdown on OSx
-
-This uses Pandoc and BasicTex (LaTeX) Installed through Homebrew.
-
-### Set Up
-
-```bash 
-brew install pandoc
-
-brew install basictex
-
-# Setting up LaTex packages
-
-# First update tlmgr
-sudo tlmgr update --self
-
-# Then install LaTex packages
-sudo tlmgr install bbding
-sudo tlmgr install enumitem
-sudo tlmgr install environ
-sudo tlmgr install fancyhdr
-sudo tlmgr install framed
-sudo tlmgr install import
-sudo tlmgr install lastpage  # Enables Page X of Y
-sudo tlmgr install mdframed
-sudo tlmgr install multirow
-sudo tlmgr install needspace
-sudo tlmgr install ntheorem
-sudo tlmgr install tabu
-sudo tlmgr install tcolorbox
-sudo tlmgr install textpos
-sudo tlmgr install titlesec
-sudo tlmgr install titling  # Required for the fancy headers used
-sudo tlmgr install threeparttable
-sudo tlmgr install trimspaces
-sudo tlmgr install tocloft  # Required for \tableofcontents generation
-sudo tlmgr install varwidth
-sudo tlmgr install wrapfig
-
-# Install fonts
-sudo tlmgr install cmbright
-sudo tlmgr install collection-fontsrecommended # And set up fonts
-sudo tlmgr install fira
-sudo tlmgr install fontaxes
-sudo tlmgr install libertine # The main font the doc uses
-sudo tlmgr install opensans
-sudo tlmgr install sourceserifpro
-
-```
-
-#### References
-
-The following guide was adapted to this project except that we install with Brew and have a few more packages.
-
-Guide: https://daniel.feldroy.com/posts/setting-up-latex-on-mac-os-x
-
-### Usage
-
-Use the `pandoc` command to generate a PDF.
-
-```bash
-pandoc usage-guide.md -o usage-guide.pdf 
-```
-
-And you can open the PDF with the `open` command.
-
-```bash
-open usage-guide.pdf
-```
-
-Or use this one-liner
-```bash
-pandoc usage-guide.md -o usage-guide.pdf && open usage-guide.pdf
-```

doc/usage-guide.md

@@ -1,316 +0,0 @@
----
-geometry: margin=1in
-header-includes:
-    - \usepackage{graphicx}
-    - \usepackage{titling}
-    - \usepackage{fancyhdr}
-    - \usepackage{lastpage}
-    - \pagestyle{fancy}
-    - \fancyhead[L]{Time Safari Usage Guide}
-    - \fancyhead[C]{Page \thepage\ of \pageref{LastPage}}
-    - \fancyhead[R]{}
-    - \fancyfoot[L]{}
-    - \fancyfoot[C]{}
-    - \fancyfoot[R]{\includegraphics[width=1cm]{images/timesafari-logo-binoculars.png}}
-    - \usepackage{tocloft}
-    - \usepackage{libertine}
-    - \renewcommand{\familydefault}{\sfdefault}
-    - \fancypagestyle{tocstyle}{
-      \fancyhead[L]{Time Safari Usage Guide}
-      \fancyhead[C]{Page \thepage\ of \pageref{LastPage}}
-      \fancyhead[R]{}
-      \fancyfoot[L]{}
-      \fancyfoot[C]{}
-      \fancyfoot[R]{\includegraphics[width=1cm]{images/timesafari-logo-binoculars.png}}}
----
-
-\begin{titlepage}
-\centering
-\vspace*{\fill}
-{\huge\textbf{TimeSafari Usage guide}}
-
-\vspace{1cm}
-{\Large Signing up users, adding contacts, and adding gifts.}
-
-\vspace{1cm}
-\includegraphics[width=0.5\textwidth]{images/timesafari-logo.png}
-\vspace*{\fill}
-
-\vspace{1cm}
-{\Large Trent Larson, Kent Bull}
-
-\vspace{0.5cm}
-{\large 2024-06-25}
-
-\end{titlepage}
-
-\clearpage
-
-\begin{center}
-\includegraphics[width=2cm]{images/timesafari-logo-binoculars.png}
-\end{center}
-\tableofcontents
-
-\clearpage
-
-
-# Purpose of Document
-
-Both end-users and development team members need to know how to use TimeSafari. 
-This document serves to show how to use every feature of the TimeSafari platform.
-
-Sections of this document are geared specifically for software developers and quality assurance
-team members.
-
-Companion videos will also describe end-to-end workflows for the end-user.
-
-# TimeSafari 
-
-## Overview
-
-\pagebreak
-
-# 1 - End Users
-
-This section covers application usage for people who will use TimeSafari as intended. It is a
-simplified guide illustrating how to gain value from using TimeSafari.
-
-\pagebreak
-
-# 2 - Software Developers
-
-This section is tailored for software developers seeking to use the application during development,
-quality assurance, and testing.
-
-# Bootstrapping a local development environment
-
-The first concern a software developer has when working on TimeSafari is to set up a local
-development environment. This section will guide you through the process.
-
-## Prerequisites
-
-1. Have the following installed on your local machine:
-  - Node.js and NPM
-  - A web browser. For this guide, we will use Google Chrome.
-  - Git
-  - A code editor
-
-2. Create an API key on Infura. This is necessary for the Endorser API to connect to the Ethereum
-   blockchain. 
-  - You can create an account on Infura [here](https://infura.io/).\
-    Click "CREATE NEW API KEY" and label the key. Then click "API Keys" in the top menu bar to
-    be taken back to the list of keys.
-    
-    Click "VIEW STATS" on the key you want to use.   
-    
-    ![](images/01_infura-api-keys.png){ width=550px }
-  
-  - Go to the key detail page. Then click "MANAGE API KEY".
-  
-    ![](images/02-infura-key-detail.png){ width=550px }
-  
-  - Click the copy and paste button next to the string of alphanumeric characters.\
-    This is your API, also known as your project ID.
-  
-    ![](images/03-infura-api-key-id.png){width=550px }
-  
-  - Save this for later during the Endorser API setup. This will go in your `INFURA_PROJECT_ID` 
-    environment variable.
-    
-
-## Setup steps
-
-### 1. Clone the following repositories from their respective Git hosts:
-  - [TimeSafari Frontend](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa)\
-    This is a Progressive Web App (PWA) built with VueJS and TypeScript.
-    Note that the clone command here is different from the one you would use for GitHub.
-    
-```bash
-git clone git clone \
-  ssh://git@gitea.anomalistdesign.com:222/trent_larson/crowd-funder-for-time-pwa.git
-```
-  
-  - [TimeSafari Backend - Endorser API](https://github.com/trentlarson/endorser-ch)\
-    This is a NodeJS service providing the backend for TimeSafari.
-    
-    ```bash
-    git clone git@github.com:trentlarson/endorser-ch.git
-    ```
-
-\pagebreak
-
-### 2. Database creation
-
-#### Alternative 1 - use test data
-
-To generate a development database and perform user setup you can run a local test with instructions
-below to generate sample data. Then copy the test database, rename it to `-dev` as below:\
-`cp ../endorser-ch-test-local.sqlite3 ../endorser-ch-dev.sqlite3` \
-and rerun `npm run dev` to give yourself user #0 and others from the ETHR_CRED_DATA in [the endorser.ch test util file](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js#L90)
-
-#### Alternative 2 - boostrap single seed user 
-
-In this method you will end up with two accounts in the database, one for the first boostrap user,
-and the second as the primary user you will use during testing. The first user will invite the
-second user to the app.
-
-1. Install dependencies and environment variables.\
-   In endorser-ch install dependencies and set up environment variables to allow starting it up in
-   development mode.
-   ```bash
-   cd endorser-ch
-   npm clean install  # or npm ci
-   cp .env.local .env
-   ```
-   Edit the .env file's INFURA_PROJECT_ID with the value you saved earlier in the
-   prerequisites.\
-   Then create the SQLite database by running `npm run flyway migrate` with environment variables
-   set correctly to select the default SQLite development user as follows.
-   ```bash
-   export NODE_ENV=dev 
-   export DBUSER=sa 
-   export DBPASS=sasa 
-   npm run flyway migrate
-   ``` 
-   The first run of flyway migrate may take some time to complete because the entire Flyway 
-   distribution must be downloaded prior to executing migrations.
-    
-   Successful output looks similar to the following:
-    
-```
-Database: jdbc:sqlite:../endorser-ch-dev.sqlite3 (SQLite 3.41)
-Schema history table "main"."flyway_schema_history" does not exist yet
-Successfully validated 10 migrations (execution time 00:00.034s)
-Creating Schema History table "main"."flyway_schema_history" ...
-Current version of schema "main": << Empty Schema >>
-Migrating schema "main" to version "1 - initial-anew"
-Migrating schema "main" to version "2 - registration"
-Migrating schema "main" to version "3 - plan project"
-Migrating schema "main" to version "4 - offer gave"
-Migrating schema "main" to version "5 - more confirmations"
-Migrating schema "main" to version "6 - providers urls"
-Migrating schema "main" to version "7 - hash nonce"
-Migrating schema "main" to version "8 - project location"
-Migrating schema "main" to version "9 - plan links"
-Migrating schema "main" to version "10 - gift or trade"
-Successfully applied 10 migrations to schema "main", now at version v10 (execution time 00:00.043s)
-A Flyway report has been generated here: /Users/kbull/code/timesafari/endorser-ch/report.html
-```
-
-\pagebreak
-
-2. Generate the first user in TimeSafari PWA and bootstrap that user in Endorser's database.\
-   As TimeSafari is an invite-only platform the first user must be manually bootstrapped since
-   no other users exist to be able to invite the first user. This first user must be added manually
-   to the SQLite database used by Endorser. In this setup you generate the first user from the PWA. 
-   
-   This user is automatically generated on first usage of the TimeSafari PWA. Bootstrapping that 
-   user is required so that this first user can register other users.
-   - Change directories into `crowd-funder-for-time-pwa`
-     
-     ```bash
-     cd ..
-     cd crowd-funder-for-time-pwa 
-     ```
-   
-   - Ensure the `.env.development` file exists and has the following values:
-   
-     ```env
-     VITE_DEFAULT_ENDORSER_API_SERVER=http://127.0.0.1:3000
-     ```
-   
-   - Install dependencies and run in dev mode. For now don't worry about configuring the app. All we
-     need is to generate the first root user and this happens automatically on app startup.
-  
-     ```bash
-     npm clean install  # or npm ci
-     npm run dev
-     ```
-  
-   - Open the app in a browser and go to the developer tools. It is recommended to use a completely
-     separate browser profile so you do not clear out your existing user account. We will be
-     completely resetting the PWA app state prior to generating the first user.
-   
-     In the Developer Tools go to the Application tab.
-     
-     ![](images/04-pwa-chrome-devtools.png){width=350px} 
-   
-     Click the "Clear site data" button and then refresh the page.
-   
-   - Click the account button in the bottom right corner of the page.
-   
-     ![](images/05-pwa-account-button.png){width=150px}
-   
-   - This will take you to the account page titled "Your Identity" on which you can see your DID,
-     a `did:ethr` DID in this case.
-   
-     ![](images/06-pwa-account-page.png){width=350px}
-   
-   - Copy the DID by selecting it and copying it to the clipboard or by clicking the copy and paste
-     button as shown in the image.
-   
-     ![](images/07-pwa-did-copied.png){width=200px}
-    
-     In our case this DID is:\
-     `did:ethr:0xe4B783c74c8B0e229524e44d0cD898D272E02CD6`
-   
-  - Add that DID to the following echoed SQL statement where it says `YOUR_DID`
-  
-    ```bash
-    echo "INSERT INTO registration (did, maxClaims, maxRegs, epoch) 
-    VALUES ('YOUR_DID', 100, 10000, 1719348718092);"
-    | sqlite3 ./endorser-ch-dev.sqlite3
-    ```
-    
-    and run this command in the parent directory just above the `endorser-ch` directory.
-    
-    It needs to be the parent directory of your `endorser-ch` repository because when 
-    `endorser-ch` creates the SQLite database it depends on it creates it in the parent directory
-    of `endorser-ch`.
-    
-  - You can verify with an SQL browser tool that your record has been added to the `registration`
-    table.
-  
-    ![](images/08-endorser-sqlite-row-added.png){width=350px}
-
-3. Then start the Endorser service in development mode with the following commands.
-  
-    ```bash
-    cd ./endorser-ch
-    export NODE_ENV=dev
-    npm run dev
-    ```
-  
-    This starts the Endorser service on port 3000.
-4. Create the second user by opening up a separate browser profile or incognito session, opening the
-   TimeSafari PWA at `http://localhost:8080`. You will see the yellow banner stating "Someone must
-   register you before you can give or offer."
-   
-   ![](images/09-pwa-second-profile-first-open.png){width=350px}
-   
-   - If you want to ensure you have a fresh user account then open the developer tools, clear the
-     Application data as before, and then refresh the page. This will generate a new user in the 
-     browser's IndexedDB database.
-5. Go to the second users' account page to copy the DID.
-    
-    ![](images/10-pwa-second-user-did.png){width=350px}
-
-6. Copy the DID and put it in the text bar on the "Your Contacts" page for the first account
-
-    ![](images/11-pwa-first-user-add-contact.png){width=350px}
-
-7. Click the "+" plus icon to add the user.
-
-    ![](images/12-pwa-first-user-contact-added.png){width=350px}
-
-8. Then click the register button to register the second user.
-
-    ![](images/13-pwa-first-user-register-second-user-btn.png){width=350px}
-
-9. Click "YES" on the dialog that shows up.
-
-    ![](images/14-pwa-first-user-register-yes.png){width=350px}
-
-    After this a notification will pop up indicating whether registration was successful or not.
-
-10. You have finished the initial set up of users.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.21",
+  "version": "0.3.15-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "TimeSafari",
-      "version": "0.3.21",
+      "version": "0.3.15-beta",
       "dependencies": {
         "@dicebear/collection": "^5.4.1",
         "@dicebear/core": "^5.4.1",
@@ -39,6 +39,7 @@
         "did-jwt": "^7.4.7",
         "ethereum-cryptography": "^2.1.3",
         "ethereumjs-util": "^7.1.5",
+        "ethr-did-resolver": "^8.1.2",
         "jdenticon": "^3.2.0",
         "js-generate-password": "^0.1.9",
         "js-yaml": "^4.1.0",
@@ -68,11 +69,9 @@
         "web-did-resolver": "^2.0.27"
       },
       "devDependencies": {
-        "@playwright/test": "^1.45.2",
         "@types/js-yaml": "^4.0.9",
         "@types/leaflet": "^1.9.8",
         "@types/luxon": "^3.4.2",
-        "@types/node": "^20.14.11",
         "@types/ramda": "^0.29.11",
         "@types/three": "^0.155.1",
         "@types/ua-parser-js": "^0.7.39",
@@ -3208,6 +3207,31 @@
         "node": ">=14"
       }
     },
+    "node_modules/@ethersproject/abi": {
+      "version": "5.7.0",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/address": "^5.7.0",
+        "@ethersproject/bignumber": "^5.7.0",
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/constants": "^5.7.0",
+        "@ethersproject/hash": "^5.7.0",
+        "@ethersproject/keccak256": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0",
+        "@ethersproject/properties": "^5.7.0",
+        "@ethersproject/strings": "^5.7.0"
+      }
+    },
     "node_modules/@ethersproject/abstract-provider": {
       "version": "5.7.0",
       "funding": [
@@ -3361,6 +3385,32 @@
         "@ethersproject/bignumber": "^5.7.0"
       }
     },
+    "node_modules/@ethersproject/contracts": {
+      "version": "5.7.0",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/abi": "^5.7.0",
+        "@ethersproject/abstract-provider": "^5.7.0",
+        "@ethersproject/abstract-signer": "^5.7.0",
+        "@ethersproject/address": "^5.7.0",
+        "@ethersproject/bignumber": "^5.7.0",
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/constants": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0",
+        "@ethersproject/properties": "^5.7.0",
+        "@ethersproject/transactions": "^5.7.0"
+      }
+    },
     "node_modules/@ethersproject/hash": {
       "version": "5.7.0",
       "funding": [
@@ -3498,6 +3548,60 @@
         "@ethersproject/logger": "^5.7.0"
       }
     },
+    "node_modules/@ethersproject/providers": {
+      "version": "5.7.2",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/abstract-provider": "^5.7.0",
+        "@ethersproject/abstract-signer": "^5.7.0",
+        "@ethersproject/address": "^5.7.0",
+        "@ethersproject/base64": "^5.7.0",
+        "@ethersproject/basex": "^5.7.0",
+        "@ethersproject/bignumber": "^5.7.0",
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/constants": "^5.7.0",
+        "@ethersproject/hash": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0",
+        "@ethersproject/networks": "^5.7.0",
+        "@ethersproject/properties": "^5.7.0",
+        "@ethersproject/random": "^5.7.0",
+        "@ethersproject/rlp": "^5.7.0",
+        "@ethersproject/sha2": "^5.7.0",
+        "@ethersproject/strings": "^5.7.0",
+        "@ethersproject/transactions": "^5.7.0",
+        "@ethersproject/web": "^5.7.0",
+        "bech32": "1.1.4",
+        "ws": "7.4.6"
+      }
+    },
+    "node_modules/@ethersproject/random": {
+      "version": "5.7.0",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://gitcoin.co/grants/13/ethersjs-complete-simple-and-tiny-2"
+        },
+        {
+          "type": "individual",
+          "url": "https://www.buymeacoffee.com/ricmoo"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "@ethersproject/bytes": "^5.7.0",
+        "@ethersproject/logger": "^5.7.0"
+      }
+    },
     "node_modules/@ethersproject/rlp": {
       "version": "5.7.0",
       "funding": [
@@ -6087,21 +6191,6 @@
         "url": "https://opencollective.com/unts"
       }
     },
-    "node_modules/@playwright/test": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.45.2.tgz",
-      "integrity": "sha512-JxG9eq92ET75EbVi3s+4sYbcG7q72ECeZNbdBlaMkGcNbiDQ4cAi8U2QP5oKkOx+1gpaiL1LDStmzCaEM1Z6fQ==",
-      "dev": true,
-      "dependencies": {
-        "playwright": "1.45.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@pvermeer/dexie-encrypted-addon": {
       "version": "3.0.0",
       "license": "MIT",
@@ -8678,9 +8767,8 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "20.14.11",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.14.11.tgz",
-      "integrity": "sha512-kprQpL8MMeszbz6ojB5/tU8PLN4kesnN8Gjzw349rDlNgsSzg90lAVj3llK99Dh7JON+t9AuscPPFW6mPbTnSA==",
+      "version": "20.11.30",
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~5.26.4"
       }
@@ -10377,6 +10465,10 @@
         "node": ">=14"
       }
     },
+    "node_modules/bech32": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
     "node_modules/better-opn": {
       "version": "3.0.2",
       "license": "MIT",
@@ -12721,6 +12813,24 @@
         "ethr-did-resolver": "10.1.5"
       }
     },
+    "node_modules/ethr-did-resolver": {
+      "version": "8.1.2",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@ethersproject/abi": "^5.6.3",
+        "@ethersproject/abstract-signer": "^5.6.2",
+        "@ethersproject/address": "^5.6.1",
+        "@ethersproject/basex": "^5.6.1",
+        "@ethersproject/bignumber": "^5.6.2",
+        "@ethersproject/bytes": "^5.6.1",
+        "@ethersproject/contracts": "^5.6.2",
+        "@ethersproject/keccak256": "^5.6.1",
+        "@ethersproject/providers": "^5.6.8",
+        "@ethersproject/signing-key": "^5.6.2",
+        "@ethersproject/transactions": "^5.6.2",
+        "did-resolver": "^4.0.1"
+      }
+    },
     "node_modules/ethr-did/node_modules/@noble/ciphers": {
       "version": "0.5.1",
       "license": "MIT",
@@ -17989,50 +18099,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/playwright": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.45.2.tgz",
-      "integrity": "sha512-ReywF2t/0teRvNBpfIgh5e4wnrI/8Su8ssdo5XsQKpjxJj+jspm00jSoz9BTg91TT0c9HRjXO7LBNVrgYj9X0g==",
-      "dev": true,
-      "dependencies": {
-        "playwright-core": "1.45.2"
-      },
-      "bin": {
-        "playwright": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "optionalDependencies": {
-        "fsevents": "2.3.2"
-      }
-    },
-    "node_modules/playwright-core": {
-      "version": "1.45.2",
-      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.45.2.tgz",
-      "integrity": "sha512-ha175tAWb0dTK0X4orvBIqi3jGEt701SMxMhyujxNrgd8K0Uy5wMSwwcQHtyB4om7INUkfndx02XnQ2p6dvLDw==",
-      "dev": true,
-      "bin": {
-        "playwright-core": "cli.js"
-      },
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/playwright/node_modules/fsevents": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
-      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
-      "dev": true,
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
     "node_modules/plist": {
       "version": "3.1.0",
       "license": "MIT",
@@ -22221,8 +22287,6 @@
     "node_modules/ws": {
       "version": "7.4.6",
       "license": "MIT",
-      "optional": true,
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },

package.json

@@ -1,15 +1,13 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.21",
+  "version": "0.3.15-beta",
   "scripts": {
     "dev": "vite",
     "serve": "vite preview",
     "build": "VITE_GIT_HASH=`git log -1 --pretty=format:%h` vite build",
     "lint": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src",
     "lint-fix": "eslint --ext .js,.ts,.vue --ignore-path .gitignore --fix src",
-    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js",
-    "test-local": "npx playwright test -c playwright.config-local.ts --trace on",
-    "test-all": "npm run build && npx playwright test -c playwright.config-local.ts --trace on"
+    "prebuild": "eslint --ext .js,.ts,.vue --ignore-path .gitignore src && node sw_combine.js"
   },
   "dependencies": {
     "@dicebear/collection": "^5.4.1",
@@ -43,6 +41,7 @@
     "did-jwt": "^7.4.7",
     "ethereum-cryptography": "^2.1.3",
     "ethereumjs-util": "^7.1.5",
+    "ethr-did-resolver": "^8.1.2",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
     "js-yaml": "^4.1.0",
@@ -72,11 +71,9 @@
     "web-did-resolver": "^2.0.27"
   },
   "devDependencies": {
-    "@playwright/test": "^1.45.2",
     "@types/js-yaml": "^4.0.9",
     "@types/leaflet": "^1.9.8",
     "@types/luxon": "^3.4.2",
-    "@types/node": "^20.14.11",
     "@types/ramda": "^0.29.11",
     "@types/three": "^0.155.1",
     "@types/ua-parser-js": "^0.7.39",

playwright.config-local.ts

@@ -1,98 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './test-playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://localhost:8080',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: {
-        ...devices['Desktop Chrome'],
-        permissions: ["clipboard-read"],
-      },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    {
-      name: 'Google Chrome',
-      use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    },
-  ],
-
-  /* Configure global timeout; default is 30000 milliseconds */
-  // the image upload will often not succeed at 5 seconds
-  // timeout: 5000,
-
-  /* Run your local dev server before starting the tests */
-  /**
-   * This could be an array of servers, meaning we could start the Endorser server as well:
-   *     {
-   *       command: "cd ../endorser-ch; NODE_ENV=test-local npm run dev",
-   *       url: 'http://localhost:3000',
-   *       reuseExistingServer: !process.env.CI,
-   *     },
-   *
-   * But if we do then the testInfo.config.webServer is null and the API-setting test 00 fails.
-   * It is worth considering a change such that Time Safari's default Endorser API server is NOT set
-   * in the user's settings so that it can be blanked out and the default is used.
-   */
-  webServer: {
-    command:
-      "VITE_PASSKEYS_ENABLED=true VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 npm run dev",
-    url: "http://localhost:8080",
-    reuseExistingServer: !process.env.CI,
-  },
-});

playwright.config.ts

@@ -1,82 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './test-playwright',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'https://test.timesafari.app',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: {
-        ...devices['Desktop Chrome'],
-        permissions: ["clipboard-read"],
-      },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    {
-      name: 'Mobile Chrome',
-      use: { ...devices['Pixel 5'] },
-    },
-    {
-      name: 'Mobile Safari',
-      use: { ...devices['iPhone 12'] },
-    },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command:
-  //     "VITE_PASSKEYS_ENABLED=true VITE_DEFAULT_ENDORSER_API_SERVER=http://localhost:3000 npm run dev",
-  //   url: "http://localhost:8080",
-  //   reuseExistingServer: !process.env.CI,
-  // },
-});

src/App.vue

@@ -180,9 +180,8 @@
                   "
                   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
@@ -194,7 +193,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/FeedFilters.vue

@@ -133,18 +133,18 @@ export default class FeedFilters extends Vue {
     this.visible = true;
   }
 
-  async toggleHasVisibleDid() {
+  toggleHasVisibleDid() {
     this.settingChanged = true;
     this.hasVisibleDid = !this.hasVisibleDid;
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByVisible: this.hasVisibleDid,
     });
   }
 
-  async toggleNearby() {
+  toggleNearby() {
     this.settingChanged = true;
     this.isNearby = !this.isNearby;
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: this.isNearby,
     });
   }
@@ -154,7 +154,7 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: false,
       filterFeedByVisible: false,
     });
@@ -168,7 +168,7 @@ export default class FeedFilters extends Vue {
       this.settingChanged = true;
     }
 
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       filterFeedByNearby: true,
       filterFeedByVisible: true,
     });

src/components/GiftedDialog.vue

@@ -24,7 +24,6 @@
           <fa icon="chevron-left" />
         </div>
         <input
-          id="inputGivenAmount"
           type="number"
           class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
           v-model="amountInput"
@@ -55,7 +54,7 @@
             }"
             class="text-blue-500"
           >
-            Photo & more options ...
+            Photo & Details ...
           </router-link>
         </span>
       </div>
@@ -292,8 +291,8 @@ export default class GiftedDialog extends Vue {
         this.axios,
         this.apiServer,
         this.activeDid,
-        giverDid as string,
-        recipientDid as string,
+        giverDid,
+        this.receiver?.did as string,
         description,
         amount,
         unitCode,

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"
         >
-          Add Photo
+          Camera or Other?
         </div>
         <div
           class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"

src/components/OfferDialog.vue

@@ -4,7 +4,6 @@
       <h1 class="text-xl font-bold text-center mb-4">Offer Help</h1>
       <input
         type="text"
-        data-testId="inputDescription"
         class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
         placeholder="Description, prerequisites, terms, etc."
         v-model="description"
@@ -24,7 +23,6 @@
           <fa icon="chevron-left" />
         </div>
         <input
-          data-testId="inputOfferAmount"
           type="number"
           class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
           v-model="amountInput"
@@ -36,27 +34,18 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="mt-4 flex justify-center">
-        <span>
-          <router-link
-            :to="{
-              name: 'offer-details',
-              query: {
-                amountInput,
-                description,
-                offererDid: activeDid,
-                projectId,
-                projectName,
-                recipientDid,
-                recipientName,
-                unitCode: amountUnitCode,
-              },
-            }"
-            class="text-blue-500"
-          >
-            Conditions & more options...
-          </router-link>
+      <div class="flex flex-row mt-2">
+        <span
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
+        >
+          Expiration
         </span>
+        <input
+          type="text"
+          class="w-full border border-slate-400 px-2 py-2 rounded-r"
+          :placeholder="datePlaceholder()"
+          v-model="expirationDateInput"
+        />
       </div>
       <p class="text-center mt-6 mb-2 italic">
         Sign & Send to publish to the world
@@ -80,6 +69,7 @@
 </template>
 
 <script lang="ts">
+import { DateTime } from "luxon";
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
 import { NotificationIface } from "@/constants/app";
@@ -92,8 +82,7 @@ import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 export default class OfferDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  @Prop projectId?;
-  @Prop projectName?;
+  @Prop projectId? = "";
 
   activeDid = "";
   apiServer = "";
@@ -103,15 +92,13 @@ export default class OfferDialog extends Vue {
   description = "";
   expirationDateInput = "";
   recipientDid? = "";
-  recipientName? = "";
   visible = false;
 
   libsUtil = libsUtil;
 
-  async open(recipientDid?: string, recipientName?: string) {
+  async open(recipientDid?: string) {
     try {
       this.recipientDid = recipientDid;
-      this.recipientName = recipientName;
 
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
@@ -157,6 +144,12 @@ export default class OfferDialog extends Vue {
     )}`;
   }
 
+  datePlaceholder() {
+    return (
+      "Date, eg. " + DateTime.now().plus({ month: 1 }).toISO().slice(0, 10)
+    );
+  }
+
   cancel() {
     this.close();
     this.eraseValues();

src/components/PhotoDialog.vue

@@ -350,7 +350,6 @@ export default class PhotoDialog extends Vue {
     const token = await accessToken(this.activeDid);
     const headers = {
       Authorization: "Bearer " + token,
-      // axios fills in Content-Type of multipart/form-data
     };
     const formData = new FormData();
     if (!this.blob) {

src/components/TopMessage.vue

@@ -1,15 +1,5 @@
 <template>
-  <div class="absolute right-5 top-3">
-    <span class="align-center text-red-500 mr-2">{{ message }}</span>
-    <span class="ml-2">
-      <router-link
-        :to="{ name: 'help' }"
-        class="text-xs 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-1.5 py-1 rounded-md ml-1"
-      >
-        Help
-      </router-link>
-    </span>
-  </div>
+  <div class="text-center text-red-500">{{ message }}</div>
 </template>
 
 <script lang="ts">

src/components/UserNameDialog.vue

@@ -1,96 +0,0 @@
-<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/db/index.ts

@@ -51,8 +51,8 @@ db.version(2).stores({
 db.version(3).stores(TempSchema);
 
 // Event handler to initialize the non-sensitive database with default settings
-db.on("populate", async () => {
-  await db.settings.add({
+db.on("populate", () => {
+  db.settings.add({
     id: MASTER_SETTINGS_KEY,
     apiServer: DEFAULT_ENDORSER_API_SERVER,
   });

src/db/tables/contacts.ts

@@ -4,8 +4,8 @@ export interface Contact {
   nextPubKeyHashB64?: string; // base64-encoded SHA256 hash of next public key
   profileImageUrl?: string;
   publicKeyBase64?: string;
-  seesMe?: boolean; // cached value of the server setting
-  registered?: boolean; // cached value of the server setting
+  seesMe?: boolean;
+  registered?: boolean;
 }
 
 export const ContactSchema = {

src/db/tables/temp.ts

@@ -2,8 +2,7 @@
 
 export type Temp = {
   id: string;
-  blob?: Blob; // deprecated because webkit (Safari) does not support Blob
-  blobB64?: string; // base64-encoded blob
+  blob?: Blob;
 };
 
 /**

src/libs/crypto/vc/index.ts

@@ -67,7 +67,7 @@ export async function createEndorserJwtForKey(
  *  The SimpleSigner returns a configured function for signing data.
  *
  *  @example
- *  const signer = SimpleSigner(privateKeyHexString)
+ *  const signer = SimpleSigner(import.meta.env.PRIVATE_KEY)
  *  signer(data, (err, signature) => {
  *    ...
  *  })

src/libs/endorserServer.ts

@@ -1,16 +1,14 @@
 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, deriveAddress, nextDerivationPath } from "@/libs/crypto";
-import { NonsensitiveDexie } from "@/db/index";
+import { accessToken } from "@/libs/crypto";
+import { db, NonsensitiveDexie } from "@/db/index";
 import { getAccount, getPasskeyExpirationSeconds } from "@/libs/util";
 import { createEndorserJwtForKey, KeyMeta } from "@/libs/crypto/vc";
-import { Account } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 // the object in RegisterAction claims
@@ -51,32 +49,29 @@ export interface ClaimResult {
 }
 
 export interface GenericVerifiableCredential {
-  "@context"?: string; // optional when embedded, eg. in an Agree
+  "@context": string;
   "@type": string;
   [key: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
 }
 
-export interface GenericCredWrapper<T extends GenericVerifiableCredential> {
-  "@context": string;
-  "@type": string;
-  claim: T;
-  claimType?: string;
+export interface GenericCredWrapper extends GenericVerifiableCredential {
   handleId: string;
   id: string;
   issuedAt: string;
   issuer: string;
-  publicUrls?: Record<string, string>; // only for IDs that want to be public
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  claim: Record<string, any>;
+  claimType?: string;
 }
-export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper<GenericVerifiableCredential> =
-  {
-    "@context": SCHEMA_ORG_CONTEXT,
-    "@type": "",
-    claim: { "@type": "" },
-    handleId: "",
-    id: "",
-    issuedAt: "",
-    issuer: "",
-  };
+export const BLANK_GENERIC_SERVER_RECORD: GenericCredWrapper = {
+  "@context": SCHEMA_ORG_CONTEXT,
+  "@type": "",
+  claim: {},
+  handleId: "",
+  id: "",
+  issuedAt: "",
+  issuer: "",
+};
 
 // a summary record; the VC is found the fullClaim field
 export interface GiveSummaryRecord {
@@ -88,7 +83,6 @@ export interface GiveSummaryRecord {
   fulfillsPlanHandleId: string;
   handleId: string;
   issuedAt: string;
-  issuerDid: string;
   jwtId: string;
   recipientDid: string;
   unit: string;
@@ -102,7 +96,6 @@ export interface OfferSummaryRecord {
   fullClaim: OfferVerifiableCredential;
   fulfillsPlanHandleId: string;
   handleId: string;
-  issuerDid: string;
   jwtId: string;
   nonAmountGivenConfirmed: number;
   objectDescription: string;
@@ -131,7 +124,7 @@ export interface PlanSummaryRecord {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id4
-export interface GiveVerifiableCredential extends GenericVerifiableCredential {
+export interface GiveVerifiableCredential {
   "@context"?: string; // optional when embedded, eg. in an Agree
   "@type": "GiveAction";
   agent?: { identifier: string };
@@ -145,13 +138,13 @@ export interface GiveVerifiableCredential extends GenericVerifiableCredential {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id8
-export interface OfferVerifiableCredential extends GenericVerifiableCredential {
-  "@context"?: string; // optional when embedded... though it doesn't make sense to agree to an offer
+export interface OfferVerifiableCredential {
+  "@context"?: string; // optional when embedded, eg. in an Agree
   "@type": "Offer";
-  description?: string; // conditions for the offer
+  description?: string;
   includesObject?: { amountOfThisGood: number; unitCode: string };
   itemOffered?: {
-    description?: string; // description of the item
+    description?: string;
     isPartOf?: { identifier?: string; lastClaimId?: string; "@type"?: string };
   };
   offeredBy?: { identifier: string };
@@ -161,7 +154,7 @@ export interface OfferVerifiableCredential extends GenericVerifiableCredential {
 
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id7
-export interface PlanVerifiableCredential extends GenericVerifiableCredential {
+export interface PlanVerifiableCredential {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
@@ -199,7 +192,7 @@ export interface PlanData {
    */
   issuerDid: string;
   /**
-   * The identifier of the project -- different from jwtId, needs to be fixed
+   * The Identier of the project -- different from jwtId, needs to be fixed
    **/
   rowid?: string;
 }
@@ -273,6 +266,10 @@ export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
 // See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
 const HIDDEN_DID = "did:none:HIDDEN";
 
+const planCache: LRUCache<string, PlanSummaryRecord> = new LRUCache({
+  max: 500,
+});
+
 export function isDid(did: string) {
   return did.startsWith("did:");
 }
@@ -509,10 +506,6 @@ export async function getHeaders(did?: string) {
   return headers;
 }
 
-const planCache: LRUCache<string, PlanSummaryRecord> = new LRUCache({
-  max: 500,
-});
-
 /**
  * @param handleId nullable, in which case "undefined" will be returned
  * @param requesterDid optional, in which case no private info will be returned
@@ -569,12 +562,9 @@ export async function setPlanInCache(
 
 /**
  * Construct GiveAction VC for submission to server
- *
- * @param lastClaimId supplied when editing a previous claim
  */
-export function hydrateGive(
-  vcClaimOrig?: GiveVerifiableCredential,
-  fromDid?: string,
+export function constructGive(
+  fromDid?: string | null,
   toDid?: string,
   description?: string,
   amount?: number,
@@ -583,207 +573,35 @@ export function hydrateGive(
   fulfillsOfferHandleId?: string,
   isTrade: boolean = false,
   imageUrl?: string,
-  lastClaimId?: string,
 ): GiveVerifiableCredential {
-  // Remember: replace values or erase if it's null
-
-  const vcClaim: GiveVerifiableCredential = vcClaimOrig
-    ? R.clone(vcClaimOrig)
-    : {
-        "@context": SCHEMA_ORG_CONTEXT,
-        "@type": "GiveAction",
-      };
-
-  if (lastClaimId) {
-    // this is an edit
-    vcClaim.lastClaimId = lastClaimId;
-    delete vcClaim.identifier;
-  }
-
-  vcClaim.agent = fromDid ? { identifier: fromDid } : undefined;
-  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  vcClaim.description = description || undefined;
-  vcClaim.object =
-    amount && !isNaN(amount)
+  const vcClaim: GiveVerifiableCredential = {
+    "@context": SCHEMA_ORG_CONTEXT,
+    "@type": "GiveAction",
+    recipient: toDid ? { identifier: toDid } : undefined,
+    agent: fromDid ? { identifier: fromDid } : undefined,
+    description: description || undefined,
+    object: amount
       ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-      : undefined;
-
-  // ensure fulfills is an array
-  if (!Array.isArray(vcClaim.fulfills)) {
-    vcClaim.fulfills = vcClaim.fulfills ? [vcClaim.fulfills] : [];
-  }
-  // ... and replace or add each element, ending with Trade or Donate
-  // I realize the following doesn't change any elements that are not PlanAction or Offer or Trade/Action.
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) => elem["@type"] !== "PlanAction",
-  );
+      : undefined,
+    fulfills: [{ "@type": isTrade ? "TradeAction" : "DonateAction" }],
+  };
   if (fulfillsProjectHandleId) {
+    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
     vcClaim.fulfills.push({
       "@type": "PlanAction",
       identifier: fulfillsProjectHandleId,
     });
   }
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) => elem["@type"] !== "Offer",
-  );
   if (fulfillsOfferHandleId) {
+    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
     vcClaim.fulfills.push({
       "@type": "Offer",
       identifier: fulfillsOfferHandleId,
     });
   }
-  // do Trade/Donate last because current endorser.ch only looks at the first for plans & offers
-  vcClaim.fulfills = vcClaim.fulfills.filter(
-    (elem) =>
-      elem["@type"] !== "DonateAction" && elem["@type"] !== "TradeAction",
-  );
-  vcClaim.fulfills.push({ "@type": isTrade ? "TradeAction" : "DonateAction" });
-
-  vcClaim.image = imageUrl || undefined;
-
-  return vcClaim;
-}
-
-/**
- *  For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
- *
- * @param fromDid may be null
- * @param toDid
- * @param description may be null
- * @param amount may be null
- */
-export async function createAndSubmitGive(
-  axios: Axios,
-  apiServer: string,
-  issuerDid: string,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  amount?: number,
-  unitCode?: string,
-  fulfillsProjectHandleId?: string,
-  fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
-  imageUrl?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateGive(
-    undefined,
-    fromDid,
-    toDid,
-    description,
-    amount,
-    unitCode,
-    fulfillsProjectHandleId,
-    fulfillsOfferHandleId,
-    isTrade,
-    imageUrl,
-    undefined,
-  );
-  return createAndSubmitClaim(
-    vcClaim as GenericVerifiableCredential,
-    issuerDid,
-    apiServer,
-    axios,
-  );
-}
-
-/**
- * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
- *
- * @param fromDid may be null
- * @param toDid may be null if project is provided
- * @param description may be null
- * @param amount may be null
- */
-export async function editAndSubmitGive(
-  axios: Axios,
-  apiServer: string,
-  fullClaim: GenericCredWrapper<GiveVerifiableCredential>,
-  issuerDid: string,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  amount?: number,
-  unitCode?: string,
-  fulfillsProjectHandleId?: string,
-  fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
-  imageUrl?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateGive(
-    fullClaim.claim,
-    fromDid,
-    toDid,
-    description,
-    amount,
-    unitCode,
-    fulfillsProjectHandleId,
-    fulfillsOfferHandleId,
-    isTrade,
-    imageUrl,
-    fullClaim.id,
-  );
-  return createAndSubmitClaim(
-    vcClaim as GenericVerifiableCredential,
-    issuerDid,
-    apiServer,
-    axios,
-  );
-}
-
-/**
- * Construct Offer VC for submission to server
- *
- * @param lastClaimId supplied when editing a previous claim
- */
-export function hydrateOffer(
-  vcClaimOrig?: OfferVerifiableCredential,
-  fromDid?: string,
-  toDid?: string,
-  itemDescription?: string,
-  amount?: number,
-  unitCode?: string,
-  conditionDescription?: string,
-  fulfillsProjectHandleId?: string,
-  validThrough?: string,
-  lastClaimId?: string,
-): OfferVerifiableCredential {
-  // Remember: replace values or erase if it's null
-
-  const vcClaim: OfferVerifiableCredential = vcClaimOrig
-    ? R.clone(vcClaimOrig)
-    : {
-        "@context": SCHEMA_ORG_CONTEXT,
-        "@type": "Offer",
-      };
-
-  if (lastClaimId) {
-    // this is an edit
-    vcClaim.lastClaimId = lastClaimId;
-    delete vcClaim.identifier;
+  if (imageUrl) {
+    vcClaim.image = imageUrl;
   }
-
-  vcClaim.offeredBy = fromDid ? { identifier: fromDid } : undefined;
-  vcClaim.recipient = toDid ? { identifier: toDid } : undefined;
-  vcClaim.description = conditionDescription || undefined;
-
-  vcClaim.includesObject =
-    amount && !isNaN(amount)
-      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
-      : undefined;
-
-  if (itemDescription || fulfillsProjectHandleId) {
-    vcClaim.itemOffered = vcClaim.itemOffered || {};
-    vcClaim.itemOffered.description = itemDescription || undefined;
-    if (fulfillsProjectHandleId) {
-      vcClaim.itemOffered.isPartOf = {
-        "@type": "PlanAction",
-        identifier: fulfillsProjectHandleId,
-      };
-    }
-  }
-  vcClaim.validThrough = validThrough || undefined;
-
   return vcClaim;
 }
 
@@ -791,70 +609,91 @@ export function hydrateOffer(
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
  * @param identity
- * @param description may be null
- * @param amount may be null
- * @param validThrough ISO 8601 date string YYYY-MM-DD (may be null)
- * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
+ * @param fromDid may be null
+ * @param toDid
+ * @param description may be null; should have this or amount
+ * @param amount may be null; should have this or description
  */
-export async function createAndSubmitOffer(
+export async function createAndSubmitGive(
   axios: Axios,
   apiServer: string,
   issuerDid: string,
-  itemDescription: string,
+  fromDid?: string | null,
+  toDid?: string,
+  description?: string,
   amount?: number,
   unitCode?: string,
-  conditionDescription?: string,
-  validThrough?: string,
-  recipientDid?: string,
   fulfillsProjectHandleId?: string,
+  fulfillsOfferHandleId?: string,
+  isTrade: boolean = false,
+  imageUrl?: string,
 ): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
-    undefined,
-    issuerDid,
-    recipientDid,
-    itemDescription,
+  const vcClaim = constructGive(
+    fromDid,
+    toDid,
+    description,
     amount,
     unitCode,
-    conditionDescription,
     fulfillsProjectHandleId,
-    validThrough,
-    undefined,
+    fulfillsOfferHandleId,
+    isTrade,
+    imageUrl,
   );
   return createAndSubmitClaim(
-    vcClaim as OfferVerifiableCredential,
+    vcClaim as GenericCredWrapper,
     issuerDid,
     apiServer,
     axios,
   );
 }
 
-export async function editAndSubmitOffer(
+/**
+ * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
+ *
+ * @param identity
+ * @param description may be null; should have this or amount
+ * @param amount may be null; should have this or description
+ * @param expirationDate ISO 8601 date string YYYY-MM-DD (may be null)
+ * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
+ */
+export async function createAndSubmitOffer(
   axios: Axios,
   apiServer: string,
-  fullClaim: GenericCredWrapper<OfferVerifiableCredential>,
   issuerDid: string,
-  itemDescription: string,
+  description?: string,
   amount?: number,
   unitCode?: string,
-  conditionDescription?: string,
-  validThrough?: string,
+  expirationDate?: string,
   recipientDid?: string,
   fulfillsProjectHandleId?: string,
 ): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
-    fullClaim.claim,
-    issuerDid,
-    recipientDid,
-    itemDescription,
-    amount,
-    unitCode,
-    conditionDescription,
-    fulfillsProjectHandleId,
-    validThrough,
-    fullClaim.id,
-  );
+  const vcClaim: OfferVerifiableCredential = {
+    "@context": SCHEMA_ORG_CONTEXT,
+    "@type": "Offer",
+    offeredBy: { identifier: issuerDid },
+    validThrough: expirationDate || undefined,
+  };
+  if (amount) {
+    vcClaim.includesObject = {
+      amountOfThisGood: amount,
+      unitCode: unitCode || "HUR",
+    };
+  }
+  if (description) {
+    vcClaim.itemOffered = { description };
+  }
+  if (recipientDid) {
+    vcClaim.recipient = { identifier: recipientDid };
+  }
+  if (fulfillsProjectHandleId) {
+    vcClaim.itemOffered = vcClaim.itemOffered || {};
+    vcClaim.itemOffered.isPartOf = {
+      "@type": "PlanAction",
+      identifier: fulfillsProjectHandleId,
+    };
+  }
   return createAndSubmitClaim(
-    vcClaim as OfferVerifiableCredential,
+    vcClaim as GenericCredWrapper,
     issuerDid,
     apiServer,
     axios,
@@ -913,7 +752,7 @@ export async function createAndSubmitClaim(
     return { type: "success", response };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } catch (error: any) {
-    console.error("Error submitting claim:", error);
+    console.error("Error creating claim:", error);
     const errorMessage: string =
       error.response?.data?.error?.message ||
       error.message ||
@@ -928,53 +767,6 @@ 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,
@@ -1029,29 +821,24 @@ export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => {
  similar code is also contained in endorser-mobile
  **/
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-const claimSummary = (
-  claim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
+const claimSummary = (claim: Record<string, any>) => {
   if (!claim) {
     // to differentiate from "something" above
     return "something";
   }
-  let specificClaim:
-    | GenericVerifiableCredential
-    | GenericCredWrapper<GenericVerifiableCredential> = claim;
   if (claim.claim) {
     // probably a Verified Credential
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    specificClaim = claim.claim;
+    claim = claim.claim as Record<string, any>;
   }
-  if (Array.isArray(specificClaim)) {
-    if (specificClaim.length === 1) {
-      specificClaim = specificClaim[0];
+  if (Array.isArray(claim)) {
+    if (claim.length === 1) {
+      claim = claim[0];
     } else {
       return "multiple claims";
     }
   }
-  const type = specificClaim["@type"];
+  const type = claim["@type"];
   if (!type) {
     return "a claim";
   } else {
@@ -1072,7 +859,7 @@ const claimSummary = (
  similar code is also contained in endorser-mobile
  **/
 export const claimSpecialDescription = (
-  record: GenericCredWrapper<GenericVerifiableCredential>,
+  record: GenericCredWrapper,
   activeDid: string,
   identifiers: Array<string>,
   contacts: Array<Contact>,
@@ -1166,11 +953,7 @@ export const claimSpecialDescription = (
       "...]"
     );
   } else {
-    return (
-      issuer +
-      " declared " +
-      claimSummary(claim as GenericCredWrapper<GenericVerifiableCredential>)
-    );
+    return issuer + " declared " + claimSummary(claim as GenericCredWrapper);
   }
 };
 
@@ -1270,11 +1053,8 @@ export async function setVisibilityUtil(
   try {
     const resp = await axios.post(url, payload, { headers });
     if (resp.status === 200) {
-      const success = resp.data.success;
-      if (success) {
-        db.contacts.update(contact.did, { seesMe: visibility });
-      }
-      return { success };
+      db.contacts.update(contact.did, { seesMe: visibility });
+      return { success: true };
     } else {
       console.error(
         "Got some bad server response when setting visibility: ",

src/libs/util.ts

@@ -1,38 +1,28 @@
 // many of these are also found in endorser-mobile utility.ts
 
 import axios, { AxiosResponse } from "axios";
-import { Buffer } from "buffer";
-import * as R from "ramda";
 import { useClipboard } from "@vueuse/core";
 
 import { DEFAULT_PUSH_SERVER } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
-import {
-  DEFAULT_PASSKEY_EXPIRATION_MINUTES,
-  MASTER_SETTINGS_KEY,
-} from "@/db/tables/settings";
+import {DEFAULT_PASSKEY_EXPIRATION_MINUTES, MASTER_SETTINGS_KEY} from "@/db/tables/settings";
 import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
-import {
-  containsHiddenDid,
-  GenericCredWrapper,
-  GenericVerifiableCredential,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
+import { GenericCredWrapper, containsHiddenDid } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
+import { registerCredential } from "@/libs/crypto/vc/passkeyDidPeer";
+
+import { Buffer } from "buffer";
 import { KeyMeta } from "@/libs/crypto/vc";
 import { createPeerDid } from "@/libs/crypto/vc/didPeer";
-import { registerCredential } from "@/libs/crypto/vc/passkeyDidPeer";
 
 export const PRIVACY_MESSAGE =
   "The data you send will be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to them and others you explicitly allow.";
-export const SHARED_PHOTO_BASE64_KEY = "shared-photo-base64";
 
 /* eslint-disable prettier/prettier */
 export const UNIT_SHORT: Record<string, string> = {
-  "BTC": "BTC",
   "BX": "BX",
+  "BTC": "BTC",
   "ETH": "ETH",
   "HUR": "Hours",
   "USD": "US $",
@@ -41,8 +31,8 @@ export const UNIT_SHORT: Record<string, string> = {
 
 /* eslint-disable prettier/prettier */
 export const UNIT_LONG: Record<string, string> = {
-  "BTC": "Bitcoin",
   "BX": "Buxbe",
+  "BTC": "Bitcoin",
   "ETH": "Ethereum",
   "HUR": "hours",
   "USD": "dollars",
@@ -86,34 +76,10 @@ export const isGlobalUri = (uri: string) => {
   return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
 };
 
-export const isGiveAction = (
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
+export const isGiveAction = (veriClaim: GenericCredWrapper) => {
   return veriClaim.claimType === "GiveAction";
 };
 
-export const nameForDid = (
-  activeDid: string,
-  contacts: Array<Contact>,
-  did: string,
-): string => {
-  if (did === activeDid) {
-    return "you";
-  }
-  const contact = R.find((con) => con.did == did, contacts);
-  return nameForContact(contact);
-};
-
-export const nameForContact = (
-  contact?: Contact,
-  capitalize?: boolean,
-): string => {
-  return (
-    (contact?.name as string) ||
-    (capitalize ? "This" : "this") + " unnamed user"
-  );
-};
-
 export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
   fn();
   useClipboard()
@@ -126,13 +92,11 @@ export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
 export const isGiveRecordTheUserCanConfirm = (
-  isRegistered: boolean,
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
+  veriClaim: GenericCredWrapper,
   activeDid: string,
   confirmerIdList: string[] = [],
 ) => {
   return (
-    isRegistered &&
     isGiveAction(veriClaim) &&
     !confirmerIdList.includes(activeDid) &&
     veriClaim.issuer !== activeDid &&
@@ -140,45 +104,13 @@ export const isGiveRecordTheUserCanConfirm = (
   );
 };
 
-export async function blobToBase64(blob: Blob): Promise<string> {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => resolve(reader.result as string); // potential problem if it returns an ArrayBuffer?
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-}
-
-export function base64ToBlob(base64DataUrl: string, sliceSize = 512) {
-  // Extract the content type and the Base64 data
-  const [metadata, base64] = base64DataUrl.split(",");
-  const contentTypeMatch = metadata.match(/data:(.*?);base64/);
-  const contentType = contentTypeMatch ? contentTypeMatch[1] : "";
-
-  const byteCharacters = atob(base64);
-  const byteArrays = [];
-
-  for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
-    const slice = byteCharacters.slice(offset, offset + sliceSize);
-
-    const byteNumbers = new Array(slice.length);
-    for (let i = 0; i < slice.length; i++) {
-      byteNumbers[i] = slice.charCodeAt(i);
-    }
-
-    const byteArray = new Uint8Array(byteNumbers);
-    byteArrays.push(byteArray);
-  }
-  return new Blob(byteArrays, { type: contentType });
-}
-
 /**
  * @returns the DID of the person who offered, or undefined if hidden
  * @param veriClaim is expected to have fields: claim and issuer
  */
-export const offerGiverDid: (
-  arg0: GenericCredWrapper<OfferVerifiableCredential>,
-) => string | undefined = (veriClaim) => {
+export const offerGiverDid: (arg0: GenericCredWrapper) => string | undefined = (
+  veriClaim,
+) => {
   let giver;
   if (
     veriClaim.claim.offeredBy?.identifier &&
@@ -195,13 +127,8 @@ export const offerGiverDid: (
  * @returns true if the user can fulfill the offer
  * @param veriClaim is expected to have fields: claim, claimType, and issuer
  */
-export const canFulfillOffer = (
-  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
-) => {
-  return !!(
-    veriClaim.claimType === "Offer" &&
-    offerGiverDid(veriClaim as GenericCredWrapper<OfferVerifiableCredential>)
-  );
+export const canFulfillOffer = (veriClaim: GenericCredWrapper) => {
+  return !!(veriClaim.claimType === "Offer" && offerGiverDid(veriClaim));
 };
 
 // return object with paths and arrays of DIDs for any keys ending in "VisibleToDid"

src/registerServiceWorker.ts

@@ -2,7 +2,6 @@
 
 import { register } from "register-service-worker";
 
-// NODE_ENV is "production" by default with "vite build". See https://vitejs.dev/guide/env-and-mode
 if (import.meta.env.NODE_ENV === "production") {
   register("/sw_scripts-combined.js", {
     ready() {

src/router/index.ts

@@ -63,11 +63,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "contact-gift",
     component: () => import("../views/ContactGiftingView.vue"),
   },
-  {
-    path: "/contact-import",
-    name: "contact-import",
-    component: () => import("../views/ContactImportView.vue"),
-  },
   {
     path: "/contact-qr",
     name: "contact-qr",
@@ -91,7 +86,7 @@ const routes: Array<RouteRecordRaw> = [
   {
     path: "/gifted-details",
     name: "gifted-details",
-    component: () => import("@/views/GiftedDetailsView.vue"),
+    component: () => import("../views/GiftedDetails.vue"),
   },
   {
     path: "/help",
@@ -143,11 +138,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "new-identifier",
     component: () => import("../views/NewIdentifierView.vue"),
   },
-  {
-    path: "/offer-details/:id?",
-    name: "offer-details",
-    component: () => import("../views/OfferDetailsView.vue"),
-  },
   {
     path: "/project/:id?",
     name: "project",
@@ -189,19 +179,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",
     component: () => import("@/views/SharedPhotoView.vue"),
   },
-
-  // /share-target is also an endpoint in the service worker
-
   {
     path: "/start",
     name: "start",

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">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-4">
       Your Identity
     </h1>
 
-    <div class="flex justify-between mb-2 mt-4">
+    <div class="flex justify-between">
       <span />
       <span class="whitespace-nowrap">
         <router-link
@@ -22,10 +22,21 @@
       <span />
     </div>
 
+    <div class="flex justify-between py-2">
+      <span />
+      <span>
+        <router-link
+          :to="{ name: 'help' }"
+          class="text-xs 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-1.5 py-1 rounded-md ml-1"
+        >
+          Help
+        </router-link>
+      </span>
+    </div>
+
     <!-- ID notice -->
     <div
       v-if="!activeDid"
-      id="noticeBeforeShare"
       class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
     >
       <p class="mb-4">
@@ -41,10 +52,7 @@
     </div>
 
     <!-- Identity Details -->
-    <div
-      id="sectionIdentityDetails"
-      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 mb-4">
       <div v-if="givenName">
         <h2 class="text-xl font-semibold mb-2">
           {{ givenName }}
@@ -55,17 +63,14 @@
       </div>
       <span
         v-else
-        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"
+        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"
       >
-        <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"
+        <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"
         >
           Set Your Name
-        </button>
-        <UserNameDialog ref="userNameDialog" />
+        </router-link>
       </span>
       <div class="flex justify-center mt-4">
         <span v-if="profileImageUrl" class="flex justify-between">
@@ -132,10 +137,7 @@
       </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"
-        data-testId="didWrapper"
-      >
+      <div class="text-sm text-slate-500 flex justify-start items-center mb-1">
         <code class="truncate">{{ activeDid }}</code>
         <button
           @click="
@@ -159,7 +161,6 @@
     <!-- We won't show any loading indicator because it usually doesn't change anything. We'll just pop the message in only if we discover that they need it. -->
     <div
       v-if="!loadingLimits && !endorserLimits?.nextWeekBeginDateTime"
-      id="noticeBeforeAnnounce"
       class="bg-amber-200 text-amber-900 border-amber-500 border-dashed border text-center rounded-md overflow-hidden px-4 py-3 mb-4"
     >
       <p class="mb-4">
@@ -174,10 +175,7 @@
       </router-link>
     </div>
 
-    <div
-      id="sectionNotifications"
-      class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
-    >
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
       <!-- label -->
       <div class="mb-2 font-bold">Notifications</div>
       <div
@@ -213,15 +211,12 @@
       </router-link>
     </div>
 
-    <div
-      id="sectionSearchLocation"
-      class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
-    >
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
       <!-- label -->
-      <div class="mb-2 font-bold">Location for Searches</div>
+      <div class="mb-2 font-bold">Location</div>
       <router-link
         :to="{ name: 'search-area' }"
-        class="block w-full text-center text-m 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-2 rounded-md mb-2 mt-6"
+        class="block w-full text-center text-m 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-1.5 py-2 rounded-md mb-2 mt-6"
       >
         Set Search Area…
         <!-- If already set, change button label to "Change Search Area" -->
@@ -230,7 +225,6 @@
 
     <div
       v-if="activeDid"
-      id="sectionUsageLimits"
       class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
     >
       <div class="mb-2 font-bold">Usage Limits</div>
@@ -283,22 +277,19 @@
       </button>
     </div>
 
-    <div
-      id="sectionDataExport"
-      class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8"
-    >
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-4 mt-8 mb-8">
       <div class="mb-2 font-bold">Data Export</div>
       <router-link
         :to="{ name: 'seed-backup' }"
         v-if="activeDid"
-        class="block w-full text-center 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-1.5 py-2 rounded-md mb-2 mt-2"
+        class="block w-full 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-1.5 py-2 rounded-md mb-2 mt-2"
       >
         Backup Identifier Seed
       </router-link>
 
       <button
         v-bind:class="computedStartDownloadLinkClassNames()"
-        class="block w-full text-center 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-1.5 py-2 rounded-md"
+        class="block w-full 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-1.5 py-2 rounded-md"
         @click="exportDatabase()"
       >
         Download Settings & Contacts
@@ -312,23 +303,6 @@
       >
         If no download happened yet, click again here to download now.
       </a>
-      <div>
-        <p>
-          After the download, you can save the file in your preferred storage
-          location.
-        </p>
-        <ul>
-          <li class="list-disc list-outside ml-4">
-            On iOS: Choose "More..." and select a place in iCloud, or go "Back"
-            and save to another location.
-          </li>
-          <li class="list-disc list-outside ml-4">
-            On Android: Choose "Open" and then share
-            <fa icon="share-nodes" class="fa-fw" />
-            to your prefered place.
-          </li>
-        </ul>
-      </div>
     </div>
 
     <!-- id used by puppeteer test script -->
@@ -339,7 +313,7 @@
     >
       Advanced
     </h3>
-    <div id="sectionAdvanced" v-if="showAdvanced || showGeneralAdvanced">
+    <div v-if="showAdvanced || showGeneralAdvanced">
       <p class="text-rose-600 mb-8">
         Beware: the features here can be confusing and even change data in ways
         you do not expect. But we support your freedom!
@@ -349,10 +323,7 @@
       <span class="text-slate-500 text-sm font-bold mb-2">
         Deep Identifier Details
       </span>
-      <div
-        id="sectionDeepIdentifier"
-        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 mb-4">
         <div class="text-slate-500 text-sm font-bold">Public Key (base 64)</div>
         <div
           class="text-sm text-slate-500 flex justify-start items-center mb-1"
@@ -421,29 +392,22 @@
         Switch Identifier
       </router-link>
 
-      <div id="sectionImportContactsSettings" class="mt-4">
+      <div class="mt-4">
         <h2 class="text-slate-500 text-sm font-bold">
-          Import Contacts & Settings Database
+          Contacts & Settings Database
         </h2>
 
         <div class="ml-4 mt-2">
+          Import
           <input type="file" @change="uploadImportFile" class="ml-2" />
-          <div v-if="showContactImport()" class="mt-4">
+          <div v-if="showContactImport()">
             <button
               class="block text-center 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-1.5 py-2 rounded-md mb-6"
               @click="confirmSubmitImportFile()"
             >
-              Overwrite Settings & Contacts
+              Import Settings & Contacts
               <br />
-              (which doesn't include Identifier Data)
-            </button>
-            <button
-              class="block text-center 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-1.5 py-2 rounded-md mb-6"
-              @click="checkContactImports()"
-            >
-              Import Contacts
-              <br />
-              after comparing
+              (excluding Identifier Data)
             </button>
           </div>
         </div>
@@ -475,7 +439,7 @@
         </div>
       </label>
 
-      <div id="sectionClaimServer">
+      <div>
         <h2 class="text-slate-500 text-sm font-bold mt-4">Claim Server</h2>
         <div class="px-4 py-4">
           <input
@@ -554,7 +518,7 @@
       <h2 class="text-slate-500 text-sm font-bold mb-2">
         Notification Push Server
       </h2>
-      <div id="sectionNotificationPushServer" class="px-3 py-4">
+      <div class="px-3 py-4">
         <input
           type="text"
           class="block w-full rounded border border-slate-400 px-3 py-2"
@@ -592,7 +556,7 @@
         {{ DEFAULT_PUSH_SERVER }}
       </span>
 
-      <div id="sectionImageServerURL" class="mt-2">
+      <div class="mt-2">
         <span class="text-slate-500 text-sm font-bold">Image Server URL</span>
         &nbsp;
         <span class="text-sm">{{ DEFAULT_IMAGE_API_SERVER }}</span>
@@ -657,7 +621,7 @@
         </button>
       </div>
 
-      <div id="sectionPasskeyExpiration" class="flex justify-between">
+      <div class="flex justify-between">
         <span>
           <span class="text-slate-500 text-sm font-bold mb-2">
             Passkey Expiration Minutes
@@ -712,20 +676,17 @@ import { Buffer } from "buffer/";
 import Dexie from "dexie";
 import "dexie-export-import";
 import { ImportProgress } from "dexie-export-import/dist/import";
-import * as R from "ramda";
 import { IIdentifier } from "@veramo/core";
 import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 import { useClipboard } from "@vueuse/core";
 
 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,
+  AppString, DEFAULT_ENDORSER_API_SERVER,
   DEFAULT_IMAGE_API_SERVER,
   DEFAULT_PUSH_SERVER,
   IMAGE_TYPE_PROFILE,
@@ -733,7 +694,6 @@ import {
 } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
 import {
   DEFAULT_PASSKEY_EXPIRATION_MINUTES,
   MASTER_SETTINGS_KEY,
@@ -754,13 +714,7 @@ import { getAccount } from "@/libs/util";
 const inputImportFileNameRef = ref<Blob>();
 
 @Component({
-  components: {
-    EntityIcon,
-    ImageMethodDialog,
-    QuickNav,
-    TopMessage,
-    UserNameDialog,
-  },
+  components: { EntityIcon, ImageMethodDialog, QuickNav, TopMessage },
 })
 export default class AccountViewView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -832,16 +786,10 @@ export default class AccountViewView extends Vue {
        * Beware! I've seen where we never get to this point because "ready" never resolves.
        */
     } catch (error) {
-      // this can happen when running automated tests in dev mode because notifications don't work
       console.error(
         "Telling user to clear cache at page create because:",
         error,
       );
-      // this sometimes gives different information on the error
-      console.error(
-        "Telling user to clear cache at page create because (error added): " +
-          error,
-      );
       this.$notify(
         {
           group: "alert",
@@ -1144,7 +1092,7 @@ export default class AccountViewView extends Vue {
   }
 
   async uploadImportFile(event: Event) {
-    inputImportFileNameRef.value = (event.target as EventTarget).files[0];
+    inputImportFileNameRef.value = event.target.files[0];
   }
 
   showContactImport() {
@@ -1182,40 +1130,6 @@ export default class AccountViewView extends Vue {
     }
   }
 
-  async checkContactImports() {
-    const reader = new FileReader();
-    reader.onload = (event) => {
-      const fileContent: string = (event.target?.result as string) || "{}";
-      try {
-        const contents = JSON.parse(fileContent);
-        const contactTableRows: Array<Contact> = (
-          contents.data?.data as [{ tableName: string; rows: Array<Contact> }]
-        )?.find((table) => table.tableName === "contacts")
-          ?.rows as Array<Contact>;
-        const contactRows = contactTableRows.map(
-          // @ts-expect-error for omitting this field that is found in the Dexie format
-          (contact) => R.omit(["$types"], contact) as Contact,
-        );
-        (this.$router as Router).push({
-          name: "contact-import",
-          query: { contacts: JSON.stringify(contactRows) },
-        });
-      } catch (error) {
-        console.error("Error checking contact imports:", error);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Importing",
-            text: "There was an error reading that Dexie file.",
-          },
-          3000,
-        );
-      }
-    };
-    reader.readAsText(inputImportFileNameRef.value as Blob);
-  }
-
   private progressCallback(progress: ImportProgress) {
     console.log(
       `Import progress: ${progress.completedRows} of ${progress.totalRows} rows completed.`,
@@ -1289,6 +1203,17 @@ export default class AccountViewView extends Vue {
       }
     } catch (error) {
       this.handleRateLimitsError(error);
+
+      try {
+        await db.open();
+        await db.settings.update(MASTER_SETTINGS_KEY, {
+          isRegistered: false,
+        });
+        this.isRegistered = false;
+      } catch (err) {
+        console.error("Got an error marking user not registered:", err);
+        // already set an error notification for the user
+      }
     }
 
     this.loadingLimits = false;

src/views/ClaimAddRawView.vue

@@ -29,17 +29,19 @@
 </template>
 
 <script lang="ts">
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
+import GiftedDialog from "@/components/GiftedDialog.vue";
 import { NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import * as serverUtil from "@/libs/endorserServer";
 import QuickNav from "@/components/QuickNav.vue";
+import { Account } from "@/db/tables/accounts";
 
 @Component({
-  components: { QuickNav },
+  components: { GiftedDialog, QuickNav },
 })
 export default class ClaimAddRawView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -55,7 +57,7 @@ export default class ClaimAddRawView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
 
-    this.claimStr = (this.$route as Router).query["claim"];
+    this.claimStr = this.$route.query.claim;
     try {
       this.veriClaim = JSON.parse(this.claimStr);
       this.claimStr = JSON.stringify(this.veriClaim, null, 2);

src/views/ClaimView.vue

@@ -22,18 +22,6 @@
         <div class="overflow-hidden">
           <h2 class="text-md font-bold">
             {{ capitalizeAndInsertSpacesBeforeCaps(veriClaim.claimType) }}
-            <button
-              v-if="
-                ['GiveAction', 'Offer'].includes(
-                  veriClaim.claimType as string,
-                ) && veriClaim.issuer === activeDid
-              "
-              @click="onClickEditClaim"
-              title="Edit"
-              data-testId="editClaimButton"
-            >
-              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
-            </button>
           </h2>
           <div class="text-sm">
             <div>
@@ -51,12 +39,9 @@
               </button>
               <span v-show="showIdCopy">Copied ID</span>
             </div>
-            <div data-testId="description">
+            <div>
               <fa icon="message" class="fa-fw text-slate-400" />
-              {{
-                veriClaim.claim?.itemOffered?.description ||
-                veriClaim.claim?.description
-              }}
+              {{ veriClaim.claim?.description }}
             </div>
             <div>
               <fa icon="user" class="fa-fw text-slate-400" />
@@ -80,11 +65,6 @@
               <fa icon="calendar" class="fa-fw text-slate-400" />
               {{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
             </div>
-            <div v-if="veriClaim.claim.image" class="flex justify-center">
-              <a :href="veriClaim.claim.image" target="_blank">
-                <img :src="veriClaim.claim.image" class="h-24 rounded-xl" />
-              </a>
-            </div>
 
             <!-- Fullfills Links -->
 
@@ -141,7 +121,32 @@
       </div>
     </div>
 
-    <div class="mt-8">
+    <div class="flex columns-3">
+      <button
+        class="col-span-1 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"
+        v-if="
+          libsUtil.isGiveRecordTheUserCanConfirm(
+            veriClaim,
+            activeDid,
+            confirmerIdList,
+          )
+        "
+        @click="confirmConfirmClaim()"
+      >
+        Confirm
+        <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
+      </button>
+
+      <span class="px-4 py-2">
+        <router-link
+          v-if="libsUtil.isGiveAction(veriClaim)"
+          :to="'/confirm-gift/' + encodeURIComponent(veriClaim.id)"
+          class="col-span-1 text-blue-500"
+        >
+          Confirmation Details...
+        </router-link>
+      </span>
+
       <button
         v-if="libsUtil.canFulfillOffer(veriClaim)"
         @click="openFulfillGiftDialog()"
@@ -151,38 +156,10 @@
         <fa icon="hand-holding-heart" class="ml-2 text-white cursor-pointer" />
       </button>
     </div>
+    <GiftedDialog ref="customGiveDialog" />
 
     <div v-if="libsUtil.isGiveAction(veriClaim)">
-      <div class="flex columns-3">
-        <button
-          class="col-span-1 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-4 py-2 rounded-md"
-          v-if="
-            libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
-              veriClaim,
-              activeDid,
-              confirmerIdList,
-            )
-          "
-          @click="confirmConfirmClaim()"
-        >
-          Confirm
-          <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
-        </button>
-        <h2 v-else class="font-bold uppercase text-xl mt-2">Confirmations</h2>
-
-        <span class="mt-0.5 px-4 py-2">
-          <router-link
-            v-if="libsUtil.isGiveAction(veriClaim)"
-            :to="'/confirm-gift/' + encodeURIComponent(veriClaim.id)"
-            class="col-span-1 text-blue-500"
-            data-testId="confirmGiftLink"
-          >
-            Details...
-          </router-link>
-        </span>
-      </div>
-      <GiftedDialog ref="customGiveDialog" />
+      <h2 class="font-bold uppercase text-xl mt-8 mb-2">Confirmations</h2>
 
       <span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
       <span v-else-if="totalConfirmers() === 1">
@@ -312,15 +289,13 @@
           <a @click="onClickShareClaim()" class="text-blue-500"
             >click to send them this info</a
           >
-          and see if they are willing to make an introduction. They are surely
-          connected to someone; if you don't know who to ask, you might try the
-          person who registered you.
+          and see if they are willing to make an introduction.
         </span>
         <span v-else>
           If you'd like to ask any of your contacts to take a look and see if
           their contacts can see more details,
           <a
-            @click="copyToClipboard('This page location', windowLocation)"
+            @click="copyToClipboard('Location', windowLocation)"
             class="text-blue-500"
             >share this page with them</a
           >
@@ -393,19 +368,9 @@
           </div>
         </div>
       </div>
-      <span v-if="isEditedGlobalId" class="mt-2">
-        This record is an edited version. The latest version is here.
-      </span>
-      <br />
-      <button @click="showVeriClaimDump = !showVeriClaimDump" class="ml-2">
-        Details
-        <fa v-if="showVeriClaimDump" icon="chevron-up" class="text-blue-400" />
-        <fa v-else icon="chevron-down" class="text-blue-400" />
-      </button>
       <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
       <pre
-        v-if="showVeriClaimDump"
-        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
+        class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
         >{{ veriClaimDump }}</pre
       >
     </div>
@@ -428,10 +393,7 @@
       </button>
     </div>
     <div v-else>
-      <pre
-        class="text-sm overflow-x-scroll bg-slate-100 px-4 py-3 rounded-md"
-        >{{ fullClaimDump }}</pre
-      >
+      <pre>{{ fullClaimDump }}</pre>
     </div>
 
     <a
@@ -448,8 +410,8 @@
 import { AxiosError } from "axios";
 import * as yaml from "js-yaml";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 import { useClipboard } from "@vueuse/core";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
@@ -461,11 +423,7 @@ import * as serverUtil from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
 import { Account } from "@/db/tables/accounts";
-import {
-  GenericCredWrapper,
-  GiverReceiverInputInfo,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
+import { GiverReceiverInputInfo } from "@/libs/endorserServer";
 
 @Component({
   components: { GiftedDialog, QuickNav },
@@ -487,12 +445,9 @@ export default class ClaimView extends Vue {
   fullClaim = null;
   fullClaimDump = "";
   fullClaimMessage = "";
-  isEditedGlobalId = false;
-  isRegistered = false;
   numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
   showDidCopy = false;
   showIdCopy = false;
-  showVeriClaimDump = false;
   veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
   veriClaimDump = "";
   veriClaimDidsVisible = {};
@@ -512,8 +467,6 @@ export default class ClaimView extends Vue {
     this.fullClaim = null;
     this.fullClaimDump = "";
     this.fullClaimMessage = "";
-    this.isEditedGlobalId = false;
-    this.isRegistered = false;
     this.numConfsNotVisible = 0;
     this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
     this.veriClaimDump = "";
@@ -525,7 +478,6 @@ export default class ClaimView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = settings?.isRegistered || false;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
@@ -611,8 +563,6 @@ export default class ClaimView extends Vue {
         return;
       }
 
-      this.isEditedGlobalId = !this.veriClaim.handleId.endsWith(claimId);
-
       // retrieve more details on Give, Offer, or Plan
       if (this.veriClaim.claimType === "GiveAction") {
         const giveUrl =
@@ -804,7 +754,7 @@ export default class ClaimView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(claimId),
     };
-    (this.$router as Router).push(route).then(async () => {
+    this.$router.push(route).then(async () => {
       this.resetThisValues();
       await this.loadClaim(claimId, this.activeDid);
     });
@@ -812,9 +762,7 @@ export default class ClaimView extends Vue {
 
   openFulfillGiftDialog() {
     const giver: GiverReceiverInputInfo = {
-      did: libsUtil.offerGiverDid(
-        this.veriClaim as GenericCredWrapper<OfferVerifiableCredential>,
-      ),
+      did: libsUtil.offerGiverDid(this.veriClaim),
     };
     (this.$refs.customGiveDialog as GiftedDialog).open(
       giver,
@@ -847,43 +795,5 @@ export default class ClaimView extends Vue {
       url: this.windowLocation,
     });
   }
-
-  onClickEditClaim() {
-    if (this.veriClaim.claimType === "GiveAction") {
-      const route = {
-        name: "gifted-details",
-        query: {
-          prevCredToEdit: JSON.stringify(this.veriClaim),
-          destinationPathAfter:
-            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
-        },
-      };
-      (this.$router as Router).push(route);
-    } else if (this.veriClaim.claimType === "Offer") {
-      const route = {
-        name: "offer-details",
-        query: {
-          prevCredToEdit: JSON.stringify(this.veriClaim),
-          destinationPathAfter:
-            "/claim/" + encodeURIComponent(this.veriClaim.handleId),
-        },
-      };
-      (this.$router as Router).push(route);
-    } else {
-      console.error(
-        "Unrecognized claim type for edit:",
-        this.veriClaim.claimType,
-      );
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "This is an unrecognized claim type.",
-        },
-        3000,
-      );
-    }
-  }
 }
 </script>

src/views/ConfirmGiftView.vue

@@ -1,6 +1,5 @@
 <template>
   <QuickNav />
-  <TopMessage />
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Breadcrumb -->
@@ -16,7 +15,6 @@
         <span
           v-if="
             libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
               veriClaim,
               activeDid,
               confirmerIdList,
@@ -35,7 +33,6 @@
           class="col-span-1 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"
           v-if="
             libsUtil.isGiveRecordTheUserCanConfirm(
-              isRegistered,
               veriClaim,
               activeDid,
               confirmerIdList,
@@ -55,7 +52,6 @@
           <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
         </button>
         <a
-          v-if="isRegistered"
           class="col-span-1 bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-2 px-4 py-2 rounded-md"
           :href="urlForNewGive"
         >
@@ -149,9 +145,11 @@
 
         <span v-if="totalConfirmers() === 0">Nobody has confirmed this.</span>
         <span v-else-if="totalConfirmers() === 1">
-          One person confirmed this.
+          One person has confirmed this.
+        </span>
+        <span v-else>
+          {{ totalConfirmers() }} people have confirmed this.
         </span>
-        <span v-else> {{ totalConfirmers() }} people confirmed this. </span>
 
         <div v-if="totalConfirmers() > 0">
           <div
@@ -169,10 +167,10 @@
             "
           >
             <!-- Only show if this person has links to confirmers (below). -->
-            Nobody that you know issued or confirmed this claim.
+            Nobody that you know has issued or confirmed this claim.
           </div>
           <div v-if="confirmerIdList.length > 0">
-            The following people issued or confirmed this claim.
+            The following people have issued or confirmed this claim.
             <ul class="ml-4">
               <li
                 v-for="confirmerId in confirmerIdList"
@@ -204,7 +202,7 @@
 
           <!--
            Never need to show this message:
-           "Nobody that you know can see someone who confirmed this claim."
+           "Nobody that you know can see someone who has confirmed this claim."
 
            If there is nobody in the confirmerIdList then we'll show the combined "nobody" message.
            If there is somebody in the confirmerIdList then that's all they need to show.
@@ -212,7 +210,7 @@
 
           <!-- Now show anyone linked to confirmers. -->
           <div v-if="confsVisibleToIdList.length > 0">
-            The following people can connect you with people who issued or
+            The following people can connect you with people who have issued or
             confirmed this claim.
             <ul class="ml-4">
               <li
@@ -248,11 +246,10 @@
 
         <!-- explain if user cannot confirm -->
         <!-- Note that these conditions are mirrored in userCanConfirm(). -->
-        <div v-if="!isRegistered">
-          You cannot confirm this because you are not registered. Find someone
-          to register you, maybe on the Help page.
+        <div v-if="confirmerIdList.includes(activeDid)">
+          You have confirmed this claim.
         </div>
-        <div v-else-if="giveDetails.issuerDid == activeDid">
+        <div v-else-if="giveDetails.agentDid == activeDid">
           You cannot confirm this because you issued this claim, so you already
           count as confirming it.
         </div>
@@ -399,10 +396,11 @@
 import { AxiosError } from "axios";
 import * as yaml from "js-yaml";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
-import { Router } from "vue-router";
 
+import GiftedDialog from "@/components/GiftedDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
@@ -410,14 +408,13 @@ import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import * as serverUtil from "@/libs/endorserServer";
-import { displayAmount, GiveSummaryRecord } from "@/libs/endorserServer";
+import { displayAmount, GiverReceiverInputInfo } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import { isGiveAction } from "@/libs/util";
-import TopMessage from "@/components/TopMessage.vue";
 
 @Component({
   methods: { displayAmount },
-  components: { TopMessage, QuickNav },
+  components: { GiftedDialog, QuickNav },
 })
 export default class ClaimView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -431,11 +428,10 @@ export default class ClaimView extends Vue {
   confirmerIdList: string[] = []; // list of DIDs that have confirmed this claim excluding the issuer
   confsVisibleErrorMessage = "";
   confsVisibleToIdList: string[] = []; // list of DIDs that can see any confirmer
-  giveDetails?: GiveSummaryRecord;
+  giveDetails = null;
   giverName = "";
   issuerName = "";
   isLoading = false;
-  isRegistered = false;
   numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
   recipientName = "";
   showDetails = false;
@@ -454,8 +450,7 @@ export default class ClaimView extends Vue {
     this.confirmerIdList = [];
     this.confsVisibleErrorMessage = "";
     this.confsVisibleToIdList = [];
-    this.giveDetails = undefined;
-    this.isRegistered = false;
+    this.giveDetails = null;
     this.numConfsNotVisible = 0;
     this.urlForNewGive = "";
     this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
@@ -469,7 +464,6 @@ export default class ClaimView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = settings?.isRegistered || false;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
@@ -606,12 +600,6 @@ export default class ClaimView extends Vue {
           },
           3000,
         );
-        return;
-      }
-
-      // the logic already stops earlier if the claim doesn't exist but this helps with typechecking
-      if (!this.giveDetails) {
-        return;
       }
 
       this.urlForNewGive = "/gifted-details?";
@@ -652,8 +640,7 @@ export default class ClaimView extends Vue {
         this.giveDetails.fulfillsHandleId
       ) {
         this.urlForNewGive +=
-          "&offerId=" +
-          encodeURIComponent(this.giveDetails?.fulfillsHandleId as string);
+          "&offerId=" + encodeURIComponent(this.giveDetails.fulfillsHandleId);
       }
       if (this.giveDetails.fulfillsPlanHandleId) {
         this.urlForNewGive +=
@@ -674,11 +661,9 @@ export default class ClaimView extends Vue {
         const resultList1 = response.data.result || [];
         //const publicUrls = resultList.publicUrls || [];
         delete resultList1.publicUrls;
-        // remove any hidden DIDs
         const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
-        // remove confirmations by this user
         const resultList3 = R.reject(
-          (did: string) => did === this.giveDetails?.issuerDid,
+          (did: string) => did === this.giveDetails.agentDid,
           resultList2,
         );
         this.confirmerIdList = resultList3;
@@ -775,12 +760,24 @@ export default class ClaimView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(claimId),
     };
-    (this.$router as Router).push(route).then(async () => {
+    this.$router.push(route).then(async () => {
       this.resetThisValues();
       await this.loadClaim(claimId, this.activeDid);
     });
   }
 
+  openFulfillGiftDialog() {
+    const giver: GiverReceiverInputInfo = {
+      did: libsUtil.offerGiverDid(this.veriClaim),
+    };
+    (this.$refs.customGiveDialog as GiftedDialog).open(
+      giver,
+      undefined,
+      this.giveDetails.handleId,
+      "Offer fulfilled by " + (giver?.name || "someone not named"),
+    );
+  }
+
   copyToClipboard(name: string, text: string) {
     useClipboard()
       .copy(text)
@@ -798,17 +795,7 @@ export default class ClaimView extends Vue {
   }
 
   notifyWhyCannotConfirm() {
-    if (!this.isRegistered) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "info",
-          title: "Not Registered",
-          text: "Someone needs to register you before you can contribute.",
-        },
-        3000,
-      );
-    } else if (!isGiveAction(this.veriClaim)) {
+    if (!isGiveAction(this.veriClaim)) {
       this.$notify(
         {
           group: "alert",
@@ -824,11 +811,11 @@ export default class ClaimView extends Vue {
           group: "alert",
           type: "info",
           title: "Already Confirmed",
-          text: "You already confirmed this claim.",
+          text: "You have already confirmed this claim.",
         },
         3000,
       );
-    } else if (this.giveDetails?.issuerDid == this.activeDid) {
+    } else if (this.giveDetails.agentDid == this.activeDid) {
       this.$notify(
         {
           group: "alert",
@@ -838,7 +825,7 @@ export default class ClaimView extends Vue {
         },
         3000,
       );
-    } else if (serverUtil.containsHiddenDid(this.giveDetails?.fullClaim)) {
+    } else if (serverUtil.containsHiddenDid(this.giveDetails.fullClaim)) {
       this.$notify(
         {
           group: "alert",

src/views/ContactAmountsView.vue

@@ -108,7 +108,6 @@
 import { AxiosError, AxiosRequestHeaders } from "axios";
 import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
@@ -145,7 +144,7 @@ export default class ContactAmountssView extends Vue {
   async created() {
     try {
       await db.open();
-      const contactDid = (this.$route as Router).query["contactDid"] as string;
+      const contactDid = this.$route.query.contactDid as string;
       this.contact = (await db.contacts.get(contactDid)) || null;
 
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
@@ -271,7 +270,7 @@ export default class ContactAmountssView extends Vue {
     // Make the xhr request payload
     const payload = JSON.stringify({ jwtEncoded: vcJwt });
     const url = this.apiServer + "/api/v2/claim";
-    const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders;
+    const headers = getHeaders(this.activeDid) as AxiosRequestHeaders;
 
     try {
       const resp = await this.axios.post(url, payload, { headers });

src/views/ContactGiftingView.vue

@@ -77,7 +77,8 @@ import GiftedDialog from "@/components/GiftedDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import { NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
+import { db, accountsDB } from "@/db/index";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { GiverReceiverInputInfo } from "@/libs/endorserServer";
@@ -91,8 +92,13 @@ export default class ContactGiftingView extends Vue {
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
+  accounts: typeof AccountsSchema;
   projectId = localStorage.getItem("projectId") || "";
 
+  async beforeCreate() {
+    accountsDB.open();
+  }
+
   async created() {
     try {
       await db.open();

src/views/ContactImportView.vue

@@ -1,194 +0,0 @@
-<template>
-  <QuickNav selected="Contacts"></QuickNav>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- 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"></fa>
-      </h1>
-    </div>
-
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Contact Import
-    </h1>
-
-    <span>
-      Note that you will have to make them visible one-by-one in the list of
-      Contacts.
-    </span>
-    <div v-if="sameCount > 0">
-      <span v-if="sameCount == 1"
-        >One contact is the same as an existing contact</span
-      >
-      <span v-else
-        >{{ sameCount }} contacts are the same as existing contacts</span
-      >
-    </div>
-
-    <!-- Results List -->
-    <ul v-if="contactsImporting.length > 0" class="border-t border-slate-300">
-      <li v-for="(contact, index) in contactsImporting" :key="contact.did">
-        <div
-          v-if="
-            !contactsExisting[contact.did] ||
-            !R.isEmpty(contactDifferences[contact.did])
-          "
-          class="grow overflow-hidden border-b border-slate-300 pt-2.5 pb-4"
-        >
-          <h2 class="text-base font-semibold">
-            <input type="checkbox" v-model="contactsSelected[index]" />
-            {{ contact.name || AppString.NO_CONTACT_NAME }}
-            -
-            <span v-if="contactsExisting[contact.did]" class="text-orange-500"
-              >Existing</span
-            >
-            <span v-else class="text-green-500">New</span>
-          </h2>
-          <div class="text-sm truncate">
-            {{ contact.did }}
-          </div>
-          <div v-if="contactDifferences[contact.did]">
-            <div>
-              <div class="grid grid-cols-3 gap-2">
-                <div class="font-bold">Field</div>
-                <div class="font-bold">Old Value</div>
-                <div class="font-bold">New Value</div>
-              </div>
-              <div
-                v-for="(value, contactField) in contactDifferences[contact.did]"
-                :key="contactField"
-                class="grid grid-cols-3 border"
-              >
-                <div class="border p-1">{{ contactField }}</div>
-                <div class="border p-1">{{ value.old }}</div>
-                <div class="border p-1">{{ value.new }}</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </li>
-      <fa icon="spinner" v-if="importing" class="animate-spin" />
-      <button
-        v-else
-        class="bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-sm text-white mt-2 px-2 py-1.5 rounded"
-        @click="importContacts"
-      >
-        Import Selected Contacts
-      </button>
-    </ul>
-    <p v-else>There are no contacts to import.</p>
-  </section>
-</template>
-
-<script lang="ts">
-import * as R from "ramda";
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { AppString, NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import * as libsUtil from "@/libs/util";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import OfferDialog from "@/components/OfferDialog.vue";
-
-@Component({
-  components: { EntityIcon, OfferDialog, QuickNav },
-})
-export default class ContactImportView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  AppString = AppString;
-  libsUtil = libsUtil;
-  R = R;
-
-  contactsExisting: Record<string, Contact> = {}; // user's contacts already in the system, keyed by DID
-  contactsImporting: Array<Contact> = []; // contacts from the import
-  contactsSelected: Array<boolean> = []; // whether each contact in contactsImporting is selected
-  contactDifferences: Record<
-    string,
-    Record<string, { new: string; old: string }>
-  > = {}; // for existing contacts, it shows the difference between imported and existing contacts for each key
-  importing = false;
-  sameCount = 0;
-
-  async created() {
-    // Retrieve the imported contacts from the query parameter
-    const importedContacts =
-      ((this.$route as Router).query["contacts"] as string) || "[]";
-    this.contactsImporting = JSON.parse(importedContacts);
-    this.contactsSelected = new Array(this.contactsImporting.length).fill(
-      false,
-    );
-
-    await db.open();
-    const baseContacts = await db.contacts.toArray();
-    // set the existing contacts, keyed by DID, if they exist in contactsImporting
-    for (let i = 0; i < this.contactsImporting.length; i++) {
-      const contactIn = this.contactsImporting[i];
-      const existingContact = baseContacts.find(
-        (contact) => contact.did === contactIn.did,
-      );
-      if (existingContact) {
-        this.contactsExisting[contactIn.did] = existingContact;
-
-        const differences: Record<string, { new: string; old: string }> = {};
-        Object.keys(contactIn).forEach((key) => {
-          if (contactIn[key] !== existingContact[key]) {
-            differences[key] = {
-              old: existingContact[key],
-              new: contactIn[key],
-            };
-          }
-        });
-        this.contactDifferences[contactIn.did] = differences;
-        if (R.isEmpty(differences)) {
-          this.sameCount++;
-        }
-      } else {
-        // automatically import new data
-        this.contactsSelected[i] = true;
-      }
-    }
-  }
-
-  async importContacts() {
-    this.importing = true;
-    let importedCount = 0,
-      updatedCount = 0;
-    for (let i = 0; i < this.contactsImporting.length; i++) {
-      if (this.contactsSelected[i]) {
-        const contact = this.contactsImporting[i];
-        const existingContact = this.contactsExisting[contact.did];
-        if (existingContact) {
-          await db.contacts.update(contact.did, contact);
-          updatedCount++;
-        } else {
-          // without explicit clone on the Proxy, we get: DataCloneError: Failed to execute 'add' on 'IDBObjectStore': #<Object> could not be cloned.
-          await db.contacts.add(R.clone(contact));
-          importedCount++;
-        }
-      }
-    }
-    this.importing = false;
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Import Success",
-        text:
-          `${importedCount} contact${importedCount == 1 ? "" : "s"} imported.` +
-          (updatedCount ? ` ${updatedCount} updated.` : ""),
-      },
-      3000,
-    );
-    (this.$router as Router).push({ name: "contacts" });
-  }
-}
-</script>

src/views/ContactQRScanShowView.vue

@@ -1,5 +1,5 @@
 <template>
-  <QuickNav selected="Profile" />
+  <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Breadcrumb -->
@@ -25,16 +25,13 @@
         <span class="text-red">Beware!</span>
         You aren't sharing your name, so quickly
         <br />
-        <span
-          @click="
-            () => $refs.userNameDialog.open((name) => (this.givenName = name))
-          "
+        <router-link
+          :to="{ name: 'new-edit-account' }"
           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.
-        </span>
+        </router-link>
       </p>
-      <UserNameDialog ref="userNameDialog" />
     </div>
 
     <div
@@ -53,7 +50,7 @@
         class="flex justify-center"
       />
       <span>
-        Click the QR code to copy your contact info to your clipboard.
+        Click this or QR code to copy your contact URL to your clipboard.
       </span>
     </div>
     <div v-else-if="activeDid" class="text-center">
@@ -99,7 +96,6 @@ 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";
@@ -113,7 +109,6 @@ import {
   CONTACT_URL_PREFIX,
   createEndorserJwtForDid,
   ENDORSER_JWT_URL_LOCATION,
-  generateEndorserJwtForAccount,
   isDid,
   register,
   setVisibilityUtil,
@@ -125,7 +120,6 @@ import { ETHR_DID_PREFIX } from "@/libs/crypto/vc";
     QrcodeStream,
     QRCodeVue3,
     QuickNav,
-    UserNameDialog,
   },
 })
 export default class ContactQRScanShow extends Vue {
@@ -163,7 +157,7 @@ export default class ContactQRScanShow extends Vue {
         own: {
           name:
             (settings?.firstName || "") +
-            (settings?.lastName ? ` ${settings.lastName}` : ""), // lastName is deprecated, pre v 0.1.3
+            (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
           publicEncKey,
           profileImageUrl: settings?.profileImageUrl,
           registered: settings?.isRegistered,
@@ -188,18 +182,7 @@ export default class ContactQRScanShow extends Vue {
       const vcJwt = await createEndorserJwtForDid(this.activeDid, contactInfo);
 
       const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
-      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,
-      );
+      this.qrValue = viewPrefix + vcJwt;
     }
   }
 
@@ -295,7 +278,7 @@ export default class ContactQRScanShow extends Vue {
                   text: "Do you want to register them?",
                   onCancel: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -303,7 +286,7 @@ export default class ContactQRScanShow extends Vue {
                   },
                   onNo: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -475,9 +458,9 @@ export default class ContactQRScanShow extends Vue {
             group: "alert",
             type: "info",
             title: "Copied",
-            text: "Your DID was copied to the clipboard. Have them paste it in the box on their 'People' screen to add you.",
+            text: "Your DID was copied to the clipboard. Have them paste it on their 'People' screen to add you.",
           },
-          5000,
+          10000,
         );
       });
   }

src/views/ContactsView.vue

@@ -1,14 +1,12 @@
 <template>
-  <QuickNav selected="Contacts" />
-  <TopMessage />
-
+  <QuickNav selected="Contacts"></QuickNav>
   <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Your Contacts
     </h1>
 
-    <div class="flex justify-between py-2 mt-8">
+    <div class="flex justify-between py-2">
       <span />
       <span>
         <a
@@ -22,7 +20,7 @@
     </div>
 
     <!-- New Contact -->
-    <div id="formAddNewContact" class="mt-4 mb-4 flex items-stretch">
+    <div class="mt-4 mb-4 flex items-stretch">
       <router-link
         :to="{ name: 'contact-qr' }"
         class="flex items-center 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-1.5 py-1 mr-1 rounded-md"
@@ -39,49 +37,18 @@
         class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
         @click="onClickNewContact()"
       >
-        <fa icon="plus" class="fa-fw" />
+        <fa icon="plus" class="fa-fw"></fa>
       </button>
     </div>
 
-    <div class="flex justify-between" v-if="contacts.length > 0">
-      <div class="w-full text-left">
-        <input
-          type="checkbox"
-          v-if="!showGiveNumbers"
-          :checked="contactsSelected.length === contacts.length"
-          @click="
-            contactsSelected.length === contacts.length
-              ? (contactsSelected = [])
-              : (contactsSelected = contacts.map((contact) => contact.did))
-          "
-          class="align-middle ml-2 h-6 w-6"
-          data-testId="contactCheckAllTop"
-        />
-        <button
-          href=""
-          class="text-md bg-gradient-to-b shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-2 px-1 py-1 rounded-md"
-          :style="
-            contactsSelected.length > 0
-              ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);'
-              : 'background-image: linear-gradient(to bottom, #94a3b8, #374151);'
-          "
-          @click="copySelectedContacts()"
-          v-if="!showGiveNumbers"
-          data-testId="copySelectedContactsButtonTop"
-        >
-          Copy Selections
-        </button>
-      </div>
-
-      <div class="w-full text-right">
-        <button
-          href=""
-          class="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-1 py-1 rounded-md"
-          @click="toggleShowContactAmounts()"
-        >
-          {{ showGiveNumbers ? "Hide Given Hours" : "Show Given Hours" }}
-        </button>
-      </div>
+    <div class="w-full text-right">
+      <button
+        href=""
+        class="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-1 py-1 rounded-md"
+        @click="toggleShowContactAmounts()"
+      >
+        {{ showGiveNumbers ? "Hide Given Hours" : "Show Given Hours" }}
+      </button>
     </div>
     <div class="flex justify-between mt-1" v-if="showGiveNumbers">
       <div class="w-full text-right">
@@ -112,56 +79,111 @@
     </div>
 
     <!-- Results List -->
-    <ul
-      id="listContacts"
-      v-if="contacts.length > 0"
-      class="border-t border-slate-300 mt-1"
-    >
+    <ul v-if="contacts.length > 0" class="border-t border-slate-300">
       <li
-        class="border-b border-slate-300 pt-1 pb-1"
-        v-for="contact in filteredContacts()"
+        class="border-b border-slate-300 pt-2.5 pb-4"
+        v-for="contact in contacts"
         :key="contact.did"
-        data-testId="contactListItem"
       >
         <div class="grow overflow-hidden">
-          <div class="flex items-center">
+          <h2 class="text-base font-semibold">
             <EntityIcon
               :contact="contact"
               :iconSize="24"
               class="inline-block align-text-bottom border border-slate-300 rounded cursor-pointer"
               @click="showLargeIdenticon = contact"
             />
-
-            <input
-              type="checkbox"
-              v-if="!showGiveNumbers"
-              :checked="contactsSelected.includes(contact.did)"
+            {{ contact.name || AppString.NO_CONTACT_NAME }}
+            <button
               @click="
-                contactsSelected.includes(contact.did)
-                  ? contactsSelected.splice(
-                      contactsSelected.indexOf(contact.did),
-                      1,
-                    )
-                  : contactsSelected.push(contact.did)
+                contactEdit = contact;
+                contactNewName = contact.name || '';
               "
-              class="ml-2 h-6 w-6"
-              data-testId="contactCheckOne"
-            />
-
-            <h2 class="text-base font-semibold ml-2">
-              {{ contact.name || AppString.NO_CONTACT_NAME }}
-            </h2>
-
+              title="Edit"
+            >
+              <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1"></fa>
+            </button>
             <router-link
               :to="{
                 path: '/did/' + encodeURIComponent(contact.did),
               }"
-              title="See more about this person"
+              title="See more about this DID"
             >
               <fa icon="circle-info" class="text-blue-500 ml-4" />
             </router-link>
+          </h2>
+          <div class="text-sm truncate">
+            {{ contact.did }}
+            <button
+              @click="
+                libsUtil.doCopyTwoSecRedo(
+                  contact.did,
+                  () => (showDidCopy = !showDidCopy),
+                )
+              "
+              class="ml-2 mr-2"
+            >
+              <fa icon="copy" class="text-slate-400 fa-fw"></fa>
+            </button>
+            <span v-show="showDidCopy">Copied DID</span>
           </div>
+          <div class="text-sm truncate" v-if="contact.publicKeyBase64">
+            Public Key (base 64): {{ contact.publicKeyBase64 }}
+          </div>
+          <div class="text-sm truncate" v-if="contact.nextPubKeyHashB64">
+            Next Public Key Hash (base 64):
+            {{ contact.nextPubKeyHashB64 }}
+          </div>
+
           <div id="ContactActions" class="flex gap-1.5 mt-2">
+            <div v-if="activeDid">
+              <button
+                v-if="contact.seesMe"
+                class="text-sm 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 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                @click="confirmSetVisibility(contact, false)"
+                title="They can see you"
+              >
+                <fa icon="eye" class="fa-fw" />
+              </button>
+              <button
+                v-else
+                class="text-sm 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 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                @click="confirmSetVisibility(contact, true)"
+                title="They cannot see you"
+              >
+                <fa icon="eye-slash" class="fa-fw" />
+              </button>
+              <button
+                class="text-sm 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 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                @click="checkVisibility(contact)"
+                title="Check Visibility"
+                v-if="activeDid"
+              >
+                <fa icon="rotate" class="fa-fw" />
+              </button>
+              <button
+                @click="confirmRegister(contact)"
+                class="text-sm 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 ml-6 px-2 py-1.5 rounded-md"
+                v-if="activeDid"
+                title="Registration"
+              >
+                <fa
+                  v-if="contact.registered"
+                  icon="person-circle-check"
+                  class="fa-fw"
+                />
+                <fa v-else icon="person-circle-question" class="fa-fw" />
+              </button>
+            </div>
+
+            <button
+              @click="confirmDeleteContact(contact)"
+              class="text-sm uppercase bg-gradient-to-b from-rose-500 to-rose-800 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-6 px-2 py-1.5 rounded-md"
+              title="Delete"
+            >
+              <fa icon="trash-can" class="fa-fw" />
+            </button>
+
             <div
               v-if="showGiveNumbers && contact.did != activeDid"
               class="ml-auto flex gap-1.5"
@@ -210,7 +232,7 @@
 
               <button
                 class="text-sm 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-1.5 rounded-md border border-blue-400"
-                @click="openOfferDialog(contact.did, contact.name)"
+                @click="openOfferDialog(contact.did)"
               >
                 Offer
               </button>
@@ -232,34 +254,6 @@
     </ul>
     <p v-else>There are no contacts.</p>
 
-    <div class="mt-2 w-full text-left" v-if="contacts.length > 0">
-      <input
-        type="checkbox"
-        v-if="!showGiveNumbers"
-        :checked="contactsSelected.length === contacts.length"
-        @click="
-          contactsSelected.length === contacts.length
-            ? (contactsSelected = [])
-            : (contactsSelected = contacts.map((contact) => contact.did))
-        "
-        class="align-middle ml-2 h-6 w-6"
-        data-testId="contactCheckAllBottom"
-      />
-      <button
-        href=""
-        class="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 ml-2 px-1 py-1 rounded-md"
-        :style="
-          contactsSelected.length > 0
-            ? 'background-image: linear-gradient(to bottom, #3b82f6, #1e40af);'
-            : 'background-image: linear-gradient(to bottom, #94a3b8, #374151);'
-        "
-        @click="copySelectedContacts()"
-        v-if="!showGiveNumbers"
-      >
-        Copy Selections
-      </button>
-    </div>
-
     <GiftedDialog ref="customGivenDialog" />
     <OfferDialog ref="customOfferDialog" />
 
@@ -275,17 +269,42 @@
         />
       </div>
     </div>
+
+    <div v-if="contactEdit !== null" class="dialog-overlay">
+      <div class="dialog">
+        <h1 class="text-xl font-bold text-center mb-4">Edit Name</h1>
+        <input
+          type="text"
+          class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+          placeholder="Name"
+          v-model="contactNewName"
+        />
+        <div class="flex justify-between">
+          <button
+            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
+            @click="onClickSaveName(contactEdit, contactNewName)"
+          >
+            <fa icon="save" />
+          </button>
+          <span class="inline-block w-2" />
+          <button
+            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
+            @click="onClickCancelName()"
+          >
+            <fa icon="ban" />
+          </button>
+        </div>
+      </div>
+    </div>
   </section>
 </template>
 
 <script lang="ts">
 import { AxiosError } from "axios";
-import { Buffer } from "buffer/";
 import { IndexableType } from "dexie";
 import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
-import { useClipboard } from "@vueuse/core";
 
 import { AppString, NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
@@ -307,10 +326,11 @@ import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
-import TopMessage from "@/components/TopMessage.vue";
+
+import { Buffer } from "buffer/";
 
 @Component({
-  components: { TopMessage, GiftedDialog, EntityIcon, OfferDialog, QuickNav },
+  components: { GiftedDialog, EntityIcon, OfferDialog, QuickNav },
 })
 export default class ContactsView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -321,7 +341,6 @@ export default class ContactsView extends Vue {
   contactInput = "";
   contactEdit: Contact | null = null;
   contactNewName = "";
-  contactsSelected: Array<string> = [];
   // { "did:...": concatenated-descriptions } entry for each contact
   givenByMeDescriptions: Record<string, string> = {};
   // { "did:...": amount } entry for each contact
@@ -337,8 +356,6 @@ export default class ContactsView extends Vue {
   hideRegisterPromptOnNewContact = false;
   isRegistered = false;
   showDidCopy = false;
-  showPubKeyCopy = false;
-  showPubKeyHashCopy = false;
   showGiveNumbers = false;
   showGiveTotals = true;
   showGiveConfirmed = true;
@@ -347,7 +364,7 @@ export default class ContactsView extends Vue {
   AppString = AppString;
   libsUtil = libsUtil;
 
-  public async created() {
+  async created() {
     await db.open();
     const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
     this.activeDid = settings?.activeDid || "";
@@ -370,7 +387,7 @@ export default class ContactsView extends Vue {
     );
   }
 
-  private danger(message: string, title: string = "Error", timeout = 5000) {
+  danger(message: string, title: string = "Error", timeout = 5000) {
     this.$notify(
       {
         group: "alert",
@@ -382,17 +399,7 @@ export default class ContactsView extends Vue {
     );
   }
 
-  private filteredContacts() {
-    return this.showGiveNumbers
-      ? this.contactsSelected.length === 0
-        ? this.contacts
-        : this.contacts.filter((contact) =>
-            this.contactsSelected.includes(contact.did),
-          )
-      : this.contacts;
-  }
-
-  private async loadGives() {
+  async loadGives() {
     if (!this.activeDid) {
       return;
     }
@@ -499,20 +506,19 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private async onClickNewContact(): Promise<void> {
-    const contactInput = this.contactInput.trim();
-    if (!contactInput) {
+  async onClickNewContact(): Promise<void> {
+    if (!this.contactInput) {
       this.danger("There was no contact info to add.", "No Contact");
       return;
     }
 
-    if (contactInput.startsWith(CONTACT_URL_PREFIX)) {
-      await this.addContactFromScan(contactInput);
+    if (this.contactInput.startsWith(CONTACT_URL_PREFIX)) {
+      await this.addContactFromScan(this.contactInput);
       return;
     }
 
-    if (contactInput.startsWith(CONTACT_CSV_HEADER)) {
-      const lines = contactInput.split(/\n/);
+    if (this.contactInput.startsWith(CONTACT_CSV_HEADER)) {
+      const lines = this.contactInput.split(/\n/);
       const lineAdded = [];
       for (const line of lines) {
         if (!line.trim() || line.startsWith(CONTACT_CSV_HEADER)) {
@@ -544,71 +550,44 @@ export default class ContactsView extends Vue {
       return;
     }
 
-    if (contactInput.startsWith("did:")) {
-      let did = contactInput;
-      let name, publicKeyInput, nextPublicKeyHashInput;
-      const commaPos1 = contactInput.indexOf(",");
-      if (commaPos1 > -1) {
-        did = contactInput.substring(0, commaPos1).trim();
-        name = contactInput.substring(commaPos1 + 1).trim();
-        const commaPos2 = contactInput.indexOf(",", commaPos1 + 1);
-        if (commaPos2 > -1) {
-          name = contactInput.substring(commaPos1 + 1, commaPos2).trim();
-          publicKeyInput = contactInput.substring(commaPos2 + 1).trim();
-          const commaPos3 = contactInput.indexOf(",", commaPos2 + 1);
-          if (commaPos3 > -1) {
-            publicKeyInput = contactInput.substring(commaPos2 + 1, commaPos3).trim(); // eslint-disable-line prettier/prettier
-            nextPublicKeyHashInput = contactInput.substring(commaPos3 + 1).trim(); // eslint-disable-line prettier/prettier
-          }
+    let did = this.contactInput;
+    let name, publicKeyInput, nextPublicKeyHashInput;
+    const commaPos1 = this.contactInput.indexOf(",");
+    if (commaPos1 > -1) {
+      did = this.contactInput.substring(0, commaPos1).trim();
+      name = this.contactInput.substring(commaPos1 + 1).trim();
+      const commaPos2 = this.contactInput.indexOf(",", commaPos1 + 1);
+      if (commaPos2 > -1) {
+        name = this.contactInput.substring(commaPos1 + 1, commaPos2).trim();
+        publicKeyInput = this.contactInput.substring(commaPos2 + 1).trim();
+        const commaPos3 = this.contactInput.indexOf(",", commaPos2 + 1);
+        if (commaPos3 > -1) {
+          publicKeyInput = this.contactInput.substring(commaPos2 + 1, commaPos3).trim(); // eslint-disable-line prettier/prettier
+          nextPublicKeyHashInput = this.contactInput.substring(commaPos3 + 1).trim(); // eslint-disable-line prettier/prettier
         }
       }
-      // help with potential mistakes while this sharing requires copy-and-paste
-      let publicKeyBase64 = publicKeyInput;
-      if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
-        // it must be all hex (compressed public key), so convert
-        publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString(
-          "base64",
-        );
-      }
-      let nextPubKeyHashB64 = nextPublicKeyHashInput;
-      if (nextPubKeyHashB64 && /^[0-9A-Fa-f]{66}$/i.test(nextPubKeyHashB64)) {
-        // it must be all hex (compressed public key), so convert
-        nextPubKeyHashB64 = Buffer.from(nextPubKeyHashB64, "hex").toString("base64"); // eslint-disable-line prettier/prettier
-      }
-      const newContact = {
-        did,
-        name,
-        publicKeyBase64,
-        nextPubKeyHashB64: nextPubKeyHashB64,
-      };
-      await this.addContact(newContact);
-      return;
     }
-
-    if (contactInput.includes("[")) {
-      // assume there's a JSON array of contacts in the input
-      const jsonContactInput = contactInput.substring(
-        contactInput.indexOf("["),
-        contactInput.lastIndexOf("]") + 1,
-      );
-      try {
-        const contacts = JSON.parse(jsonContactInput);
-        (this.$router as Router).push({
-          name: "contact-import",
-          query: { contacts: JSON.stringify(contacts) },
-        });
-      } catch (e) {
-        this.danger("The input could not be parsed.", "Invalid Contact List");
-      }
-      return;
+    // help with potential mistakes while this sharing requires copy-and-paste
+    let publicKeyBase64 = publicKeyInput;
+    if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
+      // it must be all hex (compressed public key), so convert
+      publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
     }
-
-    this.danger("No contact info was found in that input.", "No Contact Info");
+    let nextPubKeyHashB64 = nextPublicKeyHashInput;
+    if (nextPubKeyHashB64 && /^[0-9A-Fa-f]{66}$/i.test(nextPubKeyHashB64)) {
+      // it must be all hex (compressed public key), so convert
+      nextPubKeyHashB64 = Buffer.from(nextPubKeyHashB64, "hex").toString("base64"); // eslint-disable-line prettier/prettier
+    }
+    const newContact = {
+      did,
+      name,
+      publicKeyBase64,
+      nextPubKeyHashB64: nextPubKeyHashB64,
+    };
+    await this.addContact(newContact);
   }
 
-  private async addContactFromEndorserMobileLine(
-    line: string,
-  ): Promise<IndexableType> {
+  async addContactFromEndorserMobileLine(line: string): Promise<IndexableType> {
     // Note that Endorser Mobile puts name first, then did, etc.
     let name = line;
     let did = "";
@@ -649,7 +628,7 @@ export default class ContactsView extends Vue {
     return db.contacts.add(newContact);
   }
 
-  private async addContactFromScan(url: string): Promise<void> {
+  async addContactFromScan(url: string): Promise<void> {
     const payload = getContactPayloadFromJwtUrl(url);
     if (!payload) {
       this.$notify(
@@ -674,7 +653,7 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private async addContact(newContact: Contact) {
+  async addContact(newContact: Contact) {
     if (!newContact.did) {
       this.danger("Cannot add a contact without a DID.", "Incomplete Contact");
       return;
@@ -712,7 +691,7 @@ export default class ContactsView extends Vue {
                   text: "Do you want to register them?",
                   onCancel: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -720,7 +699,7 @@ export default class ContactsView extends Vue {
                   },
                   onNo: async (stopAsking: boolean) => {
                     if (stopAsking) {
-                      await db.settings.update(MASTER_SETTINGS_KEY, {
+                      db.settings.update(MASTER_SETTINGS_KEY, {
                         hideRegisterPromptOnNewContact: stopAsking,
                       });
                       this.hideRegisterPromptOnNewContact = stopAsking;
@@ -763,30 +742,56 @@ export default class ContactsView extends Vue {
       });
   }
 
-  // note that this is also in DIDView.vue
-  private async confirmSetVisibility(contact: Contact, visibility: boolean) {
-    const visibilityPrompt = visibility
-      ? "Are you sure you want to make your activity visible to them?"
-      : "Are you sure you want to hide all your activity from them?";
+  // prompt with confirmation if they want to delete a contact
+  confirmDeleteContact(contact: Contact) {
     this.$notify(
       {
         group: "modal",
         type: "confirm",
-        title: "Set Visibility",
-        text: visibilityPrompt,
+        title: "Delete",
+        text:
+          "Are you sure you want to remove " +
+          this.nameForDid(this.contacts, contact.did) +
+          " with DID " +
+          contact.did +
+          " from your contact list?",
         onYes: async () => {
-          const success = await this.setVisibility(contact, visibility, true);
-          if (success) {
-            contact.seesMe = visibility; // didn't work inside setVisibility
-          }
+          await this.deleteContact(contact);
         },
       },
       -1,
     );
   }
 
-  // note that this is also in DIDView.vue
-  private async register(contact: Contact) {
+  async deleteContact(contact: Contact) {
+    await db.open();
+    await db.contacts.delete(contact.did);
+    this.contacts = R.without([contact], this.contacts);
+  }
+
+  // confirm to register a new contact
+  async confirmRegister(contact: Contact) {
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Register",
+        text:
+          "Are you sure you want to register " +
+          this.nameForDid(this.contacts, contact.did) +
+          (contact.registered
+            ? " -- especially since they are already marked as registered"
+            : "") +
+          "?",
+        onYes: async () => {
+          await this.register(contact);
+        },
+      },
+      -1,
+    );
+  }
+
+  async register(contact: Contact) {
     this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
 
     try {
@@ -798,7 +803,7 @@ export default class ContactsView extends Vue {
       );
       if (regResult.success) {
         contact.registered = true;
-        await db.contacts.update(contact.did, { registered: true });
+        db.contacts.update(contact.did, { registered: true });
 
         this.$notify(
           {
@@ -851,8 +856,25 @@ export default class ContactsView extends Vue {
     }
   }
 
-  // note that this is also in DIDView.vue
-  private async setVisibility(
+  async confirmSetVisibility(contact: Contact, visibility: boolean) {
+    const visibilityPrompt = visibility
+      ? "Are you sure you want to make your activity visible to them?"
+      : "Are you sure you want to hide all your activity from them?";
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Set Visibility",
+        text: visibilityPrompt,
+        onYes: async () => {
+          await this.setVisibility(contact, visibility, true);
+        },
+      },
+      -1,
+    );
+  }
+
+  async setVisibility(
     contact: Contact,
     visibility: boolean,
     showSuccessAlert: boolean,
@@ -866,8 +888,6 @@ export default class ContactsView extends Vue {
       visibility,
     );
     if (result.success) {
-      //contact.seesMe = visibility; // why doesn't it affect the UI from here?
-      //console.log("Set result & seesMe", result, contact.seesMe, contact.did);
       if (showSuccessAlert) {
         this.$notify(
           {
@@ -883,26 +903,22 @@ export default class ContactsView extends Vue {
           3000,
         );
       }
-      return true;
-    } else {
-      console.error("Got strange result from setting visibility:", result);
-      const message =
-        (result.error as string) || "Could not set visibility on the server.";
+    } else if (result.error) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error Setting Visibility",
-          text: message,
+          text: result.error as string,
         },
         5000,
       );
-      return false;
+    } else {
+      console.error("Got strange result from setting visibility:", result);
     }
   }
 
-  // note that this is also in DIDView.vue
-  private async checkVisibility(contact: Contact) {
+  async checkVisibility(contact: Contact) {
     const url =
       this.apiServer +
       "/api/report/canDidExplicitlySeeMe?did=" +
@@ -926,8 +942,14 @@ export default class ContactsView extends Vue {
       if (resp.status === 200) {
         const visibility = resp.data;
         contact.seesMe = visibility;
-        //console.log("Visi check:", visibility, contact.seesMe, contact.did);
-        await db.contacts.update(contact.did, { seesMe: visibility });
+        console.log(
+          "Visibility checked:",
+          visibility,
+          contact.did,
+          contact.name,
+        ); // eslint-disable-line no-console
+        console.log(this.contacts); // eslint-disable-line no-console
+        db.contacts.update(contact.did, { seesMe: visibility });
 
         this.$notify(
           {
@@ -935,7 +957,7 @@ export default class ContactsView extends Vue {
             type: "info",
             title: "Visibility Refreshed",
             text:
-              libsUtil.nameForContact(contact, true) +
+              this.nameForContact(contact, true) +
               " can " +
               (visibility ? "" : "not ") +
               "see your activity.",
@@ -969,7 +991,22 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private confirmShowGiftedDialog(giverDid: string, recipientDid: string) {
+  private nameForDid(contacts: Array<Contact>, did: string): string {
+    if (did === this.activeDid) {
+      return "you";
+    }
+    const contact = R.find((con) => con.did == did, contacts);
+    return this.nameForContact(contact);
+  }
+
+  private nameForContact(contact?: Contact, capitalize?: boolean): string {
+    return (
+      (contact?.name as string) ||
+      (capitalize ? "This" : "this") + " unnamed user"
+    );
+  }
+
+  confirmShowGiftedDialog(giverDid: string, recipientDid: string) {
     // if they have unconfirmed amounts, ask to confirm those
     if (
       recipientDid === this.activeDid &&
@@ -1014,13 +1051,13 @@ export default class ContactsView extends Vue {
     if (giverDid) {
       giver = {
         did: giverDid,
-        name: libsUtil.nameForDid(this.activeDid, this.contacts, giverDid),
+        name: this.nameForDid(this.contacts, giverDid),
       };
     }
     if (recipientDid) {
       receiver = {
         did: recipientDid,
-        name: libsUtil.nameForDid(this.activeDid, this.contacts, recipientDid),
+        name: this.nameForDid(this.contacts, recipientDid),
       };
     }
 
@@ -1052,18 +1089,27 @@ export default class ContactsView extends Vue {
     );
   }
 
-  openOfferDialog(recipientDid: string, recipientName?: string) {
-    (this.$refs.customOfferDialog as OfferDialog).open(
-      recipientDid,
-      recipientName,
-    );
+  openOfferDialog(recipientDid: string) {
+    (this.$refs.customOfferDialog as OfferDialog).open(recipientDid);
   }
 
-  private async toggleShowContactAmounts() {
+  private async onClickCancelName() {
+    this.contactEdit = null;
+    this.contactNewName = "";
+  }
+
+  private async onClickSaveName(contact: Contact, newName: string) {
+    contact.name = newName;
+    return db.contacts
+      .update(contact.did, { name: newName })
+      .then(() => (this.contactEdit = null));
+  }
+
+  public async toggleShowContactAmounts() {
     const newShowValue = !this.showGiveNumbers;
     try {
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         showContactGivesInline: newShowValue,
       });
     } catch (err) {
@@ -1095,7 +1141,7 @@ export default class ContactsView extends Vue {
       this.loadGives();
     }
   }
-  private toggleShowGiveTotals() {
+  public toggleShowGiveTotals() {
     if (this.showGiveTotals) {
       this.showGiveTotals = false;
       this.showGiveConfirmed = true;
@@ -1108,7 +1154,7 @@ export default class ContactsView extends Vue {
     }
   }
 
-  private showGiveAmountsClassNames() {
+  public showGiveAmountsClassNames() {
     return {
       "from-slate-400": this.showGiveTotals,
       "to-slate-700": this.showGiveTotals,
@@ -1118,31 +1164,76 @@ export default class ContactsView extends Vue {
       "to-yellow-700": !this.showGiveTotals && !this.showGiveConfirmed,
     };
   }
-
-  private copySelectedContacts() {
-    if (this.contactsSelected.length === 0) {
-      this.danger("You must select contacts to copy.");
-      return;
-    }
-    const selectedContacts = this.contacts.filter((c) =>
-      this.contactsSelected.includes(c.did),
-    );
-    const message =
-      "To add contacts, paste this into the box on the 'Contacts' screen.\n\n" +
-      JSON.stringify(selectedContacts);
-    useClipboard()
-      .copy(message)
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "info",
-            title: "Copied",
-            text: "Those contacts were copied to the clipboard. Have them paste it in the box on their 'Contacts' screen.",
-          },
-          5000,
-        );
-      });
-  }
 }
 </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;
+}
+
+/*
+  Tooltip, generated on "title" attributes on "fa" icons
+  Kudos to https://www.w3schools.com/css/css_tooltip.asp
+*/
+/* Tooltip container */
+.tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
+}
+/* Tooltip text */
+.tooltip .tooltiptext {
+  visibility: hidden;
+  width: 200px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  padding: 5px 0;
+  border-radius: 6px;
+
+  position: absolute;
+  z-index: 1;
+}
+/* How do we share with the above so code isn't duplicated? */
+.tooltip .tooltiptext-left {
+  visibility: hidden;
+  width: 200px;
+  background-color: black;
+  color: #fff;
+  text-align: center;
+  padding: 5px 0;
+  border-radius: 6px;
+
+  position: absolute;
+  z-index: 1;
+
+  bottom: 0%;
+  right: 105%;
+  margin-left: -60px;
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.tooltip:hover .tooltiptext {
+  visibility: visible;
+}
+.tooltip:hover .tooltiptext-left {
+  visibility: visible;
+}
+</style>

src/views/DIDView.vue

@@ -22,31 +22,14 @@
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <div>
         <h2 class="text-xl font-semibold">
-          {{ contact?.name || "(no name)" }}
-          <button
-            @click="
-              contactEdit = true;
-              contactNewName = contact.name || '';
-            "
-            title="Edit"
-          >
-            <fa icon="pen" class="text-sm text-blue-500 ml-2 mb-1" />
-          </button>
+          {{
+            didInfoForContact(viewingDid, activeDid, contact, allMyDids)
+              .displayName
+          }}
         </h2>
-        <button
-          @click="showDidDetails = !showDidDetails"
-          class="ml-2 mr-2 mt-4"
-        >
-          Details
-          <fa v-if="showDidDetails" icon="chevron-up" class="text-blue-400" />
-          <fa v-else icon="chevron-down" class="text-blue-400" />
-        </button>
-        <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
-        <pre
-          v-if="showDidDetails"
-          class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
-          >{{ contactYaml }}</pre
-        >
+        <span class="mt-2 text-xl font-semibold break-words">
+          {{ viewingDid }}
+        </span>
       </div>
       <div class="flex justify-center mt-4">
         <span v-if="contact?.profileImageUrl" class="flex justify-between">
@@ -58,76 +41,15 @@
           />
         </span>
       </div>
-      <div class="flex justify-between mt-4">
-        <div class="flex items-center">
-          <div v-if="activeDid" class="flex justify-between">
-            <div>
-              <button
-                v-if="contact?.seesMe && contact.did !== activeDid"
-                class="text-sm 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 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-                @click="confirmSetVisibility(contact, false)"
-                title="They can see you"
-              >
-                <fa icon="eye" class="fa-fw" />
-              </button>
-              <button
-                v-else-if="!contact?.seesMe && contact?.did !== activeDid"
-                class="text-sm 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 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-                @click="confirmSetVisibility(contact, true)"
-                title="They cannot see you"
-              >
-                <fa icon="eye-slash" class="fa-fw" />
-              </button>
-              <!-- otherwise it's this user so hide it -->
-              <fa v-else icon="eye" class="text-white mx-2.5" />
-
-              <button
-                class="text-sm 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 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-                @click="checkVisibility(contact)"
-                title="Check Visibility"
-                v-if="contact?.did !== activeDid"
-              >
-                <fa icon="rotate" class="fa-fw" />
-              </button>
-              <!-- otherwise it's this user so hide it -->
-              <fa v-else icon="rotate" class="text-white mx-2.5" />
-            </div>
-
-            <button
-              @click="confirmRegister(contact)"
-              class="text-sm 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 ml-6 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-              v-if="contact?.did !== activeDid"
-              title="Registration"
-            >
-              <fa
-                v-if="contact?.registered"
-                icon="person-circle-check"
-                class="fa-fw"
-              />
-              <fa v-else icon="person-circle-question" class="fa-fw" />
-            </button>
-            <!-- otherwise it's this user so hide it -->
-            <fa v-else icon="rotate" class="text-white ml-6 px-2.5" />
-          </div>
-
-          <button
-            @click="confirmDeleteContact(contact)"
-            class="text-sm uppercase bg-gradient-to-b from-rose-500 to-rose-800 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white ml-6 mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
-            title="Delete"
-          >
-            <fa icon="trash-can" class="fa-fw" />
-          </button>
-        </div>
-        <div v-if="!contact?.profileImageUrl">
-          <div>Auto-Generated Icon</div>
-          <div class="flex justify-center">
-            <EntityIcon
-              :entityId="viewingDid"
-              :iconSize="64"
-              class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-              @click="showLargeIdenticonId = viewingDid"
-            />
-          </div>
+      <div class="mt-4">
+        <div class="flex justify-center">Auto-Generated Icon:</div>
+        <div class="flex justify-center">
+          <EntityIcon
+            :entityId="viewingDid"
+            :iconSize="64"
+            class="inline-block align-middle border border-slate-300 rounded-md mr-1"
+            @click="showLargeIdenticonId = viewingDid"
+          />
         </div>
       </div>
       <div
@@ -150,32 +72,6 @@
         </div>
       </div>
     </div>
-    <div v-if="contactEdit" class="dialog-overlay">
-      <div class="dialog">
-        <h1 class="text-xl font-bold text-center mb-4">Edit Name</h1>
-        <input
-          type="text"
-          class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-          placeholder="Name"
-          v-model="contactNewName"
-        />
-        <div class="flex justify-between">
-          <button
-            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-            @click="onClickSaveName(contactNewName)"
-          >
-            <fa icon="save" />
-          </button>
-          <span class="inline-block w-2" />
-          <button
-            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-            @click="onClickCancelName()"
-          >
-            <fa icon="ban" />
-          </button>
-        </div>
-      </div>
-    </div>
 
     <!-- Loading Animation -->
     <div
@@ -209,7 +105,10 @@
               {{ claimDescription(claim) }}
             </span>
             <span class="col-span-1">
-              <a @click="onClickLoadClaim(claim.id)" class="cursor-pointer">
+              <a
+                @click="onClickLoadClaim(claim.handleId)"
+                class="cursor-pointer"
+              >
                 <fa icon="file-lines" class="pl-2 pt-1 text-blue-500" />
               </a>
             </span>
@@ -222,16 +121,13 @@
       v-if="!isLoading && claims.length === 0"
       class="flex justify-center mt-4"
     >
-      <span>They are in no claims visible to you.</span>
+      <span>They Are in No Claims Visible to You</span>
     </div>
   </section>
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
-import * as yaml from "js-yaml";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
@@ -249,10 +145,7 @@ import {
   GenericVerifiableCredential,
   GiveVerifiableCredential,
   OfferVerifiableCredential,
-  register,
-  setVisibilityUtil,
 } from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
 import EntityIcon from "@/components/EntityIcon.vue";
 
 @Component({
@@ -266,21 +159,14 @@ import EntityIcon from "@/components/EntityIcon.vue";
 export default class DIDView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  libsUtil = libsUtil;
-  yaml = yaml;
-
   activeDid = "";
   allMyDids: Array<string> = [];
   apiServer = "";
-  claims: Array<GenericCredWrapper<GenericVerifiableCredential>> = [];
-  contact: Contact;
-  contactEdit = false;
-  contactNewName?: string;
-  contactYaml = "";
+  claims: Array<GenericCredWrapper> = [];
+  contact?: Contact;
   hitEnd = false;
   isLoading = false;
   searchBox: { name: string; bbox: BoundingBox } | null = null;
-  showDidDetails = false;
   showLargeIdenticonId?: string;
   showLargeIdenticonUrl?: string;
   viewingDid?: string;
@@ -296,29 +182,22 @@ export default class DIDView extends Vue {
     this.apiServer = (settings?.apiServer as string) || "";
 
     const pathParam = window.location.pathname.substring("/did/".length);
-    let theContact: Contact | undefined;
     if (pathParam) {
       this.viewingDid = decodeURIComponent(pathParam);
-      theContact = await db.contacts.get(this.viewingDid);
-    }
-    if (theContact) {
-      this.contact = theContact;
+      this.contact = await db.contacts.get(this.viewingDid);
+      await this.loadClaimsAbout();
     } else {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "No valid claim ID was provided.",
+          text: "No claim ID was provided.",
         },
         -1,
       );
-      return;
     }
 
-    this.contactYaml = yaml.dump(this.contact);
-    await this.loadClaimsAbout();
-
     await accountsDB.open();
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
@@ -334,128 +213,6 @@ export default class DIDView extends Vue {
     }
   }
 
-  // prompt with confirmation if they want to delete a contact
-  confirmDeleteContact(contact: Contact) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Delete",
-        text:
-          "Are you sure you want to remove " +
-          libsUtil.nameForContact(contact, false) +
-          " from your contact list?",
-        onYes: async () => {
-          await this.deleteContact(contact);
-        },
-      },
-      -1,
-    );
-  }
-
-  async deleteContact(contact: Contact) {
-    await db.open();
-    await db.contacts.delete(contact.did);
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Deleted",
-        text: "Contact has been removed.",
-      },
-      3000,
-    );
-    (this.$router as Router).push({ name: "contacts" });
-  }
-
-  // confirm to register a new contact
-  async confirmRegister(contact: Contact) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Register",
-        text:
-          "Are you sure you want to register " +
-          libsUtil.nameForContact(this.contact, false) +
-          (contact.registered
-            ? " -- especially since they are already marked as registered"
-            : "") +
-          "?",
-        onYes: async () => {
-          await this.register(contact);
-        },
-      },
-      -1,
-    );
-  }
-
-  // note that this is also in ContactView.vue
-  async register(contact: Contact) {
-    this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
-
-    try {
-      const regResult = await register(
-        this.activeDid,
-        this.apiServer,
-        this.axios,
-        contact,
-      );
-      if (regResult.success) {
-        contact.registered = true;
-        await db.contacts.update(contact.did, { registered: true });
-
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Registration Success",
-            text:
-              (contact.name || "That unnamed person") + " has been registered.",
-          },
-          5000,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Registration Error",
-            text:
-              (regResult.error as string) ||
-              "Something went wrong during registration.",
-          },
-          5000,
-        );
-      }
-    } catch (error) {
-      console.error("Error when registering:", error);
-      let userMessage = "There was an error. See logs for more info.";
-      const serverError = error as AxiosError;
-      if (serverError) {
-        if (serverError.response?.data?.error?.message) {
-          userMessage = serverError.response.data.error.message;
-        } else if (serverError.message) {
-          userMessage = serverError.message; // Info for the user
-        } else {
-          userMessage = JSON.stringify(serverError.toJSON());
-        }
-      } else {
-        userMessage = error as string;
-      }
-      // Now set that error for the user to see.
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Registration Error",
-          text: userMessage,
-        },
-        5000,
-      );
-    }
-  }
-
   public async loadClaimsAbout() {
     if (!this.viewingDid) {
       console.error("This should never be called without a DID.");
@@ -518,7 +275,7 @@ export default class DIDView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   public claimAmount(claim: GenericVerifiableCredential) {
@@ -552,178 +309,5 @@ export default class DIDView extends Vue {
   claimDescription(claim: GenericVerifiableCredential) {
     return claim.claim.name || claim.claim.description || "";
   }
-
-  private async onClickCancelName() {
-    this.contactEdit = false;
-  }
-
-  private async onClickSaveName(newName: string) {
-    this.contact.name = newName;
-    return db.contacts
-      .update(this.contact.did, { name: newName })
-      .then(() => (this.contactEdit = false));
-  }
-
-  // note that this is also in ContactView.vue
-  async confirmSetVisibility(contact: Contact, visibility: boolean) {
-    const visibilityPrompt = visibility
-      ? "Are you sure you want to make your activity visible to them?"
-      : "Are you sure you want to hide all your activity from them?";
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Set Visibility",
-        text: visibilityPrompt,
-        onYes: async () => {
-          const success = await this.setVisibility(contact, visibility, true);
-          if (success) {
-            contact.seesMe = visibility; // didn't work inside setVisibility
-          }
-        },
-      },
-      -1,
-    );
-  }
-
-  // note that this is also in ContactView.vue
-  async setVisibility(
-    contact: Contact,
-    visibility: boolean,
-    showSuccessAlert: boolean,
-  ) {
-    const result = await setVisibilityUtil(
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-      db,
-      contact,
-      visibility,
-    );
-    if (result.success) {
-      //contact.seesMe = visibility; // why doesn't it affect the UI from here?
-      //console.log("Set result & seesMe", result, contact.seesMe, contact.did);
-      if (showSuccessAlert) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Visibility Set",
-            text:
-              (contact.name || "That user") +
-              " can " +
-              (visibility ? "" : "not ") +
-              "see your activity.",
-          },
-          3000,
-        );
-      }
-      return true;
-    } else {
-      console.error("Got strange result from setting visibility:", result);
-      const message =
-        (result.error as string) || "Could not set visibility on the server.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Setting Visibility",
-          text: message,
-        },
-        5000,
-      );
-      return false;
-    }
-  }
-
-  // note that this is also in ContactView.vue
-  async checkVisibility(contact: Contact) {
-    const url =
-      this.apiServer +
-      "/api/report/canDidExplicitlySeeMe?did=" +
-      encodeURIComponent(contact.did);
-    const headers = await getHeaders(this.activeDid);
-    if (!headers["Authorization"]) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "No Identity",
-          text: "There is no identity to use to check visibility.",
-        },
-        3000,
-      );
-      return;
-    }
-
-    try {
-      const resp = await this.axios.get(url, { headers });
-      if (resp.status === 200) {
-        const visibility = resp.data;
-        contact.seesMe = visibility;
-        //console.log("Visi check:", visibility, contact.seesMe, contact.did);
-        await db.contacts.update(contact.did, { seesMe: visibility });
-
-        this.$notify(
-          {
-            group: "alert",
-            type: "info",
-            title: "Visibility Refreshed",
-            text:
-              libsUtil.nameForContact(contact, true) +
-              " can " +
-              (visibility ? "" : "not ") +
-              "see your activity.",
-          },
-          3000,
-        );
-      } else {
-        console.error("Got bad server response checking visibility:", resp);
-        const message = resp.data.error?.message || "Got bad server response.";
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Checking Visibility",
-            text: message,
-          },
-          5000,
-        );
-      }
-    } catch (err) {
-      console.error("Caught error from request to check visibility:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Checking Visibility",
-          text: "Check connectivity and try again.",
-        },
-        3000,
-      );
-    }
-  }
 }
 </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/views/DiscoverView.vue

@@ -1,20 +1,16 @@
 <template>
-  <QuickNav selected="Discover" />
+  <QuickNav selected="Discover"></QuickNav>
   <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">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Discover Projects
     </h1>
 
     <!-- Quick Search -->
-    <div
-      id="QuickSearch"
-      class="mt-8 mb-4 flex"
-      v-on:keyup.enter="searchSelected()"
-    >
+    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="searchSelected()">
       <input
         type="text"
         v-model="searchTerms"
@@ -96,7 +92,7 @@
 
     <!-- Results List -->
     <InfiniteScroll @reached-bottom="loadMoreData">
-      <ul id="listDiscoverResults">
+      <ul>
         <li
           class="border-b border-slate-300"
           v-for="project in projects"
@@ -133,7 +129,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
@@ -185,8 +180,6 @@ 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 {
@@ -271,8 +264,6 @@ export default class DiscoverView extends Vue {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
       console.error("Error with feed load:", e);
-      // this sometimes gives different information
-      console.error("Error with feed load (error added): " + e);
       this.$notify(
         {
           group: "alert",
@@ -403,7 +394,7 @@ export default class DiscoverView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   public computedLocalTabStyleClassNames() {

src/views/GiftedDetails.vue

@@ -64,9 +64,9 @@
       </div>
     </div>
 
-    <div class="flex justify-center mt-4" data-testid="imagery">
+    <div class="flex justify-center mt-4">
       <span v-if="imageUrl" class="flex justify-between">
-        <a :href="imageUrl" target="_blank">
+        <a :href="imageUrl" target="_blank" class="text-blue-500 ml-4">
           <img :src="imageUrl" class="h-24 rounded-xl" />
         </a>
         <fa
@@ -175,7 +175,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
@@ -184,14 +183,11 @@ import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import {
+  constructGive,
   createAndSubmitGive,
   didInfo,
-  editAndSubmitGive,
-  GenericCredWrapper,
   getHeaders,
   getPlanFromCache,
-  GiveVerifiableCredential,
-  hydrateGive,
 } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
 import { Contact } from "@/db/tables/contacts";
@@ -211,7 +207,7 @@ export default class GiftedDetails extends Vue {
 
   amountInput = "0";
   description = "";
-  destinationPathAfter = "";
+  destinationNameAfter = "";
   givenToProject = false;
   givenToRecipient = false;
   giverDid: string | undefined;
@@ -221,7 +217,6 @@ export default class GiftedDetails extends Vue {
   isTrade = false;
   message = "";
   offerId = "";
-  prevCredToEdit?: GenericCredWrapper<GiveVerifiableCredential>;
   projectId = "";
   projectName = "a project";
   recipientDid = "";
@@ -231,91 +226,38 @@ export default class GiftedDetails extends Vue {
   libsUtil = libsUtil;
 
   async mounted() {
-    try {
-      this.prevCredToEdit = (this.$route as Router).query["prevCredToEdit"]
-        ? (JSON.parse(
-            (this.$route as Router).query["prevCredToEdit"],
-          ) as GenericCredWrapper<GiveVerifiableCredential>)
-        : undefined;
-    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Retrieval Error",
-          text: "The previous record isn't available for editing. If you submit, you'll create a new record.",
-        },
-        6000,
-      );
-    }
-
-    const prevAmount = this.prevCredToEdit?.claim?.object?.amountOfThisGood;
     this.amountInput =
-      (this.$route as Router).query["amountInput"] ||
-      (prevAmount ? String(prevAmount) : "") ||
-      this.amountInput;
-    this.description =
-      (this.$route as Router).query["description"] ||
-      this.prevCredToEdit?.claim?.description ||
-      this.description;
-    this.destinationPathAfter = (this.$route as Router).query[
-      "destinationPathAfter"
-    ];
-    this.giverDid = ((this.$route as Router).query["giverDid"] ||
-      this.prevCredToEdit?.claim?.agent?.identifier ||
-      this.giverDid) as string;
-    this.giverName =
-      ((this.$route as Router).query["giverName"] as string) || "";
-    this.hideBackButton =
-      (this.$route as Router).query["hideBackButton"] === "true";
-    this.message = ((this.$route as Router).query["message"] as string) || "";
-
-    // find any offer ID
-    const fulfills = this.prevCredToEdit?.claim?.fulfills;
-    const fulfillsArray = Array.isArray(fulfills)
-      ? fulfills
-      : fulfills
-        ? [fulfills]
-        : [];
-    const offer = fulfillsArray.find((rec) => rec["@type"] === "Offer");
-    this.offerId = ((this.$route as Router).query["offerId"] ||
-      offer?.identifier ||
-      this.offerId) as string;
-
-    // find any project ID
-    const project = fulfillsArray.find((rec) => rec["@type"] === "PlanAction");
-    this.projectId = ((this.$route as Router).query["projectId"] ||
-      project?.identifier ||
-      this.projectId) as string;
-
-    this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
-      this.prevCredToEdit?.claim?.recipient?.identifier) as string;
-    this.recipientName =
-      ((this.$route as Router).query["recipientName"] as string) || "";
-    this.unitCode = ((this.$route as Router).query["unitCode"] ||
-      this.prevCredToEdit?.claim?.object?.unitCode ||
-      this.unitCode) as string;
+      (this.$route.query.amountInput as string) || this.amountInput;
+    this.description = (this.$route.query.description as string) || "";
+    this.destinationNameAfter = this.$route.query
+      .destinationNameAfter as string;
+    this.giverDid = this.$route.query.giverDid as string;
+    this.giverName = (this.$route.query.giverName as string) || "";
+    this.hideBackButton = this.$route.query.hideBackButton === "true";
+    this.message = (this.$route.query.message as string) || "";
+    this.offerId = this.$route.query.offerId as string;
+    this.projectId = this.$route.query.projectId as string;
+    this.recipientDid = this.$route.query.recipientDid as string;
+    this.recipientName = (this.$route.query.recipientName as string) || "";
+    this.unitCode = (this.$route.query.unitCode as string) || this.unitCode;
 
     this.imageUrl =
-      ((this.$route as Router).query["imageUrl"] as string) ||
-      this.prevCredToEdit?.claim?.image ||
+      (this.$route.query.imageUrl as string) ||
       localStorage.getItem("imageUrl") ||
-      this.imageUrl;
+      "";
 
     // this is an endpoint for sharing project info to highlight something given
     // https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
-    if ((this.$route as Router).query["shareTitle"]) {
-      this.description =
-        ((this.$route as Router).query["shareTitle"] as string) +
-        (this.description ? "\n" + this.description : "");
+    if (this.$route.query.shareTitle) {
+      this.description = this.$route.query.shareTitle as string;
     }
-    if ((this.$route as Router).query["shareText"]) {
+    if (this.$route.query.shareText) {
       this.description =
-        (this.description ? this.description + "\n" : "") +
-        ((this.$route as Router).query["shareText"] as string);
+        (this.description ? this.description + " " : "") +
+        (this.$route.query.shareText as string);
     }
-    if ((this.$route as Router).query["shareUrl"]) {
-      this.imageUrl = (this.$route as Router).query["shareUrl"] as string;
+    if (this.$route.query.shareUrl) {
+      this.imageUrl = this.$route.query.shareUrl as string;
     }
 
     try {
@@ -352,7 +294,6 @@ export default class GiftedDetails extends Vue {
           );
         }
       }
-      // these should be functions but something's wrong with the syntax in the <> conditional
       this.givenToProject = !!this.projectId;
       this.givenToRecipient = !this.givenToProject && !!this.recipientDid;
 
@@ -403,16 +344,16 @@ export default class GiftedDetails extends Vue {
 
   cancel() {
     this.deleteImage(); // not awaiting, so they'll go back immediately
-    if (this.destinationPathAfter) {
-      (this.$router as Router).push({ path: this.destinationPathAfter });
+    if (this.destinationNameAfter) {
+      this.$router.push({ name: this.destinationNameAfter });
     } else {
-      (this.$router as Router).back();
+      this.$router.back();
     }
   }
 
   cancelBack() {
     this.deleteImage(); // not awaiting, so they'll go back immediately
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   openImageDialog() {
@@ -551,7 +492,7 @@ export default class GiftedDetails extends Vue {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "To assign to a project, you must open this page through a project.",
+          text: "To assign to a project, you must open this dialog through a project.",
         },
         3000,
       );
@@ -576,7 +517,7 @@ export default class GiftedDetails extends Vue {
           group: "alert",
           type: "warning",
           title: "Error",
-          text: "To assign to a recipient, you must open this page from a contact.",
+          text: "To assign to a recipient, you must open this dialog from a contact.",
         },
         3000,
       );
@@ -607,40 +548,20 @@ export default class GiftedDetails extends Vue {
         ? this.recipientDid
         : undefined;
       const projectId = this.givenToProject ? this.projectId : undefined;
-      let result;
-      if (this.prevCredToEdit) {
-        // don't create from a blank one in case some properties were set from a different interface
-        result = await editAndSubmitGive(
-          this.axios,
-          this.apiServer,
-          this.prevCredToEdit,
-          this.activeDid,
-          this.giverDid,
-          recipientDid,
-          this.description,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          projectId,
-          this.offerId,
-          this.isTrade,
-          this.imageUrl,
-        );
-      } else {
-        result = await createAndSubmitGive(
-          this.axios,
-          this.apiServer,
-          this.activeDid,
-          this.giverDid,
-          recipientDid,
-          this.description,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          projectId,
-          this.offerId,
-          this.isTrade,
-          this.imageUrl,
-        );
-      }
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        this.activeDid,
+        this.giverDid,
+        recipientDid,
+        this.description,
+        parseFloat(this.amountInput),
+        this.unitCode,
+        projectId,
+        this.offerId,
+        this.isTrade,
+        this.imageUrl,
+      );
 
       if (
         result.type === "error" ||
@@ -668,10 +589,10 @@ export default class GiftedDetails extends Vue {
           5000,
         );
         localStorage.removeItem("imageUrl");
-        if (this.destinationPathAfter) {
-          (this.$router as Router).push({ path: this.destinationPathAfter });
+        if (this.destinationNameAfter) {
+          this.$router.push({ name: this.destinationNameAfter });
         } else {
-          (this.$router as Router).back();
+          this.$router.back();
         }
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -696,8 +617,7 @@ export default class GiftedDetails extends Vue {
   constructGiveParam() {
     const recipientDid = this.givenToRecipient ? this.recipientDid : undefined;
     const projectId = this.givenToProject ? this.projectId : undefined;
-    const giveClaim = hydrateGive(
-      this.prevCredToEdit?.claim as GiveVerifiableCredential,
+    const giveClaim = constructGive(
       this.giverDid,
       recipientDid,
       this.description,
@@ -707,7 +627,6 @@ export default class GiftedDetails extends Vue {
       this.offerId,
       this.isTrade,
       this.imageUrl,
-      this.prevCredToEdit?.id as string,
     );
     const claimStr = JSON.stringify(giveClaim);
     return claimStr;

src/views/HelpView.vue

@@ -24,181 +24,57 @@
     <!-- eslint-disable prettier/prettier -->
     <div>
       <p>
-        This app focuses on gifts & gratitude, using them to build cool things together with your network.
+        This app focuses on gifts & gratitude, using them to build cool things 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 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
+        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
         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 can be
+        came from you, and that the recipient can prove it was for them. This is
         personally gratifying, but it extends to broader work: volunteers get
-        confirmation of activity, and they can selectively show off their contributions
+        confirmation of activity, and selectively show off their contributions
         and network.
       </p>
-      <p class="mt-2">
-        With this, you highlight giving and you also offer help --
-        which could be conditional on others' contributions, too.
+      <p>
+        You highlight giving and also offer help to ideas -- which could be
+        conditional on others' willingness to help, 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 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>
+        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>
 
-      <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>
-        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 register others.
+        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. After they register 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. Each claim is recorded on a
+        custom ledger. The day after being registered, you'll be able to able to
+        register others; later, you can create projects, too.
       </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.
+        Note that there are rate limits to how many others you can register,
+        so it may take some time to register everyone you want. Take your time...
+        make it an opportunity to get to know their projects, and show your own.
       </p>
+
+      <h2 class="text-xl font-semibold">
+        I had an identifier, but I reinstalled and I got a new one automatically.
+        How do I restore my old one?
+      </h2>
       <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 off your own.
+        Go
+        <router-link class="text-blue-500" to="/import-account">import your identifier</router-link>.
       </p>
 
       <h2 class="text-xl font-semibold">How do I add someone else?</h2>
@@ -214,20 +90,11 @@
         and paste it into the text box on the Contacts <fa icon="users" class="fa-fw" /> page.
       </p>
 
-      <h2 class="text-xl font-semibold">
-        I had an identifier, but I reinstalled and I got a new one automatically.
-        How do I restore my old one?
-      </h2>
-      <p>
-        Go
-        <router-link class="text-blue-500" to="/import-account">import your identifier</router-link>.
-      </p>
-
       <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 as sensitive such as settings and contacts;
-        the private image for yourself; and the data that you have sent to the public.
+        There are three sets of data to backup: the identifier secrets;
+        the non-public textual data that isn't quite a secret such as settings and contacts;
+        the non-public image for yourself; and the data that you have sent to the public.
       </p>
 
       <div class="px-4">
@@ -316,14 +183,15 @@
 
       <h2 class="text-xl font-semibold">How do I create another identity?</h2>
       <p>
-        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
+        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
         <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 from my device?</h2>
+      <h2 class="text-xl font-semibold">How do I erase my data?</h2>
       <p>
         Before doing this, you may want to back up your data with the instructions above.
       </p>
@@ -331,9 +199,6 @@
         <li class="list-disc list-outside ml-4">
           Mobile
           <ul>
-            <li class="list-disc list-outside ml-4">
-              Home Screen: hold down on the icon, and choose to delete it
-            </li>
             <li class="list-disc list-outside ml-4">
               Chrome: Settings -> Privacy and Security -> Clear Browsing Data
             </li>
@@ -512,9 +377,9 @@
           class="text-blue-500 ml-2"
         >
           bc1q90v4ted6cpt63tjfh2lvd5xzfc67sd4g9w8xma
-          <fa v-show="!showDidCopy" icon="copy" class="text-slate-400 fa-fw" />
+          <fa icon="copy" class="text-slate-400 fa-fw"></fa>
         </button>
-        <span v-show="showDidCopy" class="ml-2 text-sm text-green-500">Copied</span>
+        <span v-show="showDidCopy">Copied</span>
         For other donations, contact us.
       </p>
 
@@ -531,7 +396,7 @@
       <p>{{ package.version }} ({{ commitHash }})</p>
 
       <h2 class="text-xl font-semibold">
-        I have other questions, like getting a new account or removing all my data from the public ledger.
+        For any other questions, like getting a new account or removing all your data from the public ledger:
       </h2>
       <p>
         Contact us at
@@ -558,13 +423,7 @@ 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 mb-8">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-8">
       {{ AppString.APP_NAME }}
     </h1>
 
-    <!-- prompt to install notifications with notificationsSupported, which we're making an advanced feature -->
-    <div class="mb-8 mt-8">
+    <!-- prompt to install notifications -->
+    <div class="mb-8">
       <div
-        v-if="false"
+        v-if="!notificationsSupported()"
         class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
       >
         <p style="display: inline; align-items: center">
@@ -81,21 +81,16 @@
         <div class="mb-4">
           <div
             v-if="!isRegistered"
-            id="noticeSomeoneMustRegisterYou"
             class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
           >
             <!-- activeDid && !isRegistered -->
             To share, someone must register you.
-            <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" />
+            <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 Default Identifier Info
+            </router-link>
             <div v-if="PASSKEYS_ENABLED" class="flex justify-end w-full">
               <router-link
                 :to="{ name: 'start' }"
@@ -106,24 +101,16 @@
             </div>
           </div>
 
-          <div v-else id="sectionRecordSomethingGiven">
+          <div v-else>
             <!-- activeDid && isRegistered -->
 
             <!-- show the actions for recognizing a give -->
-            <div class="flex justify-between">
+            <div class="mb-4">
               <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 mt-4"
+              class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mb-5"
             >
               <li @click="openDialog()">
                 <img
@@ -137,7 +124,7 @@
                 </h3>
               </li>
               <li
-                v-for="contact in allContacts.slice(0, 6)"
+                v-for="contact in allContacts.slice(0, 7)"
                 :key="contact.did"
                 @click="openDialog(contact)"
               >
@@ -152,16 +139,23 @@
                   {{ 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>
@@ -172,7 +166,7 @@
     <FeedFilters ref="feedFilters" />
 
     <!-- Results List -->
-    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mt-4 mb-4">
+    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 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">
@@ -193,7 +187,7 @@
         </button>
       </div>
       <InfiniteScroll @reached-bottom="loadMoreGives">
-        <ul id="listLatestActivity" class="border-t border-slate-300">
+        <ul class="border-t border-slate-300">
           <li
             class="border-b border-slate-300 py-2"
             v-for="record in feedData"
@@ -316,7 +310,6 @@ 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,
@@ -374,7 +367,6 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
     EntityIcon,
     InfiniteScroll,
     TopMessage,
-    UserNameDialog,
   },
 })
 export default class HomeView extends Vue {
@@ -431,7 +423,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) {
@@ -444,7 +436,7 @@ export default class HomeView extends Vue {
           if (resp.status === 200) {
             // we just needed to know that they're registered
             await db.open();
-            await db.settings.update(MASTER_SETTINGS_KEY, {
+            db.settings.update(MASTER_SETTINGS_KEY, {
               isRegistered: true,
             });
             this.isRegistered = true;
@@ -455,7 +447,7 @@ export default class HomeView extends Vue {
       }
 
       // this returns a Promise but we don't need to wait for it
-      this.updateAllFeed();
+      await this.updateAllFeed();
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
@@ -501,7 +493,7 @@ export default class HomeView extends Vue {
 
     this.feedData = [];
     this.feedPreviousOldestId = undefined;
-    await this.updateAllFeed();
+    this.updateAllFeed();
   }
 
   /**
@@ -513,7 +505,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) {
-      await this.updateAllFeed();
+      this.updateAllFeed();
     }
   }
 
@@ -533,7 +525,6 @@ 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) {
@@ -607,7 +598,7 @@ export default class HomeView extends Vue {
             this.feedLastViewedClaimId < results.data[0].jwtId
           ) {
             await db.open();
-            await db.settings.update(MASTER_SETTINGS_KEY, {
+            db.settings.update(MASTER_SETTINGS_KEY, {
               lastViewedClaimId: results.data[0].jwtId,
             });
           }
@@ -627,7 +618,7 @@ export default class HomeView extends Vue {
       });
     if (this.feedData.length === 0 && !endOfResults) {
       // repeat until there's at least some data
-      await this.updateAllFeed();
+      this.updateAllFeed();
     }
     this.isFeedLoading = false;
   }
@@ -777,36 +768,5 @@ 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/IdentitySwitcherView.vue

@@ -99,7 +99,6 @@
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
@@ -156,7 +155,7 @@ export default class IdentitySwitcherView extends Vue {
     await db.settings.update(MASTER_SETTINGS_KEY, {
       activeDid: did,
     });
-    (this.$router as Router).push({ name: "account" });
+    this.$router.push({ name: "account" });
   }
 
   async deleteAccount(id: string) {

src/views/ImportAccountView.vue

@@ -77,7 +77,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
@@ -111,7 +110,7 @@ export default class ImportAccountView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   public async fromMnemonic() {
@@ -144,10 +143,10 @@ export default class ImportAccountView extends Vue {
 
       // record that as the active DID
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         activeDid: newId.did,
       });
-      (this.$router as Router).push({ name: "account" });
+      this.$router.push({ name: "account" });
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       console.error("Error saving mnemonic & updating settings:", err);

src/views/ImportDerivedAccountView.vue

@@ -70,8 +70,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
@@ -102,7 +100,7 @@ export default class ImportAccountView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   public switchAccount(did: string) {
@@ -126,11 +124,9 @@ export default class ImportAccountView extends Vue {
       }
     });
     // increment the last number in that max derivation path
-    const newDerivPath = nextDerivationPath(
-      accountWithMaxDeriv.derivationPath as string,
-    );
+    const newDerivPath = nextDerivationPath(accountWithMaxDeriv.derivationPath);
 
-    const mne: string = accountWithMaxDeriv.mnemonic as string;
+    const mne: string = accountWithMaxDeriv.mnemonic;
 
     const [address, privateHex, publicHex] = deriveAddress(mne, newDerivPath);
 
@@ -148,10 +144,10 @@ export default class ImportAccountView extends Vue {
 
       // record that as the active DID
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         activeDid: newId.did,
       });
-      (this.$router as Router).push({ name: "account" });
+      this.$router.push({ name: "account" });
     } catch (err) {
       console.error("Error saving mnemonic & updating settings:", err);
     }

src/views/NewEditAccountView.vue

@@ -45,8 +45,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
@@ -65,16 +63,16 @@ export default class NewEditAccountView extends Vue {
       (settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
   }
 
-  async onClickSaveChanges() {
-    await db.settings.update(MASTER_SETTINGS_KEY, {
+  onClickSaveChanges() {
+    db.settings.update(MASTER_SETTINGS_KEY, {
       firstName: this.givenName,
       lastName: "", // deprecated, pre v 0.1.3
     });
-    (this.$router as Router).back();
+    this.$router.back();
   }
 
   onClickCancel() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 }
 </script>

src/views/NewEditProjectView.vue

@@ -74,9 +74,6 @@
       v-model="fullClaim.description"
       maxlength="5000"
     ></textarea>
-    <div class="text-xs text-slate-500 italic -mt-3 mb-4">
-      If you want to be contacted, be sure to include your contact information.
-    </div>
     <div class="text-xs text-slate-500 italic -mt-3 mb-4">
       {{ fullClaim.description?.length }}/5000 max. characters
     </div>
@@ -97,8 +94,8 @@
       />
       <input
         :disabled="!startDateInput"
-        placeholder="Start Time"
         v-model="startTimeInput"
+        placeholder="Start Time"
         type="time"
         class="col-span-1 w-full rounded border border-slate-400 ml-2 px-3 py-2"
       />
@@ -180,7 +177,6 @@ import { AxiosError, AxiosRequestHeaders } from "axios";
 import { DateTime } from "luxon";
 import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
 
 import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
@@ -309,7 +305,7 @@ export default class NewEditProjectView extends Vue {
       return;
     }
     try {
-      const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders;
+      const headers = getHeaders(this.activeDid) as AxiosRequestHeaders;
       const response = await this.axios.delete(
         DEFAULT_IMAGE_API_SERVER +
           "/image/" +
@@ -424,7 +420,7 @@ export default class NewEditProjectView extends Vue {
         useAppStore()
           .setProjectId(resp.data.success.handleId)
           .then(() => {
-            (this.$router as Router).push({ name: "project" });
+            this.$router.push({ name: "project" });
           });
       } else {
         console.error(
@@ -522,7 +518,7 @@ export default class NewEditProjectView extends Vue {
   }
 
   public onCancelClick() {
-    (this.$router as Router).back();
+    this.$router.back();
   }
 }
 </script>

src/views/NewIdentifierView.vue

@@ -22,8 +22,8 @@
     </div>
 
     <div class="flex justify-center py-12">
-      <div />
-      <div v-if="loading">
+      <span />
+      <span v-if="loading">
         <span class="text-xl">Creating...&nbsp;</span>
         <fa
           icon="spinner"
@@ -31,8 +31,8 @@
           color="green"
           size="128"
         ></fa>
-      </div>
-      <div v-else>
+      </span>
+      <span v-else>
         <span class="text-xl">Created!</span>
         <fa
           icon="burst"
@@ -45,8 +45,8 @@
             --fa-beat-scale: 6;
           "
         ></fa>
-      </div>
-      <div />
+      </span>
+      <span />
     </div>
   </section>
 </template>
@@ -54,8 +54,6 @@
 <script lang="ts">
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import { generateSaveAndActivateIdentity } from "@/libs/util";
 import QuickNav from "@/components/QuickNav.vue";
 
@@ -67,7 +65,7 @@ export default class NewIdentifierView extends Vue {
     await generateSaveAndActivateIdentity();
     this.loading = false;
     setTimeout(() => {
-      (this.$router as Router).push({ name: "home" });
+      this.$router.push({ name: "home" });
     }, 1000);
   }
 }

src/views/OfferDetailsView.vue

@@ -1,633 +0,0 @@
-<template>
-  <QuickNav />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Back -->
-    <div
-      v-if="!hideBackButton"
-      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="cancelBack()"
-      >
-        <fa icon="chevron-left" class="fa-fw"></fa>
-      </h1>
-    </div>
-
-    <!-- Heading -->
-    <h1 class="text-4xl text-center font-light px-4 mb-4">What Is Offered</h1>
-
-    <h1 class="text-xl font-bold text-center mb-4">
-      <span>
-        Offer to
-        {{
-          offeredToProject
-            ? projectName
-            : offeredToRecipient
-              ? recipientName
-              : "someone unidentified"
-        }}</span
-      >
-    </h1>
-    <textarea
-      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-      placeholder="What is offered"
-      v-model="itemDescription"
-      data-testId="itemDescription"
-    />
-    <div class="flex flex-row justify-center">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center text-blue-500 px-2 py-2 w-20"
-        @click="changeUnitCode()"
-      >
-        {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
-      </span>
-      <div
-        class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-        @click="amountInput === '0' ? null : decrement()"
-      >
-        <fa icon="chevron-left" />
-      </div>
-      <input
-        type="number"
-        class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
-        v-model="amountInput"
-        data-testId="inputOfferAmount"
-      />
-      <div
-        class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-        @click="increment()"
-      >
-        <fa icon="chevron-right" />
-      </div>
-    </div>
-
-    <div class="flex flex-row mt-2">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-      >
-        Conditions
-      </span>
-      <textarea
-        class="w-full border border-slate-400 px-3 py-2 rounded-r"
-        placeholder="Prerequisites, other people to include, etc."
-        v-model="conditionDescription"
-      />
-    </div>
-
-    <div class="flex flex-row mt-2">
-      <span
-        class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-      >
-        {{ validThroughDateInput ? "" : "No" }}&nbsp;Expiration
-      </span>
-      <input
-        v-model="validThroughDateInput"
-        type="date"
-        class="w-full rounded border border-slate-400 px-3 py-2 rounded-r"
-      />
-    </div>
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="projectId && !offeredToRecipient"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="offeredToProject"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfProject()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          projectId
-            ? "This is offered to " + projectName
-            : "No project was chosen"
-        }}
-      </label>
-    </div>
-
-    <div class="h-7 mt-4 flex">
-      <input
-        v-if="recipientDid && !offeredToProject"
-        type="checkbox"
-        class="h-6 w-6 mr-2"
-        v-model="offeredToRecipient"
-      />
-      <fa
-        v-else
-        icon="square"
-        class="bg-slate-500 text-slate-500 h-5 w-5 px-0.5 py-0.5 mr-2 rounded"
-        @click="notifyUserOfRecipient()"
-      />
-      <label class="text-sm mt-1">
-        {{
-          recipientDid
-            ? "This is offered to " + recipientName
-            : "No recipient was chosen."
-        }}
-      </label>
-    </div>
-
-    <div class="mt-4 flex">
-      <router-link
-        :to="{
-          name: 'claim-add-raw',
-          query: {
-            claim: constructOfferParam(),
-          },
-        }"
-        class="text-blue-500"
-      >
-        Edit & Submit Raw
-      </router-link>
-    </div>
-
-    <p class="text-center mb-2 mt-6 italic">
-      Sign & Send to publish to the world
-      <fa
-        icon="circle-info"
-        class="pl-2 text-blue-500 cursor-pointer"
-        @click="explainData()"
-      />
-    </p>
-    <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
-      <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"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <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-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-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 {
-  createAndSubmitOffer,
-  didInfo,
-  editAndSubmitOffer,
-  GenericCredWrapper,
-  getPlanFromCache,
-  hydrateOffer,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import { Contact } from "@/db/tables/contacts";
-
-@Component({
-  components: {
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class OfferDetailsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  activeDid = "";
-  apiServer = "";
-
-  amountInput = "0";
-  conditionDescription = "";
-  itemDescription = "";
-  destinationPathAfter = "";
-  offeredToProject = false;
-  offeredToRecipient = false;
-  offererDid: string | undefined;
-  hideBackButton = false;
-  message = "";
-  offerId = "";
-  prevCredToEdit?: GenericCredWrapper<OfferVerifiableCredential>;
-  projectId = "";
-  projectName = "a project";
-  recipientDid = "";
-  recipientName = "";
-  unitCode = "HUR";
-  validThroughDateInput = "";
-
-  libsUtil = libsUtil;
-
-  async mounted() {
-    try {
-      this.prevCredToEdit = (this.$route as Router).query["prevCredToEdit"]
-        ? (JSON.parse(
-            (this.$route as Router).query["prevCredToEdit"],
-          ) as GenericCredWrapper<OfferVerifiableCredential>)
-        : undefined;
-    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Retrieval Error",
-          text: "The previous record isn't available for editing. If you submit, you'll create a new record.",
-        },
-        6000,
-      );
-    }
-
-    const prevAmount =
-      this.prevCredToEdit?.claim?.includesObject?.amountOfThisGood;
-    this.amountInput =
-      (this.$route as Router).query["amountInput"] ||
-      (prevAmount ? String(prevAmount) : "") ||
-      this.amountInput;
-    this.unitCode = ((this.$route as Router).query["unitCode"] ||
-      this.prevCredToEdit?.claim?.includesObject?.unitCode ||
-      this.unitCode) as string;
-
-    this.conditionDescription =
-      this.prevCredToEdit?.claim?.description || this.conditionDescription;
-    this.itemDescription =
-      (this.$route as Router).query["description"] ||
-      this.prevCredToEdit?.claim?.itemOffered?.description ||
-      this.itemDescription;
-    this.destinationPathAfter = (this.$route as Router).query[
-      "destinationPathAfter"
-    ];
-    this.offererDid = ((this.$route as Router).query["offererDid"] ||
-      this.prevCredToEdit?.claim?.agent?.identifier ||
-      this.offererDid) as string;
-    this.hideBackButton =
-      (this.$route as Router).query["hideBackButton"] === "true";
-    this.message = ((this.$route as Router).query["message"] as string) || "";
-
-    // find any project ID
-    let project;
-    if (
-      this.prevCredToEdit?.claim?.itemOffered?.isPartOf?.["@type"] ===
-      "PlanAction"
-    ) {
-      project = this.prevCredToEdit?.claim?.itemOffered?.isPartOf;
-    }
-    this.projectId = ((this.$route as Router).query["projectId"] ||
-      project?.identifier ||
-      this.projectId) as string;
-    this.projectName = ((this.$route as Router).query["projectName"] ||
-      project?.name ||
-      this.projectName) as string;
-
-    this.recipientDid = ((this.$route as Router).query["recipientDid"] ||
-      this.prevCredToEdit?.claim?.recipient?.identifier) as string;
-    this.recipientName =
-      ((this.$route as Router).query["recipientName"] as string) || "";
-
-    this.validThroughDateInput =
-      this.prevCredToEdit?.claim?.validThrough || this.validThroughDateInput;
-
-    try {
-      await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-      this.apiServer = settings?.apiServer || "";
-      this.activeDid = settings?.activeDid || "";
-
-      let allContacts: Contact[] = [];
-      let allMyDids: string[] = [];
-      if (this.recipientDid && !this.recipientName) {
-        allContacts = await db.contacts.toArray();
-
-        await accountsDB.open();
-        const allAccounts = await accountsDB.accounts.toArray();
-        allMyDids = allAccounts.map((acc) => acc.did);
-        this.recipientName = didInfo(
-          this.recipientDid,
-          this.activeDid,
-          allMyDids,
-          allContacts,
-        );
-      }
-      // these should be functions but something's wrong with the syntax in the <> conditional
-      this.offeredToProject = !!this.projectId;
-      this.offeredToRecipient = !this.offeredToProject && !!this.recipientDid;
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.error("Error retrieving settings from database:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
-        },
-        -1,
-      );
-    }
-
-    if (this.projectId && !this.projectName) {
-      // console.log("Getting project name from cache", this.projectId);
-      const project = await getPlanFromCache(
-        this.projectId,
-        this.axios,
-        this.apiServer,
-        this.activeDid,
-      );
-      this.projectName = project?.name
-        ? "the project: " + project.name
-        : "a project";
-    }
-  }
-
-  changeUnitCode() {
-    const units = Object.keys(this.libsUtil.UNIT_SHORT);
-    const index = units.indexOf(this.unitCode);
-    this.unitCode = units[(index + 1) % units.length];
-  }
-
-  increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
-  }
-
-  decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
-  }
-
-  cancel() {
-    if (this.destinationPathAfter) {
-      (this.$router as Router).push({ path: this.destinationPathAfter });
-    } else {
-      (this.$router as Router).back();
-    }
-  }
-
-  cancelBack() {
-    (this.$router as Router).back();
-  }
-
-  async confirm() {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identifier before you can record a offer.",
-        },
-        2000,
-      );
-      return;
-    }
-    if (parseFloat(this.amountInput) < 0) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          text: "You may not send a negative number.",
-          title: "",
-        },
-        2000,
-      );
-      return;
-    }
-    if (!this.itemDescription && !parseFloat(this.amountInput)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: `You must enter a description or some number of ${
-            this.libsUtil.UNIT_LONG[this.unitCode]
-          }.`,
-        },
-        2000,
-      );
-      return;
-    }
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "Recording the offer...",
-        title: "",
-      },
-      1000,
-    );
-
-    // this is asynchronous, but we don't need to wait for it to complete
-    await this.recordOffer();
-  }
-
-  notifyUserOfProject() {
-    if (!this.projectId) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a project, you must open this page through a project.",
-        },
-        3000,
-      );
-    } else {
-      // must be because offeredToRecipient is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a project and to a recipient.",
-        },
-        3000,
-      );
-    }
-  }
-
-  notifyUserOfRecipient() {
-    if (!this.recipientDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "To assign to a recipient, you must open this page from a contact.",
-        },
-        3000,
-      );
-    } else {
-      // must be because offeredToProject is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a recipient and to a project.",
-        },
-        3000,
-      );
-    }
-  }
-
-  /**
-   *
-   * @param offererDid may be null
-   * @param description may be an empty string
-   * @param amountInput may be 0
-   * @param unitCode may be omitted, defaults to "HUR"
-   */
-  public async recordOffer() {
-    try {
-      const recipientDid = this.offeredToRecipient
-        ? this.recipientDid
-        : undefined;
-      const projectId = this.offeredToProject ? this.projectId : undefined;
-      let result;
-      if (this.prevCredToEdit) {
-        // don't create from a blank one in case some properties were set from a different interface
-        result = await editAndSubmitOffer(
-          this.axios,
-          this.apiServer,
-          this.prevCredToEdit,
-          this.activeDid,
-          this.itemDescription,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.conditionDescription,
-          this.validThroughDateInput,
-          recipientDid,
-          projectId,
-        );
-      } else {
-        result = await createAndSubmitOffer(
-          this.axios,
-          this.apiServer,
-          this.activeDid,
-          this.itemDescription,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.conditionDescription,
-          this.validThroughDateInput,
-          recipientDid,
-          projectId,
-        );
-      }
-
-      if (result.type === "error" || this.isCreationError(result.response)) {
-        const errorMessage = this.getCreationErrorMessage(result);
-        console.error("Error with offer creation result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the offer.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: `That offer was recorded.`,
-          },
-          5000,
-        );
-        localStorage.removeItem("imageUrl");
-        if (this.destinationPathAfter) {
-          (this.$router as Router).push({ path: this.destinationPathAfter });
-        } else {
-          (this.$router as Router).back();
-        }
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Error with offer recordation caught:", error);
-      const errorMessage =
-        error.userMessage ||
-        error.response?.data?.error?.message ||
-        "There was an error recording the offer.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: errorMessage,
-        },
-        -1,
-      );
-    }
-  }
-
-  constructOfferParam() {
-    const recipientDid = this.offeredToRecipient
-      ? this.recipientDid
-      : undefined;
-    const projectId = this.offeredToProject ? this.projectId : undefined;
-    const offerClaim = hydrateOffer(
-      this.prevCredToEdit?.claim as OfferVerifiableCredential,
-      this.activeDid,
-      recipientDid,
-      this.itemDescription,
-      parseFloat(this.amountInput),
-      this.unitCode,
-      this.conditionDescription,
-      projectId,
-      this.validThroughDateInput,
-      this.prevCredToEdit?.id as string,
-    );
-    const claimStr = JSON.stringify(offerClaim);
-    return claimStr;
-  }
-
-  // Helper functions for readability
-
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
-  /**
-   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
-   * @returns best guess at an error message
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getCreationErrorMessage(result: any) {
-    return (
-      result.error?.userMessage ||
-      result.error?.error ||
-      result.response?.data?.error?.message
-    );
-  }
-
-  explainData() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Data Sharing",
-        text: libsUtil.PRIVACY_MESSAGE,
-      },
-      -1,
-    );
-  }
-}
-</script>

src/views/ProjectViewView.vue

@@ -115,54 +115,9 @@
       </button>
     </div>
 
-    <div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-4 mt-4">
-      <div>
-        <div
-          v-if="fulfillersToThis.length > 0"
-          class="bg-slate-100 px-4 py-3 rounded-md"
-        >
-          <h3 class="text-sm uppercase font-semibold mt-3">
-            Projects That Contribute To This
-          </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
-              <button
-                @click="onClickLoadProject(plan.handleId)"
-                class="text-blue-500"
-              >
-                {{ plan.name }}
-              </button>
-            </div>
-            <div v-if="fulfillersToHitLimit" class="text-center">
-              <button @click="loadPlanFulfillersTo()">Load More</button>
-            </div>
-          </div>
-        </div>
-      </div>
-
-      <div>
-        <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
-          <h3 class="text-sm uppercase font-semibold mb-3">
-            Projects Getting Contributions From This
-          </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <button
-              @click="onClickLoadProject(fulfilledByThis.handleId)"
-              class="text-blue-500"
-            >
-              {{ fulfilledByThis.name }}
-            </button>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-if="activeDid && isRegistered" class="mt-4">
+    <div v-if="activeDid" class="mt-4">
       <div class="text-center">
         <button
-          data-testId="offerButton"
           @click="openOfferDialog()"
           class="block w-full 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"
         >
@@ -170,13 +125,9 @@
         </button>
       </div>
     </div>
-    <OfferDialog
-      ref="customOfferDialog"
-      :projectId="this.projectId"
-      :projectName="this.name"
-    />
+    <OfferDialog ref="customOfferDialog" :projectId="this.projectId" />
 
-    <div v-if="activeDid && isRegistered">
+    <div v-if="activeDid">
       <div class="text-center">
         <p class="mt-2 mt-4 text-center">Record a contribution from:</p>
       </div>
@@ -350,11 +301,6 @@
                 <fa icon="circle-check" class="text-blue-500 cursor-pointer" />
               </a>
             </div>
-            <div v-if="give.fullClaim.image" class="flex justify-center">
-              <a :href="give.fullClaim.image" target="_blank">
-                <img :src="give.fullClaim.image" class="h-24 mt-2 rounded-xl" />
-              </a>
-            </div>
           </li>
         </ul>
         <div v-if="givesHitLimit" class="text-center text-blue-500">
@@ -367,51 +313,87 @@
           v-if="givesProvidedByThis.length > 0"
           class="bg-slate-100 px-4 py-3 rounded-md"
         >
-          <div>
-            <h3 class="text-sm font-semibold border-b">
-              Individuals Getting Contributions From This
-            </h3>
-            <!-- similar to gift display above -->
-            <ul class="text-sm border-t border-slate-300">
-              <li
-                v-for="give in givesProvidedByThis"
-                :key="give.id"
-                class="py-1.5 border-b border-slate-300"
+          <h3 class="text-sm uppercase font-semibold mb-3 border-b">
+            Individuals Getting Contributions From This
+          </h3>
+          <!-- similar to gift display above -->
+          <ul class="text-sm border-t border-slate-300">
+            <li
+              v-for="give in givesProvidedByThis"
+              :key="give.id"
+              class="py-1.5 border-b border-slate-300"
+            >
+              <div class="flex justify-between gap-4">
+                <span>
+                  {{
+                    serverUtil.didInfo(
+                      give.agentDid,
+                      activeDid,
+                      allMyDids,
+                      allContacts,
+                    )
+                  }}
+                </span>
+                <span v-if="give.amount" class="whitespace-nowrap">
+                  <fa
+                    :icon="libsUtil.iconForUnitCode(give.unit)"
+                    class="fa-fw text-slate-400"
+                  />{{ give.amount }}
+                </span>
+              </div>
+              <div class="text-slate-500">
+                <fa icon="calendar" class="fa-fw text-slate-400" />
+                {{ give.issuedAt?.substring(0, 10) }}
+              </div>
+              <div v-if="give.description" class="text-slate-500">
+                <fa icon="comment" class="fa-fw text-slate-400" />
+                {{ give.description }}
+              </div>
+              <a @click="onClickLoadClaim(give.jwtId)">
+                <fa icon="file-lines" class="text-blue-500 cursor-pointer" />
+              </a>
+            </li>
+          </ul>
+          <div v-if="givesProvidedByHitLimit" class="text-center">
+            <button @click="loadGivesProvidedBy()">Load More</button>
+          </div>
+        </div>
+
+        <div
+          v-if="fulfillersToThis.length > 0"
+          class="bg-slate-100 px-4 py-3 rounded-md"
+        >
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Projects That Contribute To This
+          </h3>
+          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
+          <div class="text-center">
+            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
+              <button
+                @click="onClickLoadProject(plan.handleId)"
+                class="text-blue-500"
               >
-                <div class="flex justify-between gap-4">
-                  <span>
-                    {{
-                      serverUtil.didInfo(
-                        give.agentDid,
-                        activeDid,
-                        allMyDids,
-                        allContacts,
-                      )
-                    }}
-                  </span>
-                  <span v-if="give.amount" class="whitespace-nowrap">
-                    <fa
-                      :icon="libsUtil.iconForUnitCode(give.unit)"
-                      class="fa-fw text-slate-400"
-                    />{{ give.amount }}
-                  </span>
-                </div>
-                <div class="text-slate-500">
-                  <fa icon="calendar" class="fa-fw text-slate-400" />
-                  {{ give.issuedAt?.substring(0, 10) }}
-                </div>
-                <div v-if="give.description" class="text-slate-500">
-                  <fa icon="comment" class="fa-fw text-slate-400" />
-                  {{ give.description }}
-                </div>
-                <a @click="onClickLoadClaim(give.jwtId)">
-                  <fa icon="file-lines" class="text-blue-500 cursor-pointer" />
-                </a>
-              </li>
-            </ul>
-            <div v-if="givesProvidedByHitLimit" class="text-center">
-              <button @click="loadGivesProvidedBy()">Load More</button>
+                {{ plan.name }}
+              </button>
             </div>
+            <div v-if="fulfillersToHitLimit" class="text-center">
+              <button @click="loadPlanFulfillersTo()">Load More</button>
+            </div>
+          </div>
+        </div>
+
+        <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
+          <h3 class="text-sm uppercase font-semibold mb-3">
+            Projects Getting Contributions From This
+          </h3>
+          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
+          <div class="text-center">
+            <button
+              @click="onClickLoadProject(fulfilledByThis.handleId)"
+              class="text-blue-500"
+            >
+              {{ fulfilledByThis.name }}
+            </button>
           </div>
         </div>
       </div>
@@ -422,7 +404,6 @@
 <script lang="ts">
 import { AxiosError } from "axios";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
@@ -442,9 +423,7 @@ import {
   getHeaders,
   GiverReceiverInputInfo,
   GiveSummaryRecord,
-  GiveVerifiableCredential,
   OfferSummaryRecord,
-  OfferVerifiableCredential,
   PlanSummaryRecord,
 } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
@@ -477,7 +456,6 @@ export default class ProjectViewView extends Vue {
   givesProvidedByThis: Array<GiveSummaryRecord> = [];
   givesProvidedByHitLimit = false;
   imageUrl = "";
-  isRegistered = false;
   issuer = "";
   latitude = 0;
   longitude = 0;
@@ -500,7 +478,6 @@ export default class ProjectViewView extends Vue {
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
     this.allContacts = await db.contacts.toArray();
-    this.isRegistered = !!settings?.isRegistered;
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
@@ -519,7 +496,7 @@ export default class ProjectViewView extends Vue {
     const route = {
       name: "new-edit-project",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   // Isn't there a better way to make this available to the template?
@@ -843,7 +820,7 @@ export default class ProjectViewView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(projectId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
     this.loadProject(projectId, this.activeDid);
   }
 
@@ -879,18 +856,18 @@ export default class ProjectViewView extends Vue {
     const route = {
       name: "contact-gift",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   onClickLoadClaim(jwtId: string) {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   checkIsFulfillable(offer: OfferSummaryRecord) {
-    const offerRecord: GenericCredWrapper<OfferVerifiableCredential> = {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       claimType: "Offer",
@@ -900,7 +877,7 @@ export default class ProjectViewView extends Vue {
   }
 
   onClickFulfillGiveToOffer(offer: OfferSummaryRecord) {
-    const offerRecord: GenericCredWrapper<OfferVerifiableCredential> = {
+    const offerRecord: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: offer.fullClaim,
       issuer: offer.offeredByDid,
@@ -945,17 +922,13 @@ export default class ProjectViewView extends Vue {
   }
 
   checkIsConfirmable(give: GiveSummaryRecord) {
-    const giveDetails: GenericCredWrapper<GiveVerifiableCredential> = {
+    const giveDetails: GenericCredWrapper = {
       ...BLANK_GENERIC_SERVER_RECORD,
       claim: give.fullClaim,
       claimType: "GiveAction",
       issuer: give.agentDid,
     };
-    return libsUtil.isGiveRecordTheUserCanConfirm(
-      this.isRegistered,
-      giveDetails,
-      this.activeDid,
-    );
+    return libsUtil.isGiveRecordTheUserCanConfirm(giveDetails, this.activeDid);
   }
 
   confirmConfirmClaim(give: GiveSummaryRecord) {

src/views/ProjectsView.vue

@@ -1,13 +1,15 @@
 <template>
-  <QuickNav selected="Projects" />
+  <QuickNav selected="Projects"></QuickNav>
   <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">Your Ideas</h1>
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Your Ideas
+    </h1>
 
     <!-- Result Tabs -->
-    <div class="text-center text-slate-500 border-b border-slate-300 mt-8">
+    <div class="text-center text-slate-500 border-b border-slate-300">
       <ul class="flex flex-wrap justify-center gap-4 -mb-px">
         <li>
           <a
@@ -84,7 +86,7 @@
           Look for projects worth some of your time.
         </router-link>
       </div>
-      <ul id="listOffers" class="border-t border-slate-300">
+      <ul class="border-t border-slate-300">
         <li
           class="border-b border-slate-300"
           v-for="offer in offers"
@@ -107,19 +109,6 @@
             </div>
 
             <div>
-              <div>
-                To
-                {{
-                  offer.fulfillsPlanHandleId
-                    ? projectNameFromHandleId[offer.fulfillsPlanHandleId]
-                    : didInfo(
-                        offer.recipientDid,
-                        activeDid,
-                        allMyDids,
-                        allContacts,
-                      )
-                }}
-              </div>
               <div>
                 {{ offer.objectDescription }}
               </div>
@@ -200,16 +189,12 @@
     <InfiniteScroll v-if="showProjects" @reached-bottom="loadMoreProjectData">
       <div v-if="projects.length === 0" class="text-center py-4">
         You have not announced any projects.
-        <div v-if="isRegistered">
-          Hit the big
-          <fa
-            icon="plus"
-            class="bg-blue-600 text-white px-1 py-1 rounded-full"
-          />
-          button. You'll never know until you try.
-        </div>
+        <br />
+        Hit the big
+        <fa icon="plus" class="bg-blue-600 text-white px-1 py-1 rounded-full" />
+        button. You'll never know until you try.
       </div>
-      <ul id="listProjects" class="border-t border-slate-300">
+      <ul class="border-t border-slate-300">
         <li
           class="border-b border-slate-300"
           v-for="project in projects"
@@ -244,7 +229,6 @@
 <script lang="ts">
 import { AxiosRequestConfig } from "axios";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
@@ -255,14 +239,11 @@ import QuickNav from "@/components/QuickNav.vue";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import TopMessage from "@/components/TopMessage.vue";
 import {
-  didInfo,
   getHeaders,
-  getPlanFromCache,
   OfferSummaryRecord,
   PlanData,
 } from "@/libs/endorserServer";
 import EntityIcon from "@/components/EntityIcon.vue";
-import { Contact } from "@/db/tables/contacts";
 
 @Component({
   components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
@@ -277,19 +258,16 @@ export default class ProjectsView extends Vue {
   }
 
   activeDid = "";
-  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
   apiServer = "";
   projects: PlanData[] = [];
   isLoading = false;
   isRegistered = false;
+  numAccounts = 0;
   offers: OfferSummaryRecord[] = [];
-  projectNameFromHandleId: Record<string, string> = {}; // mapping from handleId to description
   showOffers = true;
   showProjects = false;
 
   libsUtil = libsUtil;
-  didInfo = didInfo;
 
   async mounted() {
     try {
@@ -299,13 +277,9 @@ export default class ProjectsView extends Vue {
       this.apiServer = (settings?.apiServer as string) || "";
       this.isRegistered = !!settings?.isRegistered;
 
-      this.allContacts = await db.contacts.toArray();
-
       await accountsDB.open();
-      const allAccounts = await accountsDB.accounts.toArray();
-      this.allMyDids = allAccounts.map((acc) => acc.did);
-
-      if (allAccounts.length === 0) {
+      this.numAccounts = await accountsDB.accounts.count();
+      if (this.numAccounts === 0) {
         console.error("No accounts found.");
         this.errNote("You need an identifier to load your projects.");
       } else {
@@ -364,7 +338,10 @@ export default class ProjectsView extends Vue {
   async loadMoreProjectData(payload: boolean) {
     if (this.projects.length > 0 && payload) {
       const latestProject = this.projects[this.projects.length - 1];
-      await this.loadProjects(`beforeId=${latestProject.rowid}`);
+      await this.loadProjects(
+        this.activeDid,
+        `beforeId=${latestProject.rowid}`,
+      );
     }
   }
 
@@ -373,7 +350,7 @@ export default class ProjectsView extends Vue {
    * @param issuerDid of the user
    * @param urlExtra additional url parameters in a string
    **/
-  async loadProjects(urlExtra: string = "") {
+  async loadProjects(activeDid?: string, urlExtra: string = "") {
     const url = `${this.apiServer}/api/v2/report/plansByIssuer?${urlExtra}`;
     await this.projectDataLoader(url);
   }
@@ -387,7 +364,7 @@ export default class ProjectsView extends Vue {
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   /**
@@ -398,14 +375,14 @@ export default class ProjectsView extends Vue {
     const route = {
       name: "new-edit-project",
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   onClickLoadClaim(jwtId: string) {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   /**
@@ -414,37 +391,13 @@ export default class ProjectsView extends Vue {
    * @param token Authorization token
    **/
   async offerDataLoader(url: string) {
-    const headers = await getHeaders(this.activeDid);
+    const headers = getHeaders(this.activeDid);
 
     try {
       this.isLoading = true;
       const resp = await this.axios.get(url, { headers } as AxiosRequestConfig);
       if (resp.status === 200 && resp.data.data) {
-        // add one-by-one as they retrieve project names, potentially from the server
-        for (const offer of resp.data.data) {
-          if (offer.fulfillsPlanHandleId) {
-            const project = await getPlanFromCache(
-              offer.fulfillsPlanHandleId,
-              this.axios,
-              this.apiServer,
-              this.activeDid,
-            );
-            const projectName = project?.name as string;
-            console.log(
-              "now have name for",
-              offer.fulfillsPlanHandleId,
-              projectName,
-            );
-            this.projectNameFromHandleId[offer.fulfillsPlanHandleId] =
-              projectName;
-            console.log(
-              "now have a real name for",
-              offer.fulfillsPlanHandleId,
-              this.projectNameFromHandleId[offer.fulfillsPlanHandleId],
-            );
-          }
-          this.offers = this.offers.concat([offer]);
-        }
+        this.offers = this.offers.concat(resp.data.data);
       } else {
         console.error(
           "Bad server response & data for offers:",
@@ -485,7 +438,7 @@ export default class ProjectsView extends Vue {
   async loadMoreOfferData(payload: boolean) {
     if (this.offers.length > 0 && payload) {
       const latestOffer = this.offers[this.offers.length - 1];
-      await this.loadOffers(`&beforeId=${latestOffer.jwtId}`);
+      await this.loadOffers(this.activeDid, `&beforeId=${latestOffer.jwtId}`);
     }
   }
 
@@ -494,8 +447,8 @@ export default class ProjectsView extends Vue {
    * @param issuerDid of the user
    * @param urlExtra additional url parameters in a string
    **/
-  async loadOffers(urlExtra: string = "") {
-    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${this.activeDid}${urlExtra}`;
+  async loadOffers(issuerDid?: string, urlExtra: string = "") {
+    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${issuerDid}${urlExtra}`;
     await this.offerDataLoader(url);
   }
 

src/views/QuickActionBvcEndView.vue

@@ -139,7 +139,6 @@ import axios from "axios";
 import { DateTime } from "luxon";
 import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
@@ -175,7 +174,7 @@ export default class QuickActionBvcBeginView extends Vue {
   apiServer = "";
   claimCountByUser = 0;
   claimCountWithHidden = 0;
-  claimsToConfirm: GenericCredWrapper<GenericVerifiableCredential>[] = [];
+  claimsToConfirm: GenericCredWrapper[] = [];
   claimsToConfirmSelected: string[] = [];
   description = "breakfast";
   loadingConfirms = true;
@@ -228,8 +227,7 @@ export default class QuickActionBvcBeginView extends Vue {
       }
       await response.json().then((data) => {
         const dataByOthers = R.reject(
-          (claim: GenericCredWrapper<GenericVerifiableCredential>) =>
-            claim.issuer === this.activeDid,
+          (claim: GenericCredWrapper) => claim.issuer === this.activeDid,
           data,
         );
         const dataByOthersWithoutHidden = R.reject(
@@ -260,7 +258,7 @@ export default class QuickActionBvcBeginView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   async record() {

src/views/SearchAreaView.vue

@@ -105,7 +105,6 @@ import {
   LRectangle,
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
@@ -199,7 +198,7 @@ export default class DiscoverView extends Vue {
           },
         };
         await db.open();
-        await db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
           searchBoxes: [newSearchBox],
         });
         this.searchBox = newSearchBox;
@@ -214,7 +213,7 @@ export default class DiscoverView extends Vue {
           },
           7000,
         );
-        (this.$router as Router).back();
+        this.$router.back();
       } catch (err) {
         this.$notify(
           {
@@ -246,7 +245,7 @@ export default class DiscoverView extends Vue {
   public async forgetSearchBox() {
     try {
       await db.open();
-      await db.settings.update(MASTER_SETTINGS_KEY, {
+      db.settings.update(MASTER_SETTINGS_KEY, {
         searchBoxes: [],
         filterFeedByNearby: false,
       });

src/views/SeedBackupView.vue

@@ -33,65 +33,30 @@
       <p class="text-center mb-4">
         <b class="text-red-600">BEWARE!</b> Anyone who has this seed phrase will
         be able impersonate you and take over any digital holdings based on it.
-        Reveal it when you are somewhere private, when only you can see your
-        screen, and record it somewhere only you have access. A password manager
-        is a good idea, and so is a piece of paper in a vault.
-        <i
-          >We recommend you do NOT take a screenshot or send it to any online
-          service.</i
-        >
+        Reveal it when you are somewhere only you can see your screen, and
+        record it somewhere only you have access.
+        <i>Don't take a screenshot or send it to any online service.</i>
       </p>
 
       <p v-if="numAccounts > 1">
         <b class="text-orange-600">Note:</b> You have more than one identifier
         stored in this browser. If they are all based on the same seed as the
-        current identifier, this one backup is sufficient, as long as you also
-        record the derivation path. However, if you have different seeds for
-        other identifiers, you will have to back them up separately.
+        current identifier, this one backup is sufficient; however, if you have
+        different seeds for other identifiers, you will have to back them up
+        separately.
       </p>
 
       <div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
-        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
-          {{ activeAccount.mnemonic }}
-          <button
-            v-show="!showCopiedSeed"
-            @click="
-              doCopyTwoSecRedo(
-                activeAccount.mnemonic as string,
-                () => (showCopiedSeed = !showCopiedSeed),
-              )
-            "
-          >
-            <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-          </button>
-          <span v-show="showCopiedSeed" class="text-sm text-green-500">
-            Copied
-          </span>
-          <br />
-          <br />
-          Derivation Path: {{ activeAccount.derivationPath }}
-          <button
-            v-show="!showCopiedDeri"
-            @click="
-              doCopyTwoSecRedo(
-                activeAccount.derivationPath as string,
-                () => (showCopiedDeri = !showCopiedDeri),
-              )
-            "
-          >
-            <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-          </button>
-          <span v-show="showCopiedDeri" class="text-sm text-green-500"
-            >Copied</span
-          >
-        </p>
         <button
-          v-else
           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-1.5 py-2 rounded-md"
-          @click="showSeed = true"
+          @click="showSeedPhrase"
         >
           Reveal my Seed Phrase
         </button>
+
+        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
+          {{ activeAccount.mnemonic }}
+        </p>
       </div>
     </div>
     <div v-else>You do not have an active identifier.</div>
@@ -99,9 +64,8 @@
 </template>
 
 <script lang="ts">
-import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
+import * as R from "ramda";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
@@ -115,8 +79,6 @@ export default class SeedBackupView extends Vue {
 
   activeAccount: Account | null | undefined = null;
   numAccounts = 0;
-  showCopiedDeri = false;
-  showCopiedSeed = false;
   showSeed = false;
 
   // 'created' hook runs when the Vue instance is first created
@@ -144,12 +106,8 @@ export default class SeedBackupView extends Vue {
     }
   }
 
-  // call fn, copy text to the clipboard, then redo fn after 2 seconds
-  doCopyTwoSecRedo(text: string, fn: () => void) {
-    fn();
-    useClipboard()
-      .copy(text)
-      .then(() => setTimeout(fn, 2000));
+  showSeedPhrase() {
+    this.showSeed = true;
   }
 }
 </script>

src/views/ShareMyContactInfoView.vue

@@ -1,123 +0,0 @@
-<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/SharedPhotoView.vue

@@ -48,17 +48,6 @@
     </div>
     <div v-else class="text-center mb-4">
       <p>No image found.</p>
-      <p class="mt-4">
-        If you shared an image, the cause is usually that you do not have the
-        recent version of this app, or that the app has not refreshed the
-        service code underneath. To fix this, first make sure you have latest
-        version by comparing your version at the bottom of "Help" with the
-        version at the bottom of https://timesafari.app/help in a browser. After
-        that, it may eventually work, but you can speed up the process by
-        clearing your data cache (in the browser on mobile, even if you
-        installed it) and/or reinstalling the app (after backing up all your
-        data, of course).
-      </p>
     </div>
   </section>
 </template>
@@ -66,7 +55,6 @@
 <script lang="ts">
 import axios from "axios";
 import { Component, Vue } from "vue-facing-decorator";
-import { RouteLocationRaw, Router } from "vue-router";
 
 import PhotoDialog from "@/components/PhotoDialog.vue";
 import QuickNav from "@/components/QuickNav.vue";
@@ -77,8 +65,7 @@ import {
 } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import { base64ToBlob, SHARED_PHOTO_BASE64_KEY } from "@/libs/util";
+import { getHeaders } from "@/libs/endorserServer";
 
 @Component({ components: { PhotoDialog, QuickNav } })
 export default class SharedPhotoView extends Vue {
@@ -98,19 +85,14 @@ export default class SharedPhotoView extends Vue {
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       this.activeDid = settings?.activeDid as string;
 
-      const temp = await db.temp.get(SHARED_PHOTO_BASE64_KEY);
-      const imageB64 = temp?.blobB64 as string;
+      const temp = await db.temp.get("shared-photo");
       if (temp) {
-        this.imageBlob = base64ToBlob(imageB64);
+        this.imageBlob = temp.blob;
 
         // clear the temp image
-        db.temp.delete(SHARED_PHOTO_BASE64_KEY);
+        db.temp.delete("shared-photo");
 
-        this.imageFileName = (this.$route as Router).query[
-          "fileName"
-        ] as string;
-      } else {
-        console.error("No appropriate image found in temp storage.", temp);
+        this.imageFileName = this.$route.query.fileName as string;
       }
     } catch (err: unknown) {
       console.error("Got an error loading an identifier:", err);
@@ -129,17 +111,15 @@ export default class SharedPhotoView extends Vue {
   async recordGift() {
     await this.sendToImageServer("GiveAction").then((url) => {
       if (url) {
-        const route = {
+        this.$router.push({
           name: "gifted-details",
-          // this might be wrong since "name" goes with params, but it works so test well when you change it
           query: {
-            destinationPathAfter: "/",
+            destinationNameAfter: "home",
             hideBackButton: true,
             imageUrl: url,
             recipientDid: this.activeDid,
           },
-        } as RouteLocationRaw;
-        (this.$router as Router).push(route);
+        });
       }
     });
   }
@@ -147,10 +127,10 @@ export default class SharedPhotoView extends Vue {
   recordProfile() {
     (this.$refs.photoDialog as PhotoDialog).open(
       async (imgUrl) => {
-        await db.settings.update(MASTER_SETTINGS_KEY, {
+        db.settings.update(MASTER_SETTINGS_KEY, {
           profileImageUrl: imgUrl,
         });
-        (this.$router as Router).push({ name: "account" });
+        this.$router.push({ name: "account" });
       },
       IMAGE_TYPE_PROFILE,
       true,
@@ -162,7 +142,7 @@ export default class SharedPhotoView extends Vue {
   async cancel() {
     this.imageBlob = undefined;
     this.imageFileName = undefined;
-    (this.$router as Router).push({ name: "home" });
+    this.$router.push({ name: "home" });
   }
 
   async sendToImageServer(imageType: string) {
@@ -171,11 +151,7 @@ export default class SharedPhotoView extends Vue {
     let result;
     try {
       // send the image to the server
-      const token = await accessToken(this.activeDid);
-      const headers = {
-        Authorization: "Bearer " + token,
-        // axios fills in Content-Type of multipart/form-data
-      };
+      const headers = await getHeaders(this.activeDid);
       const formData = new FormData();
       formData.append(
         "image",

src/views/StartView.vue

@@ -58,7 +58,6 @@
           <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>
@@ -89,7 +88,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import { AppString, PASSKEYS_ENABLED } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
@@ -115,22 +113,22 @@ export default class StartView extends Vue {
   }
 
   public onClickNewSeed() {
-    (this.$router as Router).push({ name: "new-identifier" });
+    this.$router.push({ name: "new-identifier" });
   }
 
   public async onClickNewPasskey() {
     const keyName =
       AppString.APP_NAME + (this.givenName ? " - " + this.givenName : "");
     await registerSaveAndActivatePasskey(keyName);
-    (this.$router as Router).push({ name: "account" });
+    this.$router.push({ name: "account" });
   }
 
   public onClickNo() {
-    (this.$router as Router).push({ name: "import-account" });
+    this.$router.push({ name: "import-account" });
   }
 
   public onClickDerive() {
-    (this.$router as Router).push({ name: "import-derive" });
+    this.$router.push({ name: "import-derive" });
   }
 }
 </script>

src/views/TestView.vue

@@ -157,7 +157,7 @@
     <div class="mt-8">
       <h2 class="text-xl font-bold mb-4">Image Sharing</h2>
       Populates the "shared-photo" view as if they used "share_target".
-      <input type="file" data-testid="fileInput" @change="uploadFile" />
+      <input type="file" @change="uploadFile" />
       <router-link
         v-if="showFileNextStep()"
         :to="{
@@ -165,7 +165,6 @@
           query: { fileName },
         }"
         class="block w-full 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-1.5 py-2 rounded-md mb-2 mt-2"
-        data-testid="fileUploadButton"
       >
         Go to Shared Page
       </router-link>
@@ -243,7 +242,6 @@ import { Buffer } from "buffer/";
 import { Base64URLString } from "@simplewebauthn/types";
 import { ref } from "vue";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { AppString, NotificationIface } from "@/constants/app";
@@ -256,13 +254,7 @@ import {
   verifyJwtSimplewebauthn,
   verifyJwtWebCrypto,
 } from "@/libs/crypto/vc/passkeyDidPeer";
-import {
-  AccountKeyInfo,
-  blobToBase64,
-  getAccount,
-  registerAndSavePasskey,
-  SHARED_PHOTO_BASE64_KEY,
-} from "@/libs/util";
+import {AccountKeyInfo, getAccount, registerAndSavePasskey} from "@/libs/util";
 
 const inputFileNameRef = ref<Blob>();
 
@@ -323,13 +315,12 @@ export default class Help extends Vue {
           const blob = new Blob([new Uint8Array(data)], {
             type: file.type,
           });
-          const blobB64 = await blobToBase64(blob);
           this.fileName = file.name as string;
-          const temp = await db.temp.get(SHARED_PHOTO_BASE64_KEY);
+          const temp = await db.temp.get("shared-photo");
           if (temp) {
-            await db.temp.update(SHARED_PHOTO_BASE64_KEY, { blobB64 });
+            await db.temp.update("shared-photo", { blob });
           } else {
-            await db.temp.add({ id: SHARED_PHOTO_BASE64_KEY, blobB64 });
+            await db.temp.add({ id: "shared-photo", blob });
           }
         }
       };
@@ -354,7 +345,7 @@ export default class Help extends Vue {
             this.userName = DEFAULT_USERNAME;
           },
           onYes: async () => {
-            (this.$router as Router).push({ name: "new-edit-account" });
+            this.$router.push({ name: "new-edit-account" });
           },
           noText: "try again and use " + DEFAULT_USERNAME,
         },

src/vite-env.d.ts

@@ -1,10 +0,0 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TITLE: string;
-  // more env variables...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}

sw_scripts/safari-notifications.js

@@ -566,27 +566,14 @@ async function getNotificationCount() {
   return result;
 }
 
-async function blobToBase64String(blob) {
-  return new Promise((resolve, reject) => {
-    const reader = new FileReader();
-    reader.onloadend = () => resolve(reader.result); // potential problem if it returns an ArrayBuffer?
-    reader.onerror = reject;
-    reader.readAsDataURL(blob);
-  });
-}
-
 // Store the image blob and go immediate to a page to upload it.
 // @param photo - image Blob to store for later retrieval after redirect
 async function savePhoto(photo) {
   try {
-    const photoBase64 = await blobToBase64String(photo);
     const db = await openIndexedDB("TimeSafari");
     const transaction = db.transaction("temp", "readwrite");
     const store = transaction.objectStore("temp");
-    await updateRecord(store, {
-      id: "shared-photo-base64",
-      blobB64: photoBase64,
-    });
+    await updateRecord(store, { id: "shared-photo", blob: photo });
     transaction.oncomplete = () => db.close();
   } catch (error) {
     console.error("safari-notifications logMessage IndexedDB error", error);

test-playwright/.eslintrc.js

@@ -1,16 +0,0 @@
-module.exports = {
-  root: true,
-  parserOptions: {
-    ecmaVersion: 12,
-    sourceType: 'module',
-    requireConfigFile: false,
-  },
-  plugins: [],
-  rules: {
-    quotes: [
-      'error',
-      'single',
-      { avoidEscape: true, allowTemplateLiterals: true },
-    ],
-  },
-};

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

@@ -1,115 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { generateEthrUser, importUser } from './testUtils';
-
-test('Check activity feed', async ({ page }) => {
-  // Load app homepage
-  await page.goto('./');
-
-  // Check that initial 10 activities have been loaded
-  await page.locator('ul#listLatestActivity li:nth-child(10)');
-
-  // Scroll down a bit to trigger loading additional activities
-  await page.locator('ul#listLatestActivity li:nth-child(50)').scrollIntoViewIfNeeded();
-});
-
-test('Check discover results', async ({ page }) => {
-  // Load Discover view
-  await page.goto('./discover');
-
-  // Check that initial 10 projects have been loaded
-  await page.locator('ul#listDiscoverResults li.border-b:nth-child(10)');
-
-  // Scroll down a bit to trigger loading additional projects
-  await page.locator('ul#listDiscoverResults li.border-b:nth-child(20)').scrollIntoViewIfNeeded();
-});
-
-test('Check no-ID messaging in account', async ({ page }) => {
-  // Load account view
-  await page.goto('./account');
-
-  // Check 'someone must register you' notice
-  await expect(page.locator('#noticeBeforeShare')).toBeVisible();
-
-  // Check 'a friend needs to register you' notice
-  await expect(page.locator('#noticeBeforeAnnounce')).toBeVisible();
-
-  // Check that there is no ID
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toBeEmpty();
-});
-
-test('Check ID generation', async ({ page }) => {
-  // Load Account view
-  await page.goto('./account');
-
-  // Check that ID is empty
-  await expect(page.locator('#sectionIdentityDetails code.truncate')).toBeEmpty();
-
-  // Load homepage to trigger ID generation (?)
-  await page.goto('./');
-
-  // 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/10-check-usage-limits.spec.ts

@@ -1,28 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Check usage limits', async ({ page }) => {
-  // Check without ID first
-  await page.goto('./account');
-  await expect(page.locator('div.bg-slate-100.rounded-md').filter({ hasText: 'Usage Limits' })).toBeHidden();
-
-  // Import user 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

@@ -1,90 +0,0 @@
-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);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
-
-  // 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');
-
-  // 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);
-  await page.getByPlaceholder('Description').fill(finalDescription);
-  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
-  await expect(page.locator('h2')).toContainText(finalTitle);
-  await expect(page.locator('#Content')).toContainText(finalDescription);
-
-  // 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').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').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,45 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser, createUniqueStringsArray } from './testUtils';
-
-test('Create 10 new projects', async ({ page }) => {
-  const projectCount = 10;
-
-  // Standard texts
-  const standardTitle = "Idea ";
-  const standardDescription = "Description of Idea ";
-
-  // Title and description arrays
-  const finalTitles = [];
-  const finalDescriptions = [];
-
-  // Create an array of unique strings
-  const uniqueStrings = await createUniqueStringsArray(projectCount);
-
-  // Populate arrays with titles and descriptions
-  for (let i = 0; i < projectCount; i++) {
-    let loopTitle = standardTitle + uniqueStrings[i];
-    finalTitles.push(loopTitle);
-    let loopDescription = standardDescription + uniqueStrings[i];
-    finalDescriptions.push(loopDescription);
-  }
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Create new projects
-  for (let i = 0; i < projectCount; i++) {
-    await page.goto('./projects');
-    await page.getByRole('link', { name: 'Projects', exact: true }).click();
-    await page.getByRole('button').click();
-    await page.getByPlaceholder('Idea Name').fill(finalTitles[i]); // Add random suffix
-    await page.getByPlaceholder('Description').fill(finalDescriptions[i]);
-    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.getByRole('button', { name: 'Save Project' }).click();
-
-    // Check texts
-    await expect(page.locator('h2')).toContainText(finalTitles[i]);
-    await expect(page.locator('#Content')).toContainText(finalDescriptions[i]);
-  }
-});

test-playwright/30-record-gift.spec.ts

@@ -1,36 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record something given', async ({ page }) => {
-  // Generate a random string of a few characters
-  const randomString = Math.random().toString(36).substring(2, 6);
-
-  // Generate a random non-zero single-digit number
-  const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
-
-  // Standard title prefix
-  const standardTitle = 'Gift ';
-
-  // Combine title prefix with the random string
-  const finalTitle = standardTitle + randomString;
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Record something given
-  await page.goto('./');
-  await page.getByRole('heading', { name: 'Unnamed/Unknown' }).click();
-  await page.getByPlaceholder('What was given').fill(finalTitle);
-  await page.getByRole('spinbutton').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-  const page1Promise = page.waitForEvent('popup');
-  await page.getByRole('link', { name: 'View on the Public Server' }).click();
-  const page1 = await page1Promise;
-});

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

@@ -1,43 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser, createUniqueStringsArray, createRandomNumbersArray  } from './testUtils';
-
-test('Record 10 new gifts', async ({ page }) => {
-  const giftCount = 10;
-
-  // Standard text
-  const standardTitle = "Gift ";
-
-  // Field value arrays
-  const finalTitles = [];
-  const finalNumbers = [];
-
-  // Create arrays for field input
-  const uniqueStrings = await createUniqueStringsArray(giftCount);
-  const randomNumbers = await createRandomNumbersArray(giftCount);
-
-  // Populate array with titles
-  for (let i = 0; i < giftCount; i++) {
-    let loopTitle = standardTitle + uniqueStrings[i];
-    finalTitles.push(loopTitle);
-    let loopNumber = randomNumbers[i];
-    finalNumbers.push(loopNumber);
-  }
-
-  // Import user 00
-  await importUser(page, '00');
-
-  // Record new gifts
-  for (let i = 0; i < giftCount; i++) {
-    // Record something given
-    await page.goto('./');
-    await page.getByRole('heading', { name: 'Unnamed/Unknown' }).click();
-    await page.getByPlaceholder('What was given').fill(finalTitles[i]);
-    await page.getByRole('spinbutton').fill(finalNumbers[i].toString());
-    await page.getByRole('button', { name: 'Sign & Send' }).click();
-    await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-    // Refresh home view and check gift
-    await page.goto('./');
-    await expect(page.locator('li').filter({ hasText: finalTitles[i] })).toBeVisible();
-  }
-});

test-playwright/35-record-gift-from-image-share.spec.ts

@@ -1,69 +0,0 @@
-import path from 'path';
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record item given from image-share', async ({ page }) => {
-
-  let randomString = Math.random().toString(36).substring(2, 8);
-
-  // Combine title prefix with the random string
-  const finalTitle = `Gift ${randomString} from image-share`;
-
-  await importUser(page, '00');
-
-  // Record something given
-  await page.goto('./test');
-
-  const fileChooserPromise = page.waitForEvent('filechooser');
-  await page.getByTestId('fileInput').click();
-  const fileChooser = await fileChooserPromise;
-  await fileChooser.setFiles(path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png'));
-  await page.getByTestId('fileUploadButton').click();
-
-  // on shared photo page, choose the gift option
-  await page.getByRole('button').filter({ hasText: /gift/i }).click();
-
-  await page.getByTestId('imagery').getByRole('img').isVisible();
-  await page.getByPlaceholder('What was received').fill(finalTitle);
-  await page.getByRole('spinbutton').fill('2');
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  const item1 = page.locator('li').filter({ hasText: finalTitle });
-  await expect(item1.getByRole('img')).toBeVisible();
-});
-
-// // I believe there's a way to test this service worker feature.
-// // The following is what I got from ChatGPT. I wonder if it doesn't work because it's not registering the service worker correctly.
-//
-// test('Trigger a photo-sharing fetch event in service worker with POST to /share-target', async ({ page }) => {
-//   await importUser(page, '00');
-//
-//   // Create a FormData object with a photo
-//   const photoPath = path.join(__dirname, '..', 'public', 'img', 'icons', 'android-chrome-192x192.png');
-//   const photoContent = await fs.readFileSync(photoPath);
-//   const [response] = await Promise.all([
-//     page.waitForResponse(response => response.url().includes('/share-target')), // also check for response.status() === 303 ?
-//     page.evaluate(async (photoContent) => {
-//       const formData = new FormData();
-//       formData.append('photo', new Blob([photoContent], { type: 'image/png' }), 'test-photo.jpg');
-//
-//       const response = await fetch('/share-target', {
-//         method: 'POST',
-//         body: formData,
-//       });
-//
-//       return response;
-//     }, photoContent)
-//   ]);
-//
-//   // Verify the response redirected to /shared-photo
-//   //expect(response.status).toBe(303);
-//   console.log('response headers', response.headers());
-//   console.log('response status', response.status());
-//   console.log('response url', response.url());
-//   expect(response.url()).toContain('/shared-photo');
-// });

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

@@ -1,149 +0,0 @@
-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);
-
-  // In case the string is shorter than 16 characters, generate more characters until it is 16 characters long
-  while (randomString.length < 16) {
-    randomString += Math.random().toString(36).substring(2, 18);
-  }
-  const finalRandomString = randomString.substring(0, 16);
-
-  // Generate a random non-zero single-digit number
-  const randomNonZeroNumber = Math.floor(Math.random() * 99) + 1;
-
-  // Standard title prefix
-  const standardTitle = 'Gift ';
-
-  // Combine title prefix with the random string
-  const finalTitle = standardTitle + finalRandomString;
-
-  // Contact name
-  const contactName = 'Contact #111';
-
-  // Import user 01
-  await importUser(page, '01');
-
-  // Add new contact
-  await page.goto('./contacts');
-  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("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');
-
-  // Rename contact
-  await page.locator('li.border-b div div > a[title="See more about this person"]').click();
-  await page.locator('h2 > button > svg.fa-pen').click();
-  await expect(page.locator('div.dialog-overlay > div.dialog').filter({ hasText: 'Edit Name' })).toBeVisible();
-  await page.getByPlaceholder('Name', { exact: true }).fill(contactName);
-  await page.locator('.dialog > .flex > button').first().click();
-
-  // Confirm that home shows contact in "Record Something…"
-  await page.goto('./');
-  await expect(page.locator('#sectionRecordSomethingGiven ul li').filter({ hasText: contactName }).nth(0)).toBeVisible();
-
-  // Record something given by new contact
-  await page.getByRole('heading', { name: contactName }).click();
-  await page.getByPlaceholder('What was given').fill(finalTitle);
-  await page.getByRole('spinbutton').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That gift was recorded.')).toBeVisible();
-
-  // Refresh home view and check gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(finalTitle, { exact: true })).toBeVisible();
-
-  // Switch to user 00
-  await page.goto('./account');
-  await page.getByRole('heading', { name: 'Advanced' }).click();
-  await page.getByRole('link', { name: 'Switch Identifier' }).click();
-  await page.getByRole('link', { name: 'Add Another Identity…' }).click();
-  await page.getByText('You have a seed').click();
-  await page.getByPlaceholder('Seed Phrase').fill('rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage');
-  await page.getByRole('button', { name: 'Import' }).click();
-
-  // Go to home view and look for gift
-  await page.goto('./');
-  await page.locator('li').filter({ hasText: finalTitle }).locator('a').click();
-
-  // Confirm gift as user 00
-  await page.getByTestId('confirmGiftLink').click();
-  await page.getByRole('button', { name: 'Confirm' }).click();
-  await page.getByRole('button', { name: 'Yes' }).click();
-  await expect(page.getByText('Confirmation submitted.')).toBeVisible();
-
-  // Refresh claim page, Confirm button should throw an alert because they already confirmed
-  await page.reload();
-  await page.getByRole('button', { name: 'Confirm' }).click();
-  await expect(page.locator('div[role="alert"]')).toBeVisible();
-});
-
-test('Add contact, copy details, delete, and import various ways', async ({ page, context }) => {
-  await importUser(page, '00');
-
-  // Add new contact
-  await page.goto('./contacts');
-  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(); // 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();
-
-  // Add another new contact
-  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(); // 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);
-
-  //// Copy contact details, export them, remove them, and paste to add them
-
-  // Copy contact details
-  await page.getByTestId('contactCheckAllTop').click();
-  await page.getByTestId('copySelectedContactsButtonTop').click();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss alert
-  // I would prefer to copy from the clipboard, but the recommended approaches don't work.
-  // this seems to fail in non-chromium browsers
-  //await context.grantPermissions(['clipboard-read', 'clipboard-write']);
-  // this seems to fail in chromium (at least) where clipboard is undefined
-  //const contactData = await navigator.clipboard.readText();
-
-  // see contact details on the second contact
-  await page.getByTestId('contactListItem').nth(1).locator('a').click();
-  // remove contact
-  await page.locator('button > svg.fa-trash-can').click();
-  await page.locator('div[role="alert"] button:has-text("Yes")').click();
-  // for some reason, .isHidden() (without expect) doesn't work
-  await expect(page.locator('div[role="alert"] button:has-text("Yes")')).toBeHidden();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss alert
-
-  // go to the contacts page and paste the copied contact details
-  await page.goto('./contacts');
-  // check that there are fewer contacts
-  await expect(page.getByTestId('contactListItem')).toHaveCount(1);
-
-  const contactData = 'Paste this: [{ "did": "did:ethr:0x111d15564f824D56C7a07b913aA7aDd03382aA39", "name": "User #111" }, { "did": "did:ethr:0x222BB77E6Ff3774d34c751f3c1260866357B677b", "name": "User #222", "publicKeyBase64": "asdf1234"}] '
-  await page.getByPlaceholder('URL or DID, Name, Public Key').fill(contactData);
-  await page.locator('button > svg.fa-plus').click();
-  // we're on the contact-import page
-  await expect(page.locator('li', { hasText: 'New' })).toHaveCount(1);
-  await expect(page.locator('span').filter({ hasText: 'the same as' })).toBeVisible();
-  await page.locator('button', { hasText: 'Import' }).click();
-  // check that there are more contacts
-  await expect(page.getByTestId('contactListItem')).toHaveCount(2);
-});

test-playwright/50-record-offer.spec.ts

@@ -1,63 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { importUser } from './testUtils';
-
-test('Record an offer', async ({ page }) => {
-  // Generate a random string of 3 characters, skipping the "0." at the beginning
-  const randomString = Math.random().toString(36).substring(2, 5);
-  // Standard title prefix
-  const description = `Offering of ${randomString}`;
-  const updatedDescription = `Updated ${description}`;
-  const randomNonZeroNumber = Math.floor(Math.random() * 998) + 1;
-
-  // Create new ID for default user
-  await importUser(page);
-
-  // Select a project
-  await page.goto('./discover');
-  await page.locator('ul#listDiscoverResults li:nth-child(1)').click();
-
-  // Record an offer
-  await page.getByTestId('offerButton').click();
-  await page.getByTestId('inputDescription').fill(description);
-  await page.getByTestId('inputOfferAmount').fill(randomNonZeroNumber.toString());
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-  await expect(page.getByText('That offer was recorded.')).toBeVisible();
-
-  // go to the offer and check the values
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
-  await expect(page.getByRole('heading', { name: 'Verifiable Claim Details' })).toBeVisible();
-  await expect(page.getByText(description, { exact: true })).toBeVisible();
-  const serverPagePromise = page.waitForEvent('popup');
-  await page.getByRole('link', { name: 'View on the Public Server' }).click();
-  const serverPage = await serverPagePromise;
-  await serverPage.getByText(description);
-  await serverPage.getByText('did:none:HIDDEN');
-
-  // Now update that offer
-
-  // find the edit page and check the old values again
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
-  await page.getByTestId('editClaimButton').click();
-  await page.locator('heading', { hasText: 'What is offered' }).isVisible();
-  const itemDesc = await page.getByTestId('itemDescription');
-  await expect(itemDesc).toHaveValue(description);
-  const amount = await page.getByTestId('inputOfferAmount');
-  await expect(amount).toHaveValue(randomNonZeroNumber.toString());
-  // update the values
-  await itemDesc.fill(updatedDescription);
-  await amount.fill(String(randomNonZeroNumber + 1));
-  await page.getByRole('button', { name: 'Sign & Send' }).click();
-
-  // go to the offer claim again and check the updated values
-  await page.goto('./projects');
-  await page.locator('li').filter({ hasText: description }).locator('a').first().click();
-  const newItemDesc = await page.getByTestId('description');
-  await expect(newItemDesc).toHaveText(updatedDescription);
-
-  // go to edit page
-  await page.getByTestId('editClaimButton').click();
-  const newAmount = await page.getByTestId('inputOfferAmount');
-  await expect(newAmount).toHaveValue((randomNonZeroNumber + 1).toString());
-});

test-playwright/testUtils.ts

@@ -1,98 +0,0 @@
-import { expect, Page } from '@playwright/test';
-
-// 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
-  switch(id) {
-    case '01':
-      seedPhrase = 'island fever beef wine urban aim vacant quit afford total poem flame service calm better adult neither color gaze forum month sister imitate excite';
-      userName = 'User One';
-      did = 'did:ethr:0x111d15564f824D56C7a07b913aA7aDd03382aA39';
-      break;
-    default: // to user 00
-      seedPhrase = 'rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage';
-      userName = 'User Zero';
-      did = 'did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F';
-  }
-
-  // Import ID
-  await page.goto('./start');
-  await page.getByText('You have a seed').click();
-  await page.getByPlaceholder('Seed Phrase').fill(seedPhrase);
-  await page.getByRole('button', { name: 'Import' }).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;
-}

tsconfig.json

@@ -26,8 +26,8 @@
 		"src/**/*.ts",
 		"src/**/*.tsx",
 		"src/**/*.vue",
-		"test-playwright/**/*.ts",
-		"test-playwright/**/*.tsx"
+		"tests/**/*.ts",
+		"tests/**/*.tsx"
 	],
 	"exclude": [
 		"node_modules"

vite.config.mjs

@@ -16,7 +16,7 @@ export default defineConfig({
       srcDir: '.',
       filename: 'sw_scripts-combined.js',
       manifest: {
-        // This is used for the app name. It doesn't include a space, because iOS complains if I recall correctly.
+        // This is used for the app name. It doesn't include a space, because iOS complains if i recall correctly.
         // There is a name with spaces in the constants/app.js file for use internally.
         name: process.env.TIME_SAFARI_APP_TITLE || require('./package.json').name,
         short_name: process.env.TIME_SAFARI_APP_TITLE || require('./package.json').name,