Merge branch 'master' into kb/add-usage-guide

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

.env.production

@@ -1,5 +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
-VITE_DEFAULT_PARTNER_API_SERVER=https://partner-api.timesafari.app

.eslintrc.js

@@ -14,21 +14,8 @@ module.exports = {
   //   ecmaVersion: 2020,
   // },
   rules: {
-    "max-len": [
-      "warn",
-      {
-        code: 120,
-        ignoreComments: true, // why does this not make it allow comment of any length?
-        ignorePattern: '^\\s*class="[^"]*"$',
-        ignoreStrings: true,
-        ignoreTemplateLiterals: true,
-        ignoreTrailingComments: true,
-        ignoreUrls: true,
-      },
-    ],
     "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
     "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
-    // "prettier/prettier": ["warn", { printWidth: 120 }], // removes errors but adds thousands of warnings
     "@typescript-eslint/no-unnecessary-type-constraint": "off",
   },
 };

.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,90 +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.?]
-### Fixed
-- Error loading BVC claims to confirm
-- Really allow visibility of bulk-imported contacts
-
-
-## [0.3.26] - 2024.09.16 - 8263ed2b29947b3ccc6f3133bbc9454c222bce28
-### Added
-- Separate 'isRegistered' flag for each account
-### Fixed
-- Failure to assign offers to their project
-- Alert when looking at one's own activity if not in contacts.
-
-
-## [0.3.25] - 2024.08.30 - dcbe02d877aecb4cdef2643d90e6595d246a9f82
-### Added
-- "Ideas" now jumps directly to giving prompt or contact list.
-### Fixed
-- Empty giver name on gifted-details view
-- Previously visited project would show up on the giving-details page.
-### Removed
-- All unnecessary localStorage for project IDs
-
-
-## [0.3.23] - 2024.08.30
-### Added
-- Sections in Help for different kinds of users
-- Discovery page parameters so that links with search text work
-- Message when no projects are found
-
-
-## [0.3.21] - 2024.08.24 - a7b89f4bb6da928d56daeffaae7741fa74cc80bf
-### Added
-- Send list of contacts to someone, and move individual contact actions to detail page.
-- 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

@@ -21,8 +21,6 @@ npm install
 npm run dev
 ```
 
-See the test locations for "IMAGE_API_SERVER" or "PARTNER_API_SERVER" below, or use http://localhost:3000 for local endorser.ch
-
 ### Build the test & production app
 ```
 npm run serve
@@ -41,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/01HWE8FWHQ1YGP7GFZYYPS272F VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_DEFAULT_PARTNER_API_SERVER=https://partner-api.endorser.ch VITE_PASSKEYS_ENABLED=true 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 npm run build
 ```
 
   * Production
@@ -60,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`
 
@@ -73,50 +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:
-```
-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
-```
-
-
-To run a single test with the screenshots, use the following:
-```
-npx playwright test test-playwright/40-add-contact.spec.ts --trace on
-```
-
-... with the `-c playwright.config-local.ts` to get the same results as above.
-
-
-
 ### Register new user on test server
 
 On the test server, User #0 has rights to register others, so you can start

docs/README.md

@@ -7,55 +7,45 @@ This uses Pandoc and BasicTex (LaTeX) Installed through Homebrew.
 ### Set Up
 
 ```bash 
+# See https://daniel.feldroy.com/posts/setting-up-latex-on-mac-os-x
 brew install pandoc
 
 brew install basictex
 
+pandoc keystore-migration.md -o keystore-migration.pdf
+
 # 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 titlesec
 sudo tlmgr install framed
-sudo tlmgr install import
-sudo tlmgr install lastpage  # Enables Page X of Y
-sudo tlmgr install mdframed
+sudo tlmgr install threeparttable
+sudo tlmgr install wrapfig
 sudo tlmgr install multirow
-sudo tlmgr install needspace
-sudo tlmgr install ntheorem
+sudo tlmgr install enumitem
+sudo tlmgr install bbding
+sudo tlmgr install titling  # Required for the fancy headers used
 sudo tlmgr install tabu
+sudo tlmgr install mdframed
 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 import
 sudo tlmgr install varwidth
-sudo tlmgr install wrapfig
-
-# Install fonts
-sudo tlmgr install cmbright
+sudo tlmgr install needspace
+sudo tlmgr install tocloft  # Required for \tableofcontents generation
+sudo tlmgr install ntheorem
+sudo tlmgr install environ
+sudo tlmgr install trimspaces
+sudo tlmgr install lastpage  # Enables Page X of Y
 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.

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "TimeSafari",
-  "version": "0.3.27-beta",
+  "version": "0.3.15-beta",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "TimeSafari",
-      "version": "0.3.27-beta",
+      "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",
@@ -46,7 +47,6 @@
         "lru-cache": "^10.2.0",
         "luxon": "^3.4.4",
         "merkletreejs": "^0.3.11",
-        "nostr-tools": "^2.7.2",
         "notiwind": "^2.0.2",
         "papaparse": "^5.4.1",
         "pina": "^0.20.2204228",
@@ -69,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",
@@ -3209,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": [
@@ -3362,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": [
@@ -3499,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": [
@@ -6088,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",
@@ -8679,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"
       }
@@ -10378,6 +10465,10 @@
         "node": ">=14"
       }
     },
+    "node_modules/bech32": {
+      "version": "1.1.4",
+      "license": "MIT"
+    },
     "node_modules/better-opn": {
       "version": "3.0.2",
       "license": "MIT",
@@ -12722,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",
@@ -17368,124 +17477,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/nostr-tools": {
-      "version": "2.7.2",
-      "resolved": "https://registry.npmjs.org/nostr-tools/-/nostr-tools-2.7.2.tgz",
-      "integrity": "sha512-Bq3Ug0SZFtgtL1+0wCnAe8AJtI7yx/00/a2nUug9SkhfOwlKS92Tef12iCK9FdwXw+oFZWMtRnSwcLayQso+xA==",
-      "dependencies": {
-        "@noble/ciphers": "^0.5.1",
-        "@noble/curves": "1.2.0",
-        "@noble/hashes": "1.3.1",
-        "@scure/base": "1.1.1",
-        "@scure/bip32": "1.3.1",
-        "@scure/bip39": "1.2.1"
-      },
-      "optionalDependencies": {
-        "nostr-wasm": "v0.1.0"
-      },
-      "peerDependencies": {
-        "typescript": ">=5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/nostr-tools/node_modules/@noble/ciphers": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@noble/ciphers/-/ciphers-0.5.3.tgz",
-      "integrity": "sha512-B0+6IIHiqEs3BPMT0hcRmHvEj2QHOLu+uwt+tqDDeVd0oyVzh7BPrDcPjRnV1PV/5LaknXJJQvOuRGR0zQJz+w==",
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/nostr-tools/node_modules/@noble/curves": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.2.0.tgz",
-      "integrity": "sha512-oYclrNgRaM9SsBUBVbb8M6DTV7ZHRTKugureoYEncY5c65HOmRzvSiTE3y5CYaPYJA/GVkrhXEoF0M3Ya9PMnw==",
-      "dependencies": {
-        "@noble/hashes": "1.3.2"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/nostr-tools/node_modules/@noble/curves/node_modules/@noble/hashes": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.2.tgz",
-      "integrity": "sha512-MVC8EAQp7MvEcm30KWENFjgR+Mkmf+D189XJTkFIlwohU5hcBbn1ZkKq7KVTi2Hme3PMGF390DaL52beVrIihQ==",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/nostr-tools/node_modules/@noble/hashes": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.3.1.tgz",
-      "integrity": "sha512-EbqwksQwz9xDRGfDST86whPBgM65E0OH/pCgqW0GBVzO22bNE+NuIbeTb714+IfSjU3aRk47EUvXIb5bTsenKA==",
-      "engines": {
-        "node": ">= 16"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/nostr-tools/node_modules/@scure/base": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@scure/base/-/base-1.1.1.tgz",
-      "integrity": "sha512-ZxOhsSyxYwLJj3pLZCefNitxsj093tb2vq90mp2txoYeBqbcjDjqFhyM8eUjq/uFm6zJ+mUuqxlS2FkuSY1MTA==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://paulmillr.com/funding/"
-        }
-      ]
-    },
-    "node_modules/nostr-tools/node_modules/@scure/bip32": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/@scure/bip32/-/bip32-1.3.1.tgz",
-      "integrity": "sha512-osvveYtyzdEVbt3OfwwXFr4P2iVBL5u1Q3q4ONBfDY/UpOuXmOlbgwc1xECEboY8wIays8Yt6onaWMUdUbfl0A==",
-      "dependencies": {
-        "@noble/curves": "~1.1.0",
-        "@noble/hashes": "~1.3.1",
-        "@scure/base": "~1.1.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/nostr-tools/node_modules/@scure/bip32/node_modules/@noble/curves": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@noble/curves/-/curves-1.1.0.tgz",
-      "integrity": "sha512-091oBExgENk/kGj3AZmtBDMpxQPDtxQABR2B9lb1JbVTs6ytdzZNwvhxQ4MWasRNEzlbEH8jCWFCwhF/Obj5AA==",
-      "dependencies": {
-        "@noble/hashes": "1.3.1"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/nostr-tools/node_modules/@scure/bip39": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@scure/bip39/-/bip39-1.2.1.tgz",
-      "integrity": "sha512-Z3/Fsz1yr904dduJD0NpiyRHhRYHdcnyh73FZWiV+/qhWi83wNJ3NWolYqCEN+ZWsUz2TWwajJggcRE9r1zUYg==",
-      "dependencies": {
-        "@noble/hashes": "~1.3.0",
-        "@scure/base": "~1.1.0"
-      },
-      "funding": {
-        "url": "https://paulmillr.com/funding/"
-      }
-    },
-    "node_modules/nostr-wasm": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/nostr-wasm/-/nostr-wasm-0.1.0.tgz",
-      "integrity": "sha512-78BTryCLcLYv96ONU8Ws3Q1JzjlAt+43pWQhIl86xZmWeegYCNLPml7yQ+gG3vR6V5h4XGj+TxO+SS5dsThQIA==",
-      "optional": true
-    },
     "node_modules/notiwind": {
       "version": "2.0.2",
       "license": "MIT",
@@ -18108,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",
@@ -22340,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.27-beta",
+  "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",
@@ -50,7 +49,6 @@
     "lru-cache": "^10.2.0",
     "luxon": "^3.4.4",
     "merkletreejs": "^0.3.11",
-    "nostr-tools": "^2.7.2",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
@@ -73,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,7 @@
                   "
                   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
                 </button>
 
                 <button
@@ -194,7 +192,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
                 </button>
 
                 <label
@@ -376,8 +374,6 @@
 import axios from "axios";
 import { Vue, Component } from "vue-facing-decorator";
 
-import { DEFAULT_PUSH_SERVER, NotificationIface } from "@/constants/app";
-import { retrieveSettingsForActiveAccount } from "@/db/index";
 import * as libsUtil from "@/libs/util";
 
 interface ServiceWorkerMessage {
@@ -407,6 +403,11 @@ interface PushSubscriptionWithTime extends PushSubscriptionJSON {
   notifyTime: { utcHour: number };
 }
 
+import { DEFAULT_PUSH_SERVER, NotificationIface } from "@/constants/app";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { sendTestThroughPushServer } from "@/libs/util";
+
 @Component
 export default class App extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -419,7 +420,8 @@ export default class App extends Vue {
 
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      await db.open();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       let pushUrl = DEFAULT_PUSH_SERVER;
       if (settings?.webPushServer) {
         pushUrl = settings.webPushServer;
@@ -636,7 +638,7 @@ export default class App extends Vue {
             console.log(
               "Subscription data sent to server and all finished successfully.",
             );
-            await libsUtil.sendTestThroughPushServer(subscription, true);
+            await sendTestThroughPushServer(subscription, true);
             this.$notify(
               {
                 group: "alert",

src/components/FeedFilters.vue

@@ -100,7 +100,7 @@ import {
 } from "@vue-leaflet/vue-leaflet";
 
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { db } from "@/db/index";
 
 @Component({
   components: {
@@ -121,10 +121,11 @@ export default class FeedFilters extends Vue {
   async open(onCloseIfChanged: () => void) {
     this.onCloseIfChanged = onCloseIfChanged;
 
-    const settings = await retrieveSettingsForActiveAccount();
-    this.hasVisibleDid = !!settings.filterFeedByVisible;
-    this.isNearby = !!settings.filterFeedByNearby;
-    if (settings.searchBoxes && settings.searchBoxes.length > 0) {
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.hasVisibleDid = !!settings?.filterFeedByVisible;
+    this.isNearby = !!settings?.filterFeedByNearby;
+    if (settings?.searchBoxes && settings.searchBoxes.length > 0) {
       this.hasSearchBox = true;
     }
 
@@ -132,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,
     });
   }
@@ -153,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,
     });
@@ -167,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

@@ -7,7 +7,7 @@
       <input
         type="text"
         class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-        :placeholder="prompt || 'What was given?'"
+        placeholder="What was given"
         v-model="description"
       />
       <div class="flex flex-row justify-center">
@@ -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>
@@ -89,9 +88,14 @@
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
 import { NotificationIface } from "@/constants/app";
-import { createAndSubmitGive, didInfo } from "@/libs/endorserServer";
+import {
+  createAndSubmitGive,
+  didInfo,
+  GiverReceiverInputInfo,
+} from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { Contact } from "@/db/tables/contacts";
 
 @Component
@@ -109,27 +113,25 @@ export default class GiftedDialog extends Vue {
   callbackOnSuccess?: (amount: number) => void = () => {};
   customTitle?: string;
   description = "";
-  giver?: libsUtil.GiverReceiverInputInfo; // undefined means no identified giver agent
+  giver?: GiverReceiverInputInfo; // undefined means no identified giver agent
   isTrade = false;
   offerId = "";
-  prompt = "";
-  receiver?: libsUtil.GiverReceiverInputInfo;
+  receiver?: GiverReceiverInputInfo;
   unitCode = "HUR";
   visible = false;
 
   libsUtil = libsUtil;
 
   async open(
-    giver?: libsUtil.GiverReceiverInputInfo,
-    receiver?: libsUtil.GiverReceiverInputInfo,
+    giver?: GiverReceiverInputInfo,
+    receiver?: GiverReceiverInputInfo,
     offerId?: string,
     customTitle?: string,
-    prompt?: string,
     callbackOnSuccess?: (amount: number) => void,
   ) {
     this.customTitle = customTitle;
+    this.description = "";
     this.giver = giver;
-    this.prompt = prompt || "";
     this.receiver = receiver;
     // if we show "given to user" selection, default checkbox to true
     this.amountInput = "0";
@@ -137,9 +139,10 @@ export default class GiftedDialog extends Vue {
     this.offerId = offerId || "";
 
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.apiServer = settings?.apiServer || "";
+      this.activeDid = settings?.activeDid || "";
 
       this.allContacts = await db.contacts.toArray();
 
@@ -203,7 +206,6 @@ export default class GiftedDialog extends Vue {
     this.description = "";
     this.giver = undefined;
     this.amountInput = "0";
-    this.prompt = "";
     this.unitCode = "HUR";
   }
 
@@ -285,12 +287,13 @@ export default class GiftedDialog extends Vue {
     unitCode: string = "HUR",
   ) {
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
-        this.activeDid,
-        giverDid as string,
-        recipientDid as string,
+        identity,
+        giverDid,
+        this.receiver?.did as string,
         description,
         amount,
         unitCode,

src/components/GiftedPrompts.vue

@@ -19,12 +19,12 @@
         </span>
 
         <div class="m-2">
-          <span v-if="currentCategory === CATEGORY_IDEAS">
+          <span v-if="currentIdeaIndex < IDEAS.length">
             <p class="text-center text-lg font-bold">
               {{ IDEAS[currentIdeaIndex] }}
             </p>
           </span>
-          <div v-if="currentCategory === CATEGORY_CONTACTS">
+          <div v-if="currentIdeaIndex == IDEAS.length + 0">
             <p class="text-center">
               <span
                 v-if="currentContact == null"
@@ -61,7 +61,7 @@
       </span>
       <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 mt-4"
-        @click="proceed"
+        @click="cancel"
       >
         That's it!
       </button>
@@ -71,168 +71,150 @@
 
 <script lang="ts">
 import { Vue, Component } 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 { GiverReceiverInputInfo } from "@/libs/util";
 
 @Component
 export default class GivenPrompts extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  CATEGORY_CONTACTS = 1;
-  CATEGORY_IDEAS = 0;
   IDEAS = [
-    "What food did someone fix for you?",
-    "What did a family member do for you?",
-    "What compliment did someone give you?",
+    "Did anyone fix food for you?",
+    "Did a family member do something for you?",
+    "Did anyone give you a compliment?",
     "Who is someone you can always rely on, and how did they demonstrate that?",
-    "What did you see someone give to someone else?",
-    "What is a way that someone helped you even though you have never met?",
-    "How did a musician or author or artist inspire you?",
+    "Did you see anyone give to someone else?",
+    "Is there someone who you have never met who has helped you somehow?",
+    "How did an artist or musician or author inspire you?",
     "What inspiration did you get from someone who handled tragedy well?",
-    "What is something worth respect that an organization gave you?",
+    "Did some organization give something worth respect?",
     "Who last gave you a good laugh?",
-    "What do you recall someone giving you while you were young?",
-    "Who forgave you or overlooked a mistake?",
-    "What is a way an ancestor contributed to your life?",
-    "What kind of help did someone at work give you?",
+    "Do you recall anything that was given to you while you were young?",
+    "Did someone forgive you or overlook a mistake?",
+    "Do you know of a way an ancestor contributed to your life?",
+    "Did anyone give you help at work?",
     "How did a teacher or mentor or great example help you?",
   ];
+  OTHER_PROMPTS = 1;
+  CONTACT_PROMPT_INDEX = this.IDEAS.length; // expected after other prompts
 
-  callbackOnFullGiftInfo?: (
-    contactInfo?: GiverReceiverInputInfo,
-    description?: string,
-  ) => void;
-  currentCategory = this.CATEGORY_IDEAS; // 0 = IDEAS, 1 = CONTACTS
   currentContact: Contact | undefined = undefined;
   currentIdeaIndex = 0;
   numContacts = 0;
-  shownContactDbIndices: Array<boolean> = [];
+  shownContactDbIndices: number[] = [];
   visible = false;
 
   AppString = AppString;
 
-  async open(
-    callbackOnFullGiftInfo: (
-      contactInfo: GiverReceiverInputInfo,
-      description: string,
-    ) => void,
-  ) {
+  async open() {
     this.visible = true;
-    this.callbackOnFullGiftInfo = callbackOnFullGiftInfo;
 
     await db.open();
     this.numContacts = await db.contacts.count();
-    this.shownContactDbIndices = new Array<boolean>(this.numContacts); // all undefined to start
   }
 
-  cancel() {
-    this.currentCategory = this.CATEGORY_IDEAS;
-    this.currentContact = undefined;
-    this.currentIdeaIndex = 0;
-    this.numContacts = 0;
-    this.shownContactDbIndices = [];
-
+  close() {
+    // close the dialog but don't change values (just in case some actions are added later)
     this.visible = false;
   }
 
-  proceed() {
-    // proceed with logic but don't change values (just in case some actions are added later)
-    this.visible = false;
-    if (this.currentCategory === this.CATEGORY_IDEAS) {
-      (this.$router as Router).push({
-        name: "contact-gift",
-        query: {
-          prompt: this.IDEAS[this.currentIdeaIndex],
-        },
-      });
-    } else {
-      // must be this.CATEGORY_CONTACTS
-      this.callbackOnFullGiftInfo?.(
-        this.currentContact as GiverReceiverInputInfo,
-      );
-    }
-  }
-
   /**
    * Get the next idea.
    * If it is a contact prompt, loop through.
    */
   async nextIdea() {
-    // check if the next one is an idea or a contact
-    if (this.currentCategory === this.CATEGORY_IDEAS) {
-      this.currentIdeaIndex++;
-      if (this.currentIdeaIndex === this.IDEAS.length) {
-        // must have just finished ideas so move to contacts
-        this.findNextUnshownContact();
-      }
-    } else {
-      // must be this.CATEGORY_CONTACTS
+    // if we're incrementing to the contact prompt
+    // or if we're at the contact prompt and there was a previous contact...
+    if (
+      this.currentIdeaIndex == this.CONTACT_PROMPT_INDEX - 1 ||
+      (this.currentIdeaIndex == this.CONTACT_PROMPT_INDEX &&
+        this.shownContactDbIndices.length < this.numContacts)
+    ) {
+      this.currentIdeaIndex = this.CONTACT_PROMPT_INDEX;
       this.findNextUnshownContact();
-      // when that's finished, it'll reset to ideas
+    } else {
+      // we're not at the contact prompt (or we ran out), so increment the idea index
+      this.currentIdeaIndex =
+        (this.currentIdeaIndex + 1) % (this.IDEAS.length + this.OTHER_PROMPTS);
+      // ... and clear out any other prompt info
+      this.currentContact = undefined;
+      this.shownContactDbIndices = [];
     }
   }
 
-  /**
-   * Get the previous idea.
-   * If it is a contact prompt, loop through.
-   */
-  async prevIdea() {
-    // check if the next one is an idea or a contact
-    if (this.currentCategory === this.CATEGORY_IDEAS) {
+  prevIdea() {
+    if (
+      this.currentIdeaIndex ==
+        (this.CONTACT_PROMPT_INDEX + 1) %
+          (this.IDEAS.length + this.OTHER_PROMPTS) ||
+      (this.currentIdeaIndex == this.CONTACT_PROMPT_INDEX &&
+        this.shownContactDbIndices.length < this.numContacts)
+    ) {
+      this.currentIdeaIndex = this.CONTACT_PROMPT_INDEX;
+      this.findNextUnshownContact();
+    } else {
+      // we're not at the contact prompt (or we ran out), so increment the idea index
       this.currentIdeaIndex--;
       if (this.currentIdeaIndex < 0) {
-        // must have just finished ideas so move to contacts
-        this.findNextUnshownContact();
+        this.currentIdeaIndex = this.IDEAS.length - 1 + this.OTHER_PROMPTS;
       }
-    } else {
-      // must be this.CATEGORY_CONTACTS
-      this.findNextUnshownContact();
-      // when that's finished, it'll reset to ideas
+      // ... and clear out any other prompt info
+      this.currentContact = undefined;
+      this.shownContactDbIndices = [];
     }
   }
 
   nextIdeaPastContacts() {
+    this.currentIdeaIndex = 0;
     this.currentContact = undefined;
-    this.shownContactDbIndices = new Array<boolean>(this.numContacts);
-
-    this.currentCategory = this.CATEGORY_IDEAS;
-    // look at the previous idea and switch to the other side of the list
-    this.currentIdeaIndex =
-      this.currentIdeaIndex >= this.IDEAS.length ? 0 : this.IDEAS.length - 1;
+    this.shownContactDbIndices = [];
   }
 
   async findNextUnshownContact() {
-    if (this.currentCategory === this.CATEGORY_IDEAS) {
-      // we're not in the contact prompts, so reset index array
-      this.shownContactDbIndices = new Array<boolean>(this.numContacts);
-    }
-    this.currentCategory = this.CATEGORY_CONTACTS;
-
-    let someContactDbIndex = Math.floor(Math.random() * this.numContacts);
-    let count = 0;
-    // as long as the index has an entry, loop
-    while (
-      this.shownContactDbIndices[someContactDbIndex] != null &&
-      count++ < this.numContacts
-    ) {
-      someContactDbIndex = (someContactDbIndex + 1) % this.numContacts;
-    }
-    if (count >= this.numContacts) {
-      // all contacts have been shown
-      this.nextIdeaPastContacts();
+    // get a random contact
+    if (this.shownContactDbIndices.length === this.numContacts) {
+      // no more contacts to show
+      this.currentContact = undefined;
     } else {
+      // get a random contact that hasn't been shown yet
+      let someContactDbIndex = Math.floor(Math.random() * this.numContacts);
+      // and guarantee that one is found by walking past shown contacts
+      let shownContactIndex =
+        this.shownContactDbIndices.indexOf(someContactDbIndex);
+      while (shownContactIndex !== -1) {
+        // increment both indices until we find a spot where "shown" skips a spot
+        shownContactIndex = (shownContactIndex + 1) % this.numContacts;
+        someContactDbIndex = (someContactDbIndex + 1) % this.numContacts;
+        if (
+          this.shownContactDbIndices[shownContactIndex] !== someContactDbIndex
+        ) {
+          // we found a contact that hasn't been shown yet
+          break;
+        }
+        // continue
+        // ... and there must be at least one because shownContactDbIndices length < numContacts
+      }
+      this.shownContactDbIndices.push(someContactDbIndex);
+      this.shownContactDbIndices.sort();
+
       // get the contact at that offset
       await db.open();
       this.currentContact = await db.contacts
         .offset(someContactDbIndex)
         .first();
-      this.shownContactDbIndices[someContactDbIndex] = true;
     }
   }
+
+  cancel() {
+    this.currentContact = undefined;
+    this.currentIdeaIndex = 0;
+    this.numContacts = 0;
+    this.shownContactDbIndices = [];
+
+    this.close();
+  }
 }
 </script>
 

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,9 +4,8 @@
       <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 of what is offered"
+        placeholder="Description, prerequisites, terms, etc."
         v-model="description"
       />
       <div class="flex flex-row mt-2">
@@ -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,19 +69,20 @@
 </template>
 
 <script lang="ts">
+import { DateTime } from "luxon";
 import { Vue, Component, Prop } from "vue-facing-decorator";
 
 import { NotificationIface } from "@/constants/app";
 import { createAndSubmitOffer } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
-import { retrieveSettingsForActiveAccount } from "@/db/index";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
 @Component
 export default class OfferDialog extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  @Prop projectId?;
-  @Prop projectName?;
+  @Prop projectId? = "";
 
   activeDid = "";
   apiServer = "";
@@ -102,19 +92,18 @@ 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;
 
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.apiServer = settings?.apiServer || "";
+      this.activeDid = settings?.activeDid || "";
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
@@ -155,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();
@@ -228,14 +223,14 @@ export default class OfferDialog extends Vue {
     }
 
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const result = await createAndSubmitOffer(
         this.axios,
         this.apiServer,
-        this.activeDid,
+        identity,
         description,
         amount,
         unitCode,
-        "",
         expirationDateInput,
         this.recipientDid,
         this.projectId,

src/components/PhotoDialog.vue

@@ -76,8 +76,7 @@
       </div>
       <div v-else ref="cameraContainer">
         <!--
-          Camera "resolution" doesn't change how it shows on screen but rather stretches the result,
-          eg. the following which just stretches it vertically:
+          Camera "resolution" doesn't change how it shows on screen but rather stretches the result, eg the following which just stretches it vertically:
           :resolution="{ width: 375, height: 812 }"
         -->
         <camera
@@ -127,7 +126,9 @@ import { Component, Vue } from "vue-facing-decorator";
 import VuePictureCropper, { cropper } from "vue-picture-cropper";
 
 import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
-import { retrieveSettingsForActiveAccount } from "@/db/index";
+import { getIdentity } from "@/libs/util";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 
 @Component({ components: { Camera, VuePictureCropper } })
@@ -151,8 +152,9 @@ export default class PhotoDialog extends Vue {
 
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.activeDid = settings.activeDid || "";
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.activeDid = settings?.activeDid || "";
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
       console.error("Error retrieving settings from database:", err);
@@ -346,10 +348,10 @@ export default class PhotoDialog extends Vue {
       this.blob = (await cropper?.getBlob()) || undefined;
     }
 
-    const token = await accessToken(this.activeDid);
+    const identifier = await getIdentity(this.activeDid);
+    const token = await accessToken(identifier);
     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,22 +1,13 @@
 <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">
 import { Component, Vue, Prop } from "vue-facing-decorator";
 
 import { AppString, NotificationIface } from "@/constants/app";
-import { retrieveSettingsForActiveAccount } from "@/db/index";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 @Component
 export default class TopMessage extends Vue {
@@ -28,15 +19,17 @@ export default class TopMessage extends Vue {
 
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
+      await db.open();
+
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       if (
-        settings.warnIfTestServer &&
+        settings?.warnIfTestServer &&
         settings.apiServer !== AppString.PROD_ENDORSER_API_SERVER
       ) {
         const didPrefix = settings.activeDid?.slice(11, 15);
         this.message = "You're linked to a non-prod server, user " + didPrefix;
       } else if (
-        settings.warnIfProdServer &&
+        settings?.warnIfProdServer &&
         settings.apiServer === AppString.PROD_ENDORSER_API_SERVER
       ) {
         const didPrefix = settings.activeDid?.slice(11, 15);

src/components/UserNameDialog.vue

@@ -1,95 +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, retrieveSettingsForActiveAccount } from "@/db/index";
-import { MASTER_SETTINGS_KEY } 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;
-    const settings = await retrieveSettingsForActiveAccount();
-    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/components/World/components/objects/landmarks.js

@@ -1,10 +1,12 @@
 import axios from "axios";
+import * as R from "ramda";
 import * as THREE from "three";
 import { GLTFLoader } from "three/addons/loaders/GLTFLoader";
 import * as SkeletonUtils from "three/addons/utils/SkeletonUtils";
 import * as TWEEN from "@tweenjs/tween.js";
-import { retrieveSettingsForActiveAccount } from "@/db";
-import { getHeaders } from "@/libs/endorserServer";
+import { accountsDB, db } from "@/db";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 
 const ANIMATION_DURATION_SECS = 10;
 const ENDORSER_ENTITY_PREFIX = "https://endorser.ch/entity/";
@@ -13,10 +15,21 @@ export async function loadLandmarks(vue, world, scene, loop) {
   vue.setWorldProperty("animationDurationSeconds", ANIMATION_DURATION_SECS);
 
   try {
-    const settings = await retrieveSettingsForActiveAccount();
-    const activeDid = settings.activeDid || "";
-    const apiServer = settings.apiServer;
-    const headers = await getHeaders(activeDid);
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    const activeDid = settings?.activeDid || "";
+    const apiServer = settings?.apiServer;
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    const account = R.find((acc) => acc.did === activeDid, accounts);
+    const headers = {
+      "Content-Type": "application/json",
+    };
+    const identity = JSON.parse(account?.identity || "null");
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
 
     const url = apiServer + "/api/v2/report/claims?claimType=GiveAction";
     const resp = await axios.get(url, { headers: headers });

src/constants/app.ts

@@ -4,26 +4,18 @@
  * See also ../libs/veramo/setup.ts
  */
 export enum AppString {
-  // This is used in titles and verbiage inside the app.
-  // There is also an app name without spaces, for packaging in the package.json file used in the manifest.
-  APP_NAME = "Time Safari",
-
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
   TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
   LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",
 
-  PROD_IMAGE_API_SERVER = "https://image-api.timesafari.app",
-  TEST_IMAGE_API_SERVER = "https://test-image-api.timesafari.app",
-  LOCAL_IMAGE_API_SERVER = "http://localhost:3001",
-
-  PROD_PARTNER_API_SERVER = "https://endorser.ch",
-  TEST_PARTNER_API_SERVER = "https://test-partner.endorser.ch",
-  LOCAL_PARTNER_API_SERVER = LOCAL_ENDORSER_API_SERVER,
-
   PROD_PUSH_SERVER = "https://timesafari.app",
   TEST1_PUSH_SERVER = "https://test.timesafari.app",
   TEST2_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
 
+  PROD_IMAGE_API_SERVER = "https://image-api.timesafari.app",
+  TEST_IMAGE_API_SERVER = "https://test-image-api.timesafari.app",
+  LOCAL_IMAGE_API_SERVER = "http://localhost:3001",
+
   NO_CONTACT_NAME = "(no name)",
 }
 
@@ -35,18 +27,11 @@ export const DEFAULT_IMAGE_API_SERVER =
   import.meta.env.VITE_DEFAULT_IMAGE_API_SERVER ||
   AppString.TEST_IMAGE_API_SERVER;
 
-export const DEFAULT_PARTNER_API_SERVER =
-  import.meta.env.VITE_DEFAULT_PARTNER_API_SERVER ||
-  AppString.TEST_PARTNER_API_SERVER;
-
 export const DEFAULT_PUSH_SERVER =
   window.location.protocol + "//" + window.location.host;
 
 export const IMAGE_TYPE_PROFILE = "profile";
 
-export const PASSKEYS_ENABLED =
-  !!import.meta.env.VITE_PASSKEYS_ENABLED || false;
-
 /**
  * The possible values for "group" and "type" are in App.vue.
  * From the notiwind package
@@ -56,10 +41,8 @@ export interface NotificationIface {
   type: string; // "toast" | "info" | "success" | "warning" | "danger"
   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

@@ -1,7 +1,5 @@
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
-import * as R from "ramda";
-
 import { Account, AccountsSchema } from "./tables/accounts";
 import { Contact, ContactSchema } from "./tables/contacts";
 import { Log, LogSchema } from "./tables/logs";
@@ -47,87 +45,15 @@ accountsDB.version(1).stores(AccountsSchema);
 db.version(2).stores({
   ...ContactSchema,
   ...LogSchema,
-  ...{ settings: "id" }, // old Settings schema
+  ...SettingsSchema,
 });
 // v3 added Temp
 db.version(3).stores(TempSchema);
-db.version(4)
-  .stores(SettingsSchema)
-  .upgrade((tx) => {
-    return tx
-      .table("settings")
-      .toCollection()
-      .modify((settings) => {
-        settings.accountDid = ""; // make it non-null for the default master settings, but still indexable
-      });
-  });
-
-const DEFAULT_SETTINGS = {
-  id: MASTER_SETTINGS_KEY,
-  activeDid: undefined,
-  apiServer: DEFAULT_ENDORSER_API_SERVER,
-};
 
 // Event handler to initialize the non-sensitive database with default settings
-db.on("populate", async () => {
-  await db.settings.add(DEFAULT_SETTINGS);
+db.on("populate", () => {
+  db.settings.add({
+    id: MASTER_SETTINGS_KEY,
+    apiServer: DEFAULT_ENDORSER_API_SERVER,
+  });
 });
-
-// retrieves default settings
-// calls db.open()
-export async function retrieveSettingsForDefaultAccount(): Promise<Settings> {
-  await db.open();
-  return (await db.settings.get(MASTER_SETTINGS_KEY)) || DEFAULT_SETTINGS;
-}
-
-export async function retrieveSettingsForActiveAccount(): Promise<Settings> {
-  const defaultSettings = await retrieveSettingsForDefaultAccount();
-  if (!defaultSettings.activeDid) {
-    return defaultSettings;
-  } else {
-    const overrideSettings =
-      (await db.settings
-        .where("accountDid")
-        .equals(defaultSettings.activeDid)
-        .first()) || {};
-    return R.mergeDeepRight(defaultSettings, overrideSettings);
-  }
-}
-
-// Update settings for the given account, or in MASTER_SETTINGS_KEY if no accountDid is provided.
-// Don't expose this because we should be explicit on whether we're updating the default settings or account settings.
-async function updateSettings(settingsChanges: Settings): Promise<void> {
-  await db.open();
-  if (!settingsChanges.accountDid) {
-    // ensure there is no "id" that would override the key
-    delete settingsChanges.id;
-    await db.settings.update(MASTER_SETTINGS_KEY, settingsChanges);
-  } else {
-    const result = await db.settings
-      .where("accountDid")
-      .equals(settingsChanges.accountDid)
-      .modify(settingsChanges);
-    if (result === 0) {
-      if (!settingsChanges.id) {
-        // It is unfortunate that we have to set this explicitly.
-        // We didn't make id a "++id" at the beginning and Dexie won't let us change it,
-        // plus we made our first settings objects MASTER_SETTINGS_KEY = 1 instead of 0
-        settingsChanges.id = (await db.settings.count()) + 1;
-      }
-      await db.settings.add(settingsChanges);
-    }
-  }
-}
-
-export async function updateDefaultSettings(settings: Settings): Promise<void> {
-  delete settings.accountDid; // just in case
-  await updateSettings(settings);
-}
-
-export async function updateAccountSettings(
-  accountDid: string,
-  settings: Settings,
-): Promise<void> {
-  settings.accountDid = accountDid;
-  await updateSettings(settings);
-}

src/db/tables/README.md

@@ -1 +0,0 @@
-Check the contact & settings export to see whether you want your new table to be included in it.

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/settings.ts

@@ -12,28 +12,21 @@ export type BoundingBox = {
  * Settings type encompasses user-specific configuration details.
  */
 export type Settings = {
-  // default entry is keyed with MASTER_SETTINGS_KEY; other entries are linked to an account with account ID
-  id?: number; // this is only blank on input, when the database assigns it
-
-  // if supplied, this settings record overrides the master record when the user switches to this account
-  accountDid?: string; // not used in the MASTER_SETTINGS_KEY entry
-  // active Decentralized ID
-  activeDid?: string; // only used in the MASTER_SETTINGS_KEY entry
+  id: number; // Only one entry, keyed with MASTER_SETTINGS_KEY
 
+  activeDid?: string; // Active Decentralized ID
   apiServer?: string; // API server URL
 
   filterFeedByNearby?: boolean; // filter by nearby
   filterFeedByVisible?: boolean; // filter by visible users ie. anyone not hidden
 
-  firstName?: string; // user's full name, may be null if unwanted for a particular account
+  firstName?: string; // user's full name
   hideRegisterPromptOnNewContact?: boolean;
   isRegistered?: boolean;
-  imageServer?: string;
   lastName?: string; // deprecated - put all names in firstName
   lastNotifiedClaimId?: string;
   lastViewedClaimId?: string;
-  passkeyExpirationMinutes?: number; // passkey access token time-to-live in minutes
-  profileImageUrl?: string; // may be null if unwanted for a particular account
+  profileImageUrl?: string;
   reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
   reminderOn?: boolean; // Toggle to enable or disable reminders
 
@@ -44,7 +37,6 @@ export type Settings = {
   }>;
 
   showContactGivesInline?: boolean; // Display contact inline or not
-  showGeneralAdvanced?: boolean; // Show advanced features which don't have their own flag
   showShortcutBvc?: boolean; // Show shortcut for Bountiful Voluntaryist Community actions
   vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
   warnIfProdServer?: boolean; // Warn if using a production server
@@ -53,19 +45,17 @@ export type Settings = {
 };
 
 export function isAnyFeedFilterOn(settings: Settings): boolean {
-  return !!(settings?.filterFeedByNearby || settings?.filterFeedByVisible);
+  return !!(settings.filterFeedByNearby || settings.filterFeedByVisible);
 }
 
 /**
  * Schema for the Settings table in the database.
  */
 export const SettingsSchema = {
-  settings: "id, &accountDid",
+  settings: "id",
 };
 
 /**
  * Constants.
  */
 export const MASTER_SETTINGS_KEY = 1;
-
-export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;

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/index.ts

@@ -3,13 +3,11 @@ import { getRandomBytesSync } from "ethereum-cryptography/random";
 import { entropyToMnemonic } from "ethereum-cryptography/bip39";
 import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
 import { HDNode } from "@ethersproject/hdnode";
+import * as didJwt from "did-jwt";
+import * as u8a from "uint8arrays";
 
-import {
-  createEndorserJwtForDid,
-  ENDORSER_JWT_URL_LOCATION,
-} from "@/libs/endorserServer";
+import { ENDORSER_JWT_URL_LOCATION } from "@/libs/endorserServer";
 import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
-import { decodeEndorserJwt } from "@/libs/crypto/vc";
 
 export const DEFAULT_ROOT_DERIVATION_PATH = "m/84737769'/0'/0'/0'";
 
@@ -85,21 +83,82 @@ export const generateSeed = (): string => {
 };
 
 /**
- * Retrieve an access token, or "" if no DID is provided.
+ * Retreive an access token
  *
+ * @param {IIdentifier} identifier
  * @return {*}
  */
-export const accessToken = async (did?: string) => {
-  if (did) {
-    const nowEpoch = Math.floor(Date.now() / 1000);
-    const endEpoch = nowEpoch + 60; // add one minute
-    const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
-    return createEndorserJwtForDid(did, tokenPayload);
-  } else {
-    return "";
-  }
+export const accessToken = async (identifier: IIdentifier) => {
+  const did: string = identifier.did;
+  const privateKeyHex: string = identifier.keys[0].privateKeyHex as string;
+
+  const signer = SimpleSigner(privateKeyHex);
+
+  const nowEpoch = Math.floor(Date.now() / 1000);
+  const endEpoch = nowEpoch + 60; // add one minute
+
+  const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
+  const alg = undefined; // defaults to 'ES256K', more standardized but harder to verify vs ES256K-R
+  const jwt: string = await didJwt.createJWT(tokenPayload, {
+    alg,
+    issuer: did,
+    signer,
+  });
+  return jwt;
 };
 
+export const sign = async (privateKeyHex: string) => {
+  const signer = SimpleSigner(privateKeyHex);
+
+  return signer;
+};
+
+/**
+ *  Copied out of did-jwt since it's deprecated in that library.
+ *
+ *  The SimpleSigner returns a configured function for signing data.
+ *
+ *  @example
+ *  const signer = SimpleSigner(import.meta.env.PRIVATE_KEY)
+ *  signer(data, (err, signature) => {
+ *    ...
+ *  })
+ *
+ *  @param    {String}         hexPrivateKey    a hex encoded private key
+ *  @return   {Function}                     a configured signer function
+ */
+export function SimpleSigner(hexPrivateKey: string): didJwt.Signer {
+  const signer = didJwt.ES256KSigner(didJwt.hexToBytes(hexPrivateKey), true);
+  return async (data) => {
+    const signature = (await signer(data)) as string;
+    return fromJose(signature);
+  };
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function fromJose(signature: string): {
+  r: string;
+  s: string;
+  recoveryParam?: number;
+} {
+  const signatureBytes: Uint8Array = didJwt.base64ToBytes(signature);
+  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
+    throw new TypeError(
+      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
+    );
+  }
+  const r = bytesToHex(signatureBytes.slice(0, 32));
+  const s = bytesToHex(signatureBytes.slice(32, 64));
+  const recoveryParam =
+    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
+  return { r, s, recoveryParam };
+}
+
+// from did-jwt/util; see SimpleSigner above
+export function bytesToHex(b: Uint8Array): string {
+  return u8a.toString(b, "base16");
+}
+
 /**
  @return results of uportJwtPayload:
  { iat: number, iss: string (DID), own: { name, publicEncKey (base64-encoded key) } }
@@ -116,7 +175,7 @@ export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
   }
 
   // JWT format: { header, payload, signature, data }
-  const jwt = decodeEndorserJwt(jwtText);
+  const jwt = didJwt.decodeJWT(jwtText);
 
   return jwt.payload;
 };

src/libs/crypto/passkeyHelpers.ts

@@ -55,8 +55,8 @@ export function isoUint8ArrayConcat(arrays: Uint8Array[]): Uint8Array {
 }
 
 // from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoCrypto/getWebCrypto.ts
-let webCrypto: { subtle: SubtleCrypto } | undefined = undefined;
-export function getWebCrypto(): Promise<{ subtle: SubtleCrypto }> {
+let webCrypto: unknown = undefined;
+export function getWebCrypto() {
   /**
    * Hello there! If you came here wondering why this method is asynchronous when use of
    * `globalThis.crypto` is not, it's to minimize a bunch of refactor related to making this
@@ -67,28 +67,25 @@ export function getWebCrypto(): Promise<{ subtle: SubtleCrypto }> {
    * TODO: If it's after February 2025 when you read this then consider whether it still makes sense
    * to keep this method asynchronous.
    */
-  const toResolve: Promise<{ subtle: SubtleCrypto }> = new Promise(
-    (resolve, reject) => {
-      if (webCrypto) {
-        return resolve(webCrypto);
-      }
-      /**
-       * Naively attempt to access Crypto as a global object, which popular ESM-centric run-times
-       * support (and Node v20+)
-       */
-      const _globalThisCrypto =
-        _getWebCryptoInternals.stubThisGlobalThisCrypto();
-      if (_globalThisCrypto) {
-        webCrypto = _globalThisCrypto;
-        return resolve(webCrypto);
-      }
-      // We tried to access it both in Node and globally, so bail out
-      return reject(new MissingWebCrypto());
-    },
-  );
+  const toResolve = new Promise((resolve, reject) => {
+    if (webCrypto) {
+      return resolve(webCrypto);
+    }
+    /**
+     * Naively attempt to access Crypto as a global object, which popular ESM-centric run-times
+     * support (and Node v20+)
+     */
+    const _globalThisCrypto = _getWebCryptoInternals.stubThisGlobalThisCrypto();
+    if (_globalThisCrypto) {
+      webCrypto = _globalThisCrypto;
+      return resolve(webCrypto);
+    }
+    // We tried to access it both in Node and globally, so bail out
+    return reject(new MissingWebCrypto());
+  });
   return toResolve;
 }
-class MissingWebCrypto extends Error {
+export class MissingWebCrypto extends Error {
   constructor() {
     const message = "An instance of the Crypto API could not be located";
     super(message);
@@ -96,10 +93,10 @@ class MissingWebCrypto extends Error {
   }
 }
 // Make it possible to stub return values during testing
-const _getWebCryptoInternals = {
+export const _getWebCryptoInternals = {
   stubThisGlobalThisCrypto: () => globalThis.crypto,
   // Make it possible to reset the `webCrypto` at the top of the file
-  setCachedCrypto: (newCrypto: { subtle: SubtleCrypto }) => {
+  setCachedCrypto: (newCrypto: unknown) => {
     webCrypto = newCrypto;
   },
-};
+};

src/libs/crypto/vc/didPeer.ts

@@ -1,96 +0,0 @@
-import { Buffer } from "buffer/";
-import { decode as cborDecode } from "cbor-x";
-import { bytesToMultibase, multibaseToBytes } from "did-jwt";
-
-import { getWebCrypto } from "@/libs/crypto/vc/passkeyHelpers";
-
-export const PEER_DID_PREFIX = "did:peer:";
-const PEER_DID_MULTIBASE_PREFIX = PEER_DID_PREFIX + "0";
-
-/**
- *
- *
- * similar code is in crowd-funder-for-time-pwa libs/crypto/vc/passkeyDidPeer.ts verifyJwtWebCrypto
- *
- * @returns {Promise<boolean>}
- */
-export async function verifyPeerSignature(
-  payloadBytes: Buffer,
-  issuerDid: string,
-  signatureBytes: Uint8Array,
-): Promise<boolean> {
-  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
-
-  const WebCrypto = await getWebCrypto();
-  const verifyAlgorithm = {
-    name: "ECDSA",
-    hash: { name: "SHA-256" },
-  };
-  const publicKeyJwk = cborToKeys(publicKeyBytes).publicKeyJwk;
-  const keyAlgorithm = {
-    name: "ECDSA",
-    namedCurve: publicKeyJwk.crv,
-  };
-  const publicKeyCryptoKey = await WebCrypto.subtle.importKey(
-    "jwk",
-    publicKeyJwk,
-    keyAlgorithm,
-    false,
-    ["verify"],
-  );
-  const verified = await WebCrypto.subtle.verify(
-    verifyAlgorithm,
-    publicKeyCryptoKey,
-    signatureBytes,
-    payloadBytes,
-  );
-  return verified;
-}
-
-export function cborToKeys(publicKeyBytes: Uint8Array) {
-  const jwkObj = cborDecode(publicKeyBytes);
-  if (
-    jwkObj[1] != 2 || // kty "EC"
-    jwkObj[3] != -7 || // alg "ES256"
-    jwkObj[-1] != 1 || // crv "P-256"
-    jwkObj[-2].length != 32 || // x
-    jwkObj[-3].length != 32 // y
-  ) {
-    throw new Error("Unable to extract key.");
-  }
-  const publicKeyJwk = {
-    alg: "ES256",
-    crv: "P-256",
-    kty: "EC",
-    x: arrayToBase64Url(jwkObj[-2]),
-    y: arrayToBase64Url(jwkObj[-3]),
-  };
-  const publicKeyBuffer = Buffer.concat([
-    Buffer.from(jwkObj[-2]),
-    Buffer.from(jwkObj[-3]),
-  ]);
-  return { publicKeyJwk, publicKeyBuffer };
-}
-
-export function toBase64Url(anythingB64: string) {
-  return anythingB64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
-}
-
-export function arrayToBase64Url(anything: Uint8Array) {
-  return toBase64Url(Buffer.from(anything).toString("base64"));
-}
-
-export function peerDidToPublicKeyBytes(did: string) {
-  return multibaseToBytes(did.substring(PEER_DID_MULTIBASE_PREFIX.length));
-}
-
-export function createPeerDid(publicKeyBytes: Uint8Array) {
-  // https://github.com/decentralized-identity/veramo/blob/next/packages/did-provider-peer/src/peer-did-provider.ts#L67
-  //const provider = new PeerDIDProvider({ defaultKms: LOCAL_KMS_NAME });
-  const methodSpecificId = bytesToMultibase(
-    publicKeyBytes,
-    "base58btc",
-    "p256-pub",
-  );
-  return PEER_DID_MULTIBASE_PREFIX + methodSpecificId;
-}

src/libs/crypto/vc/index.ts

@@ -1,112 +0,0 @@
-/**
- * Verifiable Credential & DID functions, specifically for EndorserSearch.org tools
- *
- * The goal is to make this folder similar across projects, then move it to a library.
- * Other projects: endorser-ch, image-api
- *
- */
-
-import * as didJwt from "did-jwt";
-import { JWTDecoded } from "did-jwt/lib/JWT";
-import { IIdentifier } from "@veramo/core";
-import * as u8a from "uint8arrays";
-
-import { createDidPeerJwt } from "@/libs/crypto/vc/passkeyDidPeer";
-
-export const ETHR_DID_PREFIX = "did:ethr:";
-
-/**
- * Meta info about a key
- */
-export interface KeyMeta {
-  /**
-   * Decentralized ID for the key
-   */
-  did: string;
-  /**
-   * Stringified IIDentifier object from Veramo
-   */
-  identity?: string;
-  /**
-   * The Webauthn credential ID in hex, if this is from a passkey
-   */
-  passkeyCredIdHex?: string;
-}
-
-/**
- * Tell whether a key is from a passkey
- * @param keyMeta contains info about the key, whose passkeyCredIdHex determines if the key is from a passkey
- */
-export function isFromPasskey(keyMeta?: KeyMeta): boolean {
-  return !!keyMeta?.passkeyCredIdHex;
-}
-
-export async function createEndorserJwtForKey(
-  account: KeyMeta,
-  payload: object,
-) {
-  if (account?.identity) {
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    const identity: IIdentifier = JSON.parse(account.identity!);
-    const privateKeyHex = identity.keys[0].privateKeyHex;
-    const signer = await SimpleSigner(privateKeyHex as string);
-    return didJwt.createJWT(payload, {
-      issuer: account.did,
-      signer: signer,
-    });
-  } else if (account?.passkeyCredIdHex) {
-    return createDidPeerJwt(account.did, account.passkeyCredIdHex, payload);
-  } else {
-    throw new Error("No identity data found to sign for DID " + account.did);
-  }
-}
-
-/**
- *  Copied out of did-jwt since it's deprecated in that library.
- *
- *  The SimpleSigner returns a configured function for signing data.
- *
- *  @example
- *  const signer = SimpleSigner(privateKeyHexString)
- *  signer(data, (err, signature) => {
- *    ...
- *  })
- *
- *  @param    {String}         hexPrivateKey    a hex encoded private key
- *  @return   {Function}                     a configured signer function
- */
-function SimpleSigner(hexPrivateKey: string): didJwt.Signer {
-  const signer = didJwt.ES256KSigner(didJwt.hexToBytes(hexPrivateKey), true);
-  return async (data) => {
-    const signature = (await signer(data)) as string;
-    return fromJose(signature);
-  };
-}
-
-// from did-jwt/util; see SimpleSigner above
-function fromJose(signature: string): {
-  r: string;
-  s: string;
-  recoveryParam?: number;
-} {
-  const signatureBytes: Uint8Array = didJwt.base64ToBytes(signature);
-  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
-    throw new TypeError(
-      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
-    );
-  }
-  const r = bytesToHex(signatureBytes.slice(0, 32));
-  const s = bytesToHex(signatureBytes.slice(32, 64));
-  const recoveryParam =
-    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
-  return { r, s, recoveryParam };
-}
-
-// from did-jwt/util; see SimpleSigner above
-function bytesToHex(b: Uint8Array): string {
-  return u8a.toString(b, "base16");
-}
-
-export function decodeEndorserJwt(jwt: string): JWTDecoded {
-  return didJwt.decodeJWT(jwt);
-}

src/libs/didPeer.ts

@@ -1,5 +1,7 @@
+import asn1 from "asn1-ber";
 import { Buffer } from "buffer/";
-import { JWTPayload } from "did-jwt";
+import { decode as cborDecode } from "cbor-x";
+import { bytesToMultibase, JWTPayload, multibaseToBytes } from "did-jwt";
 import { DIDResolutionResult } from "did-resolver";
 import { sha256 } from "ethereum-cryptography/sha256.js";
 import {
@@ -19,15 +21,10 @@ import {
   PublicKeyCredentialRequestOptionsJSON,
 } from "@simplewebauthn/types";
 
-import { AppString } from "@/constants/app";
-import { unwrapEC2Signature } from "@/libs/crypto/vc/passkeyHelpers";
-import {
-  arrayToBase64Url,
-  cborToKeys,
-  peerDidToPublicKeyBytes,
-  verifyPeerSignature,
-} from "@/libs/crypto/vc/didPeer";
+import { getWebCrypto, unwrapEC2Signature } from "@/libs/crypto/passkeyHelpers";
 
+const PEER_DID_PREFIX = "did:peer:";
+const PEER_DID_MULTIBASE_PREFIX = PEER_DID_PREFIX + "0";
 export interface JWK {
   kty: string;
   crv: string;
@@ -35,12 +32,20 @@ export interface JWK {
   y: string;
 }
 
+function toBase64Url(anythingB64: string) {
+  return anythingB64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+
+function arrayToBase64Url(anything: Uint8Array) {
+  return toBase64Url(Buffer.from(anything).toString("base64"));
+}
+
 export async function registerCredential(passkeyName?: string) {
   const options: PublicKeyCredentialCreationOptionsJSON =
     await generateRegistrationOptions({
-      rpName: AppString.APP_NAME,
+      rpName: "Time Safari",
       rpID: window.location.hostname,
-      userName: passkeyName || AppString.APP_NAME + " User",
+      userName: passkeyName || "Time Safari User",
       // Don't prompt users for additional information about the authenticator
       // (Recommended for smoother UX)
       attestationType: "none",
@@ -69,7 +74,7 @@ export async function registerCredential(passkeyName?: string) {
 
   const credIdBase64Url = verification.registrationInfo?.credentialID as string;
   if (attResp.rawId !== credIdBase64Url) {
-    console.log("Warning! The raw ID does not match the credential ID.");
+    console.log("Warning! The raw ID does not match the credential ID.")
   }
   const credIdHex = Buffer.from(
     base64URLStringToArrayBuffer(credIdBase64Url),
@@ -87,6 +92,21 @@ export async function registerCredential(passkeyName?: string) {
   };
 }
 
+export function createPeerDid(publicKeyBytes: Uint8Array) {
+  // https://github.com/decentralized-identity/veramo/blob/next/packages/did-provider-peer/src/peer-did-provider.ts#L67
+  //const provider = new PeerDIDProvider({ defaultKms: LOCAL_KMS_NAME });
+  const methodSpecificId = bytesToMultibase(
+    publicKeyBytes,
+    "base58btc",
+    "p256-pub",
+  );
+  return PEER_DID_MULTIBASE_PREFIX + methodSpecificId;
+}
+
+function peerDidToPublicKeyBytes(did: string) {
+  return multibaseToBytes(did.substring(PEER_DID_MULTIBASE_PREFIX.length));
+}
+
 export class PeerSetup {
   public authenticatorData?: ArrayBuffer;
   public challenge?: Uint8Array;
@@ -97,17 +117,13 @@ export class PeerSetup {
     issuerDid: string,
     payload: object,
     credIdHex: string,
-    expMinutes: number = 1,
   ) {
     const credentialId = arrayBufferToBase64URLString(
       Buffer.from(credIdHex, "hex").buffer,
     );
-    const issuedAt = Math.floor(Date.now() / 1000);
-    const expiryTime = Math.floor(Date.now() / 1000) + expMinutes * 60; // some minutes from now
     const fullPayload = {
       ...payload,
-      exp: expiryTime,
-      iat: issuedAt,
+      iat: Math.floor(Date.now() / 1000),
       iss: issuerDid,
     };
     this.challenge = new Uint8Array(Buffer.from(JSON.stringify(fullPayload)));
@@ -143,8 +159,7 @@ export class PeerSetup {
     const dataInJwt = {
       AuthenticationDataB64URL: authenticatorDataBase64Url,
       ClientDataJSONB64URL: this.clientDataJsonBase64Url,
-      exp: expiryTime,
-      iat: issuedAt,
+      iat: Math.floor(Date.now() / 1000),
       iss: issuerDid,
     };
     const dataInJwtString = JSON.stringify(dataInJwt);
@@ -163,14 +178,10 @@ export class PeerSetup {
     issuerDid: string,
     payload: object,
     credIdHex: string,
-    expMinutes: number = 1,
   ) {
-    const issuedAt = Math.floor(Date.now() / 1000);
-    const expiryTime = Math.floor(Date.now() / 1000) + expMinutes * 60; // some minutes from now
     const fullPayload = {
       ...payload,
-      exp: expiryTime,
-      iat: issuedAt,
+      iat: Math.floor(Date.now() / 1000),
       iss: issuerDid,
     };
     const dataToSignString = JSON.stringify(fullPayload);
@@ -184,12 +195,12 @@ export class PeerSetup {
         allowCredentials: [
           {
             id: credentialId,
-            type: "public-key" as const,
+            type: "public-key",
           },
         ],
         challenge: this.challenge.buffer,
         rpID: window.location.hostname,
-        userVerification: "preferred" as const,
+        userVerification: "preferred",
       },
     };
 
@@ -198,7 +209,7 @@ export class PeerSetup {
 
     this.authenticatorData = credential?.response.authenticatorData;
     const authenticatorDataBase64Url = arrayBufferToBase64URLString(
-      this.authenticatorData as ArrayBuffer,
+      this.authenticatorData,
     );
 
     this.clientDataJsonBase64Url = arrayBufferToBase64URLString(
@@ -216,8 +227,7 @@ export class PeerSetup {
     const dataInJwt = {
       AuthenticationDataB64URL: authenticatorDataBase64Url,
       ClientDataJSONB64URL: this.clientDataJsonBase64Url,
-      exp: expiryTime,
-      iat: issuedAt,
+      iat: Math.floor(Date.now() / 1000),
       iss: issuerDid,
     };
     const dataInJwtString = JSON.stringify(dataInJwt);
@@ -227,9 +237,8 @@ export class PeerSetup {
       .replace(/\//g, "_")
       .replace(/=+$/, "");
 
-    const origSignature = Buffer.from(credential?.response.signature).toString(
-      "base64",
-    );
+    const origSignature = Buffer.from(credential?.response.signature)
+      .toString("base64")
     this.signature = origSignature
       .replace(/\+/g, "-")
       .replace(/\//g, "_")
@@ -239,9 +248,6 @@ export class PeerSetup {
     return jwt;
   }
 
-  // To use this, add the asn1-ber library and add this import:
-  // import asn1 from "asn1-ber";
-  //
   // return a low-level signing function, similar to createJWS approach
   // async webAuthnES256KSigner(credentialID: string) {
   //   return async (data: string | Uint8Array) => {
@@ -298,16 +304,6 @@ export class PeerSetup {
   // }
 }
 
-export async function createDidPeerJwt(
-  did: string,
-  credIdHex: string,
-  payload: object,
-): Promise<string> {
-  const peerSetup = new PeerSetup();
-  const jwt = await peerSetup.createJwtNavigator(did, payload, credIdHex);
-  return jwt;
-}
-
 // I'd love to use this but it doesn't verify.
 // Requires:
 // npm install @noble/curves
@@ -380,7 +376,6 @@ export async function verifyJwtSimplewebauthn(
   return verification.verified;
 }
 
-// similar code is in endorser-ch util-crypto.ts verifyPeerSignature
 export async function verifyJwtWebCrypto(
   credId: Base64URLString,
   issuerDid: string,
@@ -399,10 +394,35 @@ export async function verifyJwtWebCrypto(
 
   // Construct the preimage
   const preimage = Buffer.concat([authDataFromBase, hash]);
-  return verifyPeerSignature(preimage, issuerDid, finalSigBuffer);
+
+  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
+
+  const WebCrypto = await getWebCrypto();
+  const verifyAlgorithm = {
+    name: "ECDSA",
+    hash: { name: "SHA-256" },
+  };
+  const publicKeyJwk = cborToKeys(publicKeyBytes).publicKeyJwk;
+  const keyAlgorithm = {
+    name: "ECDSA",
+    namedCurve: publicKeyJwk.crv,
+  };
+  const publicKeyCryptoKey = await WebCrypto.subtle.importKey(
+    "jwk",
+    publicKeyJwk,
+    keyAlgorithm,
+    false,
+    ["verify"],
+  );
+  const verified = await WebCrypto.subtle.verify(
+    verifyAlgorithm,
+    publicKeyCryptoKey,
+    finalSigBuffer,
+    preimage,
+  );
+  return verified;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
   if (!did.startsWith("did:peer:0z")) {
     throw new Error(
@@ -411,21 +431,13 @@ async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
   }
   // this is basically hard-coded from https://www.w3.org/TR/did-core/#example-various-verification-method-types
   // (another reference is the @aviarytech/did-peer resolver)
-
-  /**
-   * Looks like JsonWebKey2020 isn't too difficult:
-   * - change context security/suites link to jws-2020/v1
-   * - change publicKeyMultibase to publicKeyJwk generated with cborToKeys
-   * - change type to JsonWebKey2020
-   */
-
   const id = did.split(":")[2];
   const multibase = id.slice(1);
   const encnumbasis = multibase.slice(1);
   const didDocument = {
     "@context": [
       "https://www.w3.org/ns/did/v1",
-      "https://w3id.org/security/suites/secp256k1-2019/v1",
+      "https://w3id.org/security/suites/jws-2020/v1",
     ],
     assertionMethod: [did + "#" + encnumbasis],
     authentication: [did + "#" + encnumbasis],
@@ -451,15 +463,12 @@ async function peerDidToDidDocument(did: string): Promise<DIDResolutionResult> {
 }
 
 // convert COSE public key to PEM format
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function COSEtoPEM(cose: Buffer) {
   // const alg = cose.get(3); // Algorithm
   const x = cose[-2]; // x-coordinate
   const y = cose[-3]; // y-coordinate
 
   // Ensure the coordinates are in the correct format
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error because it complains about the type of x and y
   const pubKeyBuffer = Buffer.concat([Buffer.from([0x04]), x, y]);
 
   // Convert to PEM format
@@ -470,7 +479,6 @@ ${pubKeyBuffer.toString("base64")}
   return pem;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function base64urlDecode(input: string) {
   input = input.replace(/-/g, "+").replace(/_/g, "/");
   const pad = input.length % 4 === 0 ? "" : "====".slice(input.length % 4);
@@ -482,14 +490,13 @@ function base64urlDecode(input: string) {
   return bytes.buffer;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
 function base64urlEncode(buffer: ArrayBuffer) {
   const str = String.fromCharCode(...new Uint8Array(buffer));
   return btoa(str).replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
 }
 
 // from @simplewebauthn/browser
-function arrayBufferToBase64URLString(buffer: ArrayBuffer) {
+function arrayBufferToBase64URLString(buffer) {
   const bytes = new Uint8Array(buffer);
   let str = "";
   for (const charCode of bytes) {
@@ -513,7 +520,31 @@ function base64URLStringToArrayBuffer(base64URLString: string) {
   return buffer;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
+function cborToKeys(publicKeyBytes: Uint8Array) {
+  const jwkObj = cborDecode(publicKeyBytes);
+  if (
+    jwkObj[1] != 2 || // kty "EC"
+    jwkObj[3] != -7 || // alg "ES256"
+    jwkObj[-1] != 1 || // crv "P-256"
+    jwkObj[-2].length != 32 || // x
+    jwkObj[-3].length != 32 // y
+  ) {
+    throw new Error("Unable to extract key.");
+  }
+  const publicKeyJwk = {
+    alg: "ES256",
+    crv: "P-256",
+    kty: "EC",
+    x: arrayToBase64Url(jwkObj[-2]),
+    y: arrayToBase64Url(jwkObj[-3]),
+  };
+  const publicKeyBuffer = Buffer.concat([
+    Buffer.from(jwkObj[-2]),
+    Buffer.from(jwkObj[-3]),
+  ]);
+  return { publicKeyJwk, publicKeyBuffer };
+}
+
 async function pemToCryptoKey(pem: string) {
   const binaryDerString = atob(
     pem

src/libs/endorserServer.ts

@@ -1,20 +1,19 @@
-import { Axios, AxiosRequestConfig, AxiosResponse } from "axios";
-import { Buffer } from "buffer";
-import { sha256 } from "ethereum-cryptography/sha256";
+import {
+  Axios,
+  AxiosRequestConfig,
+  AxiosResponse,
+  RawAxiosRequestHeaders,
+} from "axios";
+import * as didJwt from "did-jwt";
 import { LRUCache } from "lru-cache";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 
 import { DEFAULT_IMAGE_API_SERVER } from "@/constants/app";
 import { Contact } from "@/db/tables/contacts";
-import { accessToken, deriveAddress, nextDerivationPath } from "@/libs/crypto";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import { NonsensitiveDexie } from "@/db/index";
-import {
-  getAccount,
-  getPasskeyExpirationSeconds,
-  GiverReceiverInputInfo,
-} from "@/libs/util";
-import { createEndorserJwtForKey, KeyMeta } from "@/libs/crypto/vc";
-import { Account } from "@/db/tables/accounts";
+import { getIdentity } from "@/libs/util";
 
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 // the object in RegisterAction claims
@@ -36,6 +35,11 @@ export interface AgreeVerifiableCredential {
   object: Record<string, any>;
 }
 
+export interface GiverReceiverInputInfo {
+  did?: string;
+  name?: string;
+}
+
 export interface GiverOutputInfo {
   action: string;
   giver?: GiverReceiverInputInfo;
@@ -50,32 +54,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 {
@@ -84,12 +85,9 @@ export interface GiveSummaryRecord {
   amountConfirmed: number;
   description: string;
   fullClaim: GiveVerifiableCredential;
-  fulfillsHandleId: string;
-  fulfillsPlanHandleId?: string;
-  fulfillsType?: string;
+  fulfillsPlanHandleId: string;
   handleId: string;
   issuedAt: string;
-  issuerDid: string;
   jwtId: string;
   recipientDid: string;
   unit: string;
@@ -103,7 +101,6 @@ export interface OfferSummaryRecord {
   fullClaim: OfferVerifiableCredential;
   fulfillsPlanHandleId: string;
   handleId: string;
-  issuerDid: string;
   jwtId: string;
   nonAmountGivenConfirmed: number;
   objectDescription: string;
@@ -132,7 +129,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 };
@@ -146,13 +143,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 };
@@ -162,7 +159,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;
@@ -200,7 +197,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;
 }
@@ -274,6 +271,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:");
 }
@@ -452,79 +453,28 @@ export function didInfo(
   return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
 }
 
-let passkeyAccessToken: string = "";
-let passkeyTokenExpirationEpochSeconds: number = 0;
-
-export function clearPasskeyToken() {
-  passkeyAccessToken = "";
-  passkeyTokenExpirationEpochSeconds = 0;
-}
-
-export function tokenExpiryTimeDescription() {
-  if (
-    !passkeyAccessToken ||
-    passkeyTokenExpirationEpochSeconds < new Date().getTime() / 1000
-  ) {
-    return "Token has expired";
-  } else {
-    return (
-      "Token expires at " +
-      new Date(passkeyTokenExpirationEpochSeconds * 1000).toLocaleString()
-    );
-  }
-}
-
-/**
- * Get the headers for a request, potentially including Authorization
- */
-export async function getHeaders(did?: string) {
-  const headers: { "Content-Type": string; Authorization?: string } = {
+async function getHeaders(identity: IIdentifier | null) {
+  const headers: RawAxiosRequestHeaders = {
     "Content-Type": "application/json",
   };
-  if (did) {
-    let token;
-    const account = await getAccount(did);
-    if (account?.passkeyCredIdHex) {
-      if (
-        passkeyAccessToken &&
-        passkeyTokenExpirationEpochSeconds > Date.now() / 1000
-      ) {
-        // there's an active current passkey token
-        token = passkeyAccessToken;
-      } else {
-        // there's no current passkey token or it's expired
-        token = await accessToken(did);
-
-        passkeyAccessToken = token;
-        const passkeyExpirationSeconds = await getPasskeyExpirationSeconds();
-        passkeyTokenExpirationEpochSeconds =
-          Date.now() / 1000 + passkeyExpirationSeconds;
-      }
-    } else {
-      token = await accessToken(did);
-    }
+  if (identity) {
+    const token = await accessToken(identity);
     headers["Authorization"] = "Bearer " + token;
-  } else {
-    // it's often OK to request without auth; we assume necessary checks are done earlier
   }
   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
+ * @param identity nullable, in which case no private info will be returned
  * @param axios
  * @param apiServer
  */
 export async function getPlanFromCache(
-  handleId: string,
+  handleId: string | null,
+  identity: IIdentifier | null,
   axios: Axios,
   apiServer: string,
-  requesterDid?: string,
 ): Promise<PlanSummaryRecord | undefined> {
   if (!handleId) {
     return undefined;
@@ -535,7 +485,7 @@ export async function getPlanFromCache(
       apiServer +
       "/api/v2/report/plans?handleId=" +
       encodeURIComponent(handleId);
-    const headers = await getHeaders(requesterDid);
+    const headers = await getHeaders(identity);
     try {
       const resp = await axios.get(url, { headers });
       if (resp.status === 200 && resp.data?.data?.length > 0) {
@@ -569,13 +519,19 @@ export async function setPlanInCache(
 }
 
 /**
- * Construct GiveAction VC for submission to server
+ * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
- * @param lastClaimId supplied when editing a previous claim
+ * @param identity
+ * @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 function hydrateGive(
-  vcClaimOrig?: GiveVerifiableCredential,
-  fromDid?: string,
+export async function createAndSubmitGive(
+  axios: Axios,
+  apiServer: string,
+  identity: IIdentifier,
+  fromDid?: string | null,
   toDid?: string,
   description?: string,
   amount?: number,
@@ -584,279 +540,91 @@ 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)
+): Promise<CreateAndSubmitClaimResult> {
+  const vcClaim: GiveVerifiableCredential = {
+    "@context": "https://schema.org",
+    "@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,
-  );
+  if (imageUrl) {
+    vcClaim.image = imageUrl;
+  }
   return createAndSubmitClaim(
-    vcClaim as GenericVerifiableCredential,
-    issuerDid,
+    vcClaim as GenericCredWrapper,
+    identity,
     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;
-  }
-
-  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;
-}
-
 /**
  * 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 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,
-  issuerDid: string,
-  itemDescription: string,
+  identity: IIdentifier,
+  description?: string,
   amount?: number,
   unitCode?: string,
-  conditionDescription?: string,
-  validThrough?: string,
+  expirationDate?: string,
   recipientDid?: string,
   fulfillsProjectHandleId?: string,
 ): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
-    undefined,
-    issuerDid,
-    recipientDid,
-    itemDescription,
-    amount,
-    unitCode,
-    conditionDescription,
-    fulfillsProjectHandleId,
-    validThrough,
-    undefined,
-  );
+  const vcClaim: OfferVerifiableCredential = {
+    "@context": "https://schema.org",
+    "@type": "Offer",
+    offeredBy: { identifier: identity.did },
+    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,
-    issuerDid,
-    apiServer,
-    axios,
-  );
-}
-
-export async function editAndSubmitOffer(
-  axios: Axios,
-  apiServer: string,
-  fullClaim: GenericCredWrapper<OfferVerifiableCredential>,
-  issuerDid: string,
-  itemDescription: string,
-  amount?: number,
-  unitCode?: string,
-  conditionDescription?: string,
-  validThrough?: string,
-  recipientDid?: string,
-  fulfillsProjectHandleId?: string,
-): Promise<CreateAndSubmitClaimResult> {
-  const vcClaim = hydrateOffer(
-    fullClaim.claim,
-    issuerDid,
-    recipientDid,
-    itemDescription,
-    amount,
-    unitCode,
-    conditionDescription,
-    fulfillsProjectHandleId,
-    validThrough,
-    fullClaim.id,
-  );
-  return createAndSubmitClaim(
-    vcClaim as OfferVerifiableCredential,
-    issuerDid,
+    vcClaim as GenericCredWrapper,
+    identity,
     apiServer,
     axios,
   );
@@ -864,7 +632,7 @@ export async function editAndSubmitOffer(
 
 // similar logic is found in endorser-mobile
 export const createAndSubmitConfirmation = async (
-  issuerDid: string,
+  identifier: IIdentifier,
   claim: GenericVerifiableCredential,
   lastClaimId: string, // used to set the lastClaimId
   handleId: string | undefined,
@@ -877,16 +645,16 @@ export const createAndSubmitConfirmation = async (
     ),
   );
   const confirmationClaim: GenericVerifiableCredential = {
-    "@context": SCHEMA_ORG_CONTEXT,
+    "@context": "https://schema.org",
     "@type": "AgreeAction",
     object: goodClaim,
   };
-  return createAndSubmitClaim(confirmationClaim, issuerDid, apiServer, axios);
+  return createAndSubmitClaim(confirmationClaim, identifier, apiServer, axios);
 };
 
 export async function createAndSubmitClaim(
   vcClaim: GenericVerifiableCredential,
-  issuerDid: string,
+  identity: IIdentifier,
   apiServer: string,
   axios: Axios,
 ): Promise<CreateAndSubmitClaimResult> {
@@ -899,22 +667,41 @@ export async function createAndSubmitClaim(
       },
     };
 
-    const vcJwt: string = await createEndorserJwtForDid(issuerDid, vcPayload);
+    // Create a signature using private key of identity
+    const firstKey = identity.keys[0];
+    const privateKeyHex = firstKey?.privateKeyHex;
+
+    if (!privateKeyHex) {
+      throw {
+        error: "No private key",
+        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
+      };
+    }
+
+    const signer = await SimpleSigner(privateKeyHex);
+
+    // Create a JWT for the request
+    const vcJwt: string = await didJwt.createJWT(vcPayload, {
+      issuer: identity.did,
+      signer,
+    });
 
     // Make the xhr request payload
     const payload = JSON.stringify({ jwtEncoded: vcJwt });
     const url = `${apiServer}/api/v2/claim`;
+    const token = await accessToken(identity);
 
     const response = await axios.post(url, payload, {
       headers: {
         "Content-Type": "application/json",
+        Authorization: `Bearer ${token}`,
       },
     });
 
     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 ||
@@ -929,61 +716,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,
-) {
-  const account = await getAccount(issuerDid);
-  return createEndorserJwtForKey(account as KeyMeta, payload);
-}
-
 /**
  * An AcceptAction is when someone accepts some contract or pledge.
  *
@@ -1030,29 +762,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 {
@@ -1073,7 +800,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>,
@@ -1167,17 +894,13 @@ export const claimSpecialDescription = (
       "...]"
     );
   } else {
-    return (
-      issuer +
-      " declared " +
-      claimSummary(claim as GenericCredWrapper<GenericVerifiableCredential>)
-    );
+    return issuer + " declared " + claimSummary(claim as GenericCredWrapper);
   }
 };
 
 export const BVC_MEETUPS_PROJECT_CLAIM_ID =
   import.meta.env.VITE_BVC_MEETUPS_PROJECT_CLAIM_ID ||
-  "https://endorser.ch/entity/01HWE8FWHQ1YGP7GFZYYPS272F"; // this won't resolve as a URL on production; it's a URN only found in the test system
+  "https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK"; // this won't resolve as a URL on production; it's a URN only found in the test system
 
 export const bvcMeetingJoinClaim = (did: string, startTime: string) => {
   return {
@@ -1196,31 +919,18 @@ export const bvcMeetingJoinClaim = (did: string, startTime: string) => {
   };
 };
 
-export async function createEndorserJwtVcFromClaim(
-  issuerDid: string,
-  claim: object,
-) {
-  // Make a payload for the claim
-  const vcPayload = {
-    vc: {
-      "@context": ["https://www.w3.org/2018/credentials/v1"],
-      type: ["VerifiableCredential"],
-      credentialSubject: claim,
-    },
-  };
-  return createEndorserJwtForDid(issuerDid, vcPayload);
-}
-
 export async function register(
   activeDid: string,
   apiServer: string,
   axios: Axios,
   contact: Contact,
 ) {
+  const identity = await getIdentity(activeDid);
+
   const vcClaim: RegisterVerifiableCredential = {
-    "@context": SCHEMA_ORG_CONTEXT,
+    "@context": "https://schema.org",
     "@type": "RegisterAction",
-    agent: { identifier: activeDid },
+    agent: { identifier: identity.did },
     object: SERVICE_ID,
     participant: { identifier: contact.did },
   };
@@ -1233,10 +943,26 @@ export async function register(
     },
   };
   // Create a signature using private key of identity
-  const vcJwt = await createEndorserJwtForDid(activeDid, vcPayload);
+  if (identity.keys[0].privateKeyHex == null) {
+    return { error: "Private key not found." };
+  }
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const privateKeyHex: string = identity.keys[0].privateKeyHex!;
+  const signer = await SimpleSigner(privateKeyHex);
+  const alg = undefined;
+  // Create a JWT for the request
+  const vcJwt: string = await didJwt.createJWT(vcPayload, {
+    alg: alg,
+    issuer: identity.did,
+    signer: signer,
+  });
 
+  // Make the xhr request payload
+  const payload = JSON.stringify({ jwtEncoded: vcJwt });
   const url = apiServer + "/api/v2/claim";
-  const resp = await axios.post(url, { jwtEncoded: vcJwt });
+  const headers = await getHeaders(identity);
+
+  const resp = await axios.post(url, payload, { headers });
   if (resp.data?.success?.handleId) {
     return { success: true };
   } else if (resp.data?.success?.embeddedRecordError) {
@@ -1265,17 +991,15 @@ export async function setVisibilityUtil(
   }
   const url =
     apiServer + "/api/report/" + (visibility ? "canSeeMe" : "cannotSeeMe");
-  const headers = await getHeaders(activeDid);
+  const identity = await getIdentity(activeDid);
+  const headers = await getHeaders(identity);
   const payload = JSON.stringify({ did: contact.did });
 
   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: ",
@@ -1297,16 +1021,16 @@ export async function setVisibilityUtil(
  *
  * @param apiServer endorser server URL string
  * @param axios Axios instance
- * @param {string} issuerDid - The DID for which to check rate limits.
+ * @param {IIdentifier} identity - The identity object to check rate limits for.
  * @returns {Promise<AxiosResponse>} The Axios response object.
  */
 export async function fetchEndorserRateLimits(
   apiServer: string,
   axios: Axios,
-  issuerDid: string,
+  identity: IIdentifier,
 ) {
   const url = `${apiServer}/api/report/rateLimits`;
-  const headers = await getHeaders(issuerDid);
+  const headers = await getHeaders(identity);
   return await axios.get(url, { headers } as AxiosRequestConfig);
 }
 
@@ -1315,11 +1039,15 @@ export async function fetchEndorserRateLimits(
  *
  * @param apiServer image server URL string
  * @param axios Axios instance
- * @param {string} issuerDid - The DID for which to check rate limits.
+ * @param {IIdentifier} identity - The identity object to check rate limits for.
  * @returns {Promise<AxiosResponse>} The Axios response object.
  */
-export async function fetchImageRateLimits(axios: Axios, issuerDid: string) {
+export async function fetchImageRateLimits(
+  apiServer: string,
+  axios: Axios,
+  identity: IIdentifier,
+) {
   const url = DEFAULT_IMAGE_API_SERVER + "/image-limits";
-  const headers = await getHeaders(issuerDid);
+  const headers = await getHeaders(identity);
   return await axios.get(url, { headers } as AxiosRequestConfig);
 }

src/libs/util.ts

@@ -1,45 +1,24 @@
 // 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 { IIdentifier } from "@veramo/core";
 import { useClipboard } from "@vueuse/core";
 
 import { DEFAULT_PUSH_SERVER } from "@/constants/app";
-import {
-  accountsDB,
-  retrieveSettingsForActiveAccount,
-  updateAccountSettings,
-  updateDefaultSettings,
-} from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
-import { DEFAULT_PASSKEY_EXPIRATION_MINUTES } from "@/db/tables/settings";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
+import { GenericCredWrapper, containsHiddenDid } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
-import {
-  containsHiddenDid,
-  GenericCredWrapper,
-  GenericVerifiableCredential,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
-import { KeyMeta } from "@/libs/crypto/vc";
-import { createPeerDid } from "@/libs/crypto/vc/didPeer";
-import { registerCredential } from "@/libs/crypto/vc/passkeyDidPeer";
-
-export interface GiverReceiverInputInfo {
-  did?: string;
-  name?: string;
-}
 
 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";
+  "The data you send be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to those you allow.";
 
 /* eslint-disable prettier/prettier */
 export const UNIT_SHORT: Record<string, string> = {
-  "BTC": "BTC",
   "BX": "BX",
+  "BTC": "BTC",
   "ETH": "ETH",
   "HUR": "Hours",
   "USD": "US $",
@@ -48,8 +27,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",
@@ -93,34 +72,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()
@@ -133,13 +88,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 &&
@@ -147,45 +100,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 &&
@@ -202,13 +123,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"
@@ -277,17 +193,20 @@ export function findAllVisibleToDids(
  *
  **/
 
-export interface AccountKeyInfo extends Account, KeyMeta {}
-
-export const getAccount = async (
-  activeDid: string,
-): Promise<AccountKeyInfo | undefined> => {
+export const getIdentity = async (activeDid: string): Promise<IIdentifier> => {
   await accountsDB.open();
   const account = (await accountsDB.accounts
     .where("did")
     .equals(activeDid)
     .first()) as Account;
-  return account;
+  const identity = JSON.parse(account?.identity || "null");
+
+  if (!identity) {
+    throw new Error(
+      `Attempted to load identity ${activeDid} but no identifier was found`,
+    );
+  }
+  return identity;
 };
 
 /**
@@ -313,54 +232,19 @@ export const generateSaveAndActivateIdentity = async (): Promise<string> => {
     publicKeyHex: newId.keys[0].publicKeyHex,
   });
 
-  await updateDefaultSettings({ activeDid: newId.did });
-  console.log("Updated default settings in util");
-  await updateAccountSettings(newId.did, { isRegistered: false });
+  await db.settings.update(MASTER_SETTINGS_KEY, {
+    activeDid: newId.did,
+  });
 
   return newId.did;
 };
 
-export const registerAndSavePasskey = async (
-  keyName: string,
-): Promise<Account> => {
-  const cred = await registerCredential(keyName);
-  const publicKeyBytes = cred.publicKeyBytes;
-  const did = createPeerDid(publicKeyBytes as Uint8Array);
-  const passkeyCredIdHex = cred.credIdHex as string;
-
-  const account = {
-    dateCreated: new Date().toISOString(),
-    did,
-    passkeyCredIdHex,
-    publicKeyHex: Buffer.from(publicKeyBytes).toString("hex"),
-  };
-  await accountsDB.open();
-  await accountsDB.accounts.add(account);
-  return account;
-};
-
-export const registerSaveAndActivatePasskey = async (
-  keyName: string,
-): Promise<Account> => {
-  const account = await registerAndSavePasskey(keyName);
-  await updateDefaultSettings({ activeDid: account.did });
-  await updateAccountSettings(account.did, { isRegistered: false });
-  return account;
-};
-
-export const getPasskeyExpirationSeconds = async (): Promise<number> => {
-  const settings = await retrieveSettingsForActiveAccount();
-  return (
-    (settings?.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES) *
-    60
-  );
-};
-
 export const sendTestThroughPushServer = async (
   subscriptionJSON: PushSubscriptionJSON,
   skipFilter: boolean,
 ): Promise<AxiosResponse> => {
-  const settings = await retrieveSettingsForActiveAccount();
+  await db.open();
+  const settings = await db.settings.get(MASTER_SETTINGS_KEY);
   let pushUrl: string = DEFAULT_PUSH_SERVER as string;
   if (settings?.webPushServer) {
     pushUrl = settings.webPushServer;

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

@@ -38,11 +38,6 @@ const routes: Array<RouteRecordRaw> = [
     name: "claim",
     component: () => import("../views/ClaimView.vue"),
   },
-  {
-    path: "/claim-add-raw/:id?",
-    name: "claim-add-raw",
-    component: () => import("../views/ClaimAddRawView.vue"),
-  },
   {
     path: "/confirm-contact",
     name: "confirm-contact",
@@ -63,11 +58,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 +81,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 +133,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 +174,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/store/app.ts

@@ -0,0 +1,20 @@
+// @ts-check
+import { defineStore } from "pinia";
+
+export const useAppStore = defineStore({
+  id: "app",
+  state: () => ({
+    _projectId:
+      typeof localStorage.getItem("projectId") === "undefined"
+        ? ""
+        : localStorage.getItem("projectId"),
+  }),
+  getters: {
+    projectId: (state): string => state._projectId as string,
+  },
+  actions: {
+    async setProjectId(newProjectId: string) {
+      localStorage.setItem("projectId", newProjectId);
+    },
+  },
+});

src/test/index.ts

@@ -1,13 +1,11 @@
 import axios from "axios";
 import * as didJwt from "did-jwt";
 import { AppString } from "@/constants/app";
-import { retrieveSettingsForActiveAccount } from "../db";
-import { SERVICE_ID } from "@/libs/endorserServer";
-import { deriveAddress, newIdentifier } from "@/libs/crypto";
+import { db } from "../db";
+import { SERVICE_ID } from "../libs/endorserServer";
+import { deriveAddress, newIdentifier } from "../libs/crypto";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
-/**
- * Get User #0 to sign & submit a RegisterAction for the user's activeDid.
- */
 export async function testServerRegisterUser() {
   const testUser0Mnem =
     "seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control";
@@ -16,7 +14,8 @@ export async function testServerRegisterUser() {
 
   const identity0 = newIdentifier(addr, publicHex, privateHex, deriPath);
 
-  const settings = await retrieveSettingsForActiveAccount();
+  await db.open();
+  const settings = await db.settings.get(MASTER_SETTINGS_KEY);
 
   // Make a claim
   const vcClaim = {
@@ -24,7 +23,7 @@ export async function testServerRegisterUser() {
     "@type": "RegisterAction",
     agent: { did: identity0.did },
     object: SERVICE_ID,
-    participant: { did: settings.activeDid },
+    participant: { did: settings?.activeDid },
   };
   // Make a payload for the claim
   const vcPayload = {
@@ -51,7 +50,7 @@ export async function testServerRegisterUser() {
 
   const payload = JSON.stringify({ jwtEncoded: vcJwt });
   const endorserApiServer =
-    settings.apiServer || AppString.TEST_ENDORSER_API_SERVER;
+    settings?.apiServer || AppString.TEST_ENDORSER_API_SERVER;
   const url = endorserApiServer + "/api/claim";
   const headers = {
     "Content-Type": "application/json",

src/views/ClaimAddRawView.vue

@@ -1,97 +0,0 @@
-<template>
-  <QuickNav />
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Back -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left" class="fa-fw" />
-        </button>
-        Raw Claim
-      </h1>
-    </div>
-
-    <div class="flex">
-      <textarea rows="20" class="border-2 w-full" v-model="claimStr"></textarea>
-    </div>
-    <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="submitClaim()"
-    >
-      Sign &amp; Send
-    </button>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { NotificationIface } from "@/constants/app";
-import { retrieveSettingsForActiveAccount } from "@/db/index";
-import * as serverUtil from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.vue";
-
-@Component({
-  components: { QuickNav },
-})
-export default class ClaimAddRawView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  accountIdentityStr: string = "null";
-  activeDid = "";
-  apiServer = "";
-  claimStr = "";
-
-  async mounted() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
-
-    this.claimStr = (this.$route as Router).query["claim"];
-    try {
-      this.veriClaim = JSON.parse(this.claimStr);
-      this.claimStr = JSON.stringify(this.veriClaim, null, 2);
-    } catch (e) {
-      // ignore a parse
-    }
-  }
-
-  async submitClaim() {
-    const fullClaim = JSON.parse(this.claimStr);
-    const result = await serverUtil.createAndSubmitClaim(
-      fullClaim,
-      this.activeDid,
-      this.apiServer,
-      this.axios,
-    );
-    if (result.type === "success") {
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Success",
-          text: "Claim submitted.",
-        },
-        5000,
-      );
-    } else {
-      console.error("Got error submitting the claim:", result);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "There was a problem submitting the claim. See logs for more info.",
-        },
-        -1,
-      );
-    }
-  }
-}
-</script>

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
@@ -445,25 +407,24 @@
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } 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";
 import { NotificationIface } from "@/constants/app";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 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,
-  OfferVerifiableCredential,
-} from "@/libs/endorserServer";
+import { GiverReceiverInputInfo } from "@/libs/endorserServer";
 
 @Component({
   components: { GiftedDialog, QuickNav },
@@ -471,6 +432,7 @@ import {
 export default class ClaimView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  accountIdentityStr: string = "null";
   activeDid = "";
   allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
@@ -485,12 +447,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 = {};
@@ -510,30 +469,31 @@ 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 = "";
   }
 
   async created() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    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;
     const accountsArr: Array<Account> = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    this.accountIdentityStr = (account?.identity as string) || "null";
+    const identity = JSON.parse(this.accountIdentityStr);
 
     const pathParam = window.location.pathname.substring("/claim/".length);
     let claimId;
     if (pathParam) {
       claimId = decodeURIComponent(pathParam);
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, identity);
     } else {
       this.$notify(
         {
@@ -567,6 +527,33 @@ export default class ClaimView extends Vue {
     );
   }
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+    return headers;
+  }
+
   // Isn't there a better way to make this available to the template?
   didInfo(did: string) {
     return serverUtil.didInfo(
@@ -577,12 +564,12 @@ export default class ClaimView extends Vue {
     );
   }
 
-  async loadClaim(claimId: string, userDid: string) {
+  async loadClaim(claimId: string, identity: IIdentifier) {
     const urlPath = libsUtil.isGlobalUri(claimId)
       ? "/api/claim/byHandle/"
       : "/api/claim/";
     const url = this.apiServer + urlPath + encodeURIComponent(claimId);
-    const headers = await serverUtil.getHeaders(userDid);
+    const headers = await this.getHeaders(identity);
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -608,15 +595,13 @@ 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 =
           this.apiServer +
           "/api/v2/report/gives?handleId=" +
           encodeURIComponent(this.veriClaim.handleId as string);
-        const giveHeaders = await serverUtil.getHeaders(userDid);
+        const giveHeaders = await this.getHeaders(identity);
         const giveResp = await this.axios.get(giveUrl, {
           headers: giveHeaders,
         });
@@ -630,7 +615,7 @@ export default class ClaimView extends Vue {
           this.apiServer +
           "/api/v2/report/offers?handleId=" +
           encodeURIComponent(this.veriClaim.handleId as string);
-        const offerHeaders = await serverUtil.getHeaders(userDid);
+        const offerHeaders = await this.getHeaders(identity);
         const offerResp = await this.axios.get(offerUrl, {
           headers: offerHeaders,
         });
@@ -646,14 +631,12 @@ export default class ClaimView extends Vue {
         this.apiServer +
         "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
         encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-      const confirmHeaders = await serverUtil.getHeaders(userDid);
+      const confirmHeaders = await this.getHeaders(identity);
       const response = await this.axios.get(confirmUrl, {
         headers: confirmHeaders,
       });
       if (response.status === 200) {
         const resultList1 = response.data.result || [];
-        //const publicUrls = resultList.publicUrls || [];
-        delete resultList1.publicUrls;
         const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
         const resultList3 = R.reject(
           (did: string) => did === this.veriClaim.issuer,
@@ -688,9 +671,15 @@ export default class ClaimView extends Vue {
   }
 
   async showFullClaim(claimId: string) {
+    await accountsDB.open();
+    const accounts = accountsDB.accounts;
+    const accountsArr: Account[] = await accounts?.toArray();
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const identity = JSON.parse((account?.identity as string) || "null");
+
     const url =
       this.apiServer + "/api/claim/full/" + encodeURIComponent(claimId);
-    const headers = await serverUtil.getHeaders(this.activeDid);
+    const headers = await this.getHeaders(identity);
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -769,7 +758,7 @@ export default class ClaimView extends Vue {
     };
     const result = await serverUtil.createAndSubmitClaim(
       confirmationClaim,
-      this.activeDid,
+      await this.getIdentity(this.activeDid),
       this.apiServer,
       this.axios,
     );
@@ -801,17 +790,15 @@ 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);
+      await this.loadClaim(claimId, JSON.parse(this.accountIdentityStr));
     });
   }
 
   openFulfillGiftDialog() {
-    const giver: libsUtil.GiverReceiverInputInfo = {
-      did: libsUtil.offerGiverDid(
-        this.veriClaim as GenericCredWrapper<OfferVerifiableCredential>,
-      ),
+    const giver: GiverReceiverInputInfo = {
+      did: libsUtil.offerGiverDid(this.veriClaim),
     };
     (this.$refs.customGiveDialog as GiftedDialog).open(
       giver,
@@ -844,43 +831,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,
@@ -29,13 +27,12 @@
       </h1>
     </div>
 
-    <div v-if="giveDetails && !isLoading">
+    <div v-if="giveDetails">
       <div class="flex justify-center">
         <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(
-              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"
         >
@@ -65,7 +61,7 @@
 
       <!-- Details -->
       <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mt-4">
-        <div class="flex gap-4 overflow-hidden">
+        <div class="block flex gap-4 overflow-hidden">
           <div class="overflow-hidden">
             <div class="text-sm">
               <div>
@@ -100,7 +96,7 @@
                 <router-link
                   :to="
                     '/project/' +
-                    encodeURIComponent(giveDetails?.fulfillsPlanHandleId || '')
+                    encodeURIComponent(giveDetails?.fulfillsPlanHandleId)
                   "
                   class="text-blue-500 mt-2 cursor-pointer"
                   target="_blank"
@@ -121,7 +117,7 @@
                 <router-link
                   :to="
                     '/claim/' +
-                    encodeURIComponent(giveDetails?.fulfillsHandleId || '')
+                    encodeURIComponent(giveDetails?.fulfillsHandleId)
                   "
                   class="text-blue-500 mt-2 cursor-pointer"
                   target="_blank"
@@ -129,7 +125,7 @@
                   This fulfills
                   {{
                     capitalizeAndInsertSpacesBeforeCapsWithAPrefix(
-                      giveDetails?.fulfillsType || "",
+                      giveDetails.fulfillsType,
                     )
                   }}
                   <fa icon="arrow-up-right-from-square" class="fa-fw" />
@@ -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>
@@ -374,9 +371,9 @@
         >
       </div>
     </div>
-    <div v-else-if="!isLoading">This does not have details to confirm.</div>
+    <div v-else>This does not have details to confirm.</div>
 
-    <div class="mt-4" v-if="!isLoading">
+    <div class="mt-4">
       <a
         @click="showClaimPage(veriClaim.id)"
         class="text-blue-500 cursor-pointer"
@@ -385,42 +382,38 @@
         All Generic Info
       </a>
     </div>
-
-    <div
-      class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
-      v-if="isLoading"
-    >
-      <fa icon="spinner" class="fa-spin-pulse"></fa>
-    </div>
   </section>
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } 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, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 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;
 
+  accountIdentityStr: string = "null";
   activeDid = "";
   allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
@@ -430,11 +423,9 @@ 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;
@@ -453,8 +444,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;
@@ -462,17 +452,19 @@ export default class ClaimView extends Vue {
   }
 
   async mounted() {
-    this.isLoading = true;
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    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;
     const accountsArr: Array<Account> = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    this.accountIdentityStr = (account?.identity as string) || "null";
+    const identity = JSON.parse(this.accountIdentityStr);
 
     const pathParam = window.location.pathname.substring(
       "/confirm-gift/".length,
@@ -480,7 +472,7 @@ export default class ClaimView extends Vue {
     let claimId;
     if (pathParam) {
       claimId = decodeURIComponent(pathParam);
-      await this.loadClaim(claimId, this.activeDid);
+      await this.loadClaim(claimId, identity);
     } else {
       this.$notify(
         {
@@ -496,8 +488,6 @@ export default class ClaimView extends Vue {
     // When Chrome compatibility is fixed https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
     // then use this truer check: navigator.canShare && navigator.canShare()
     this.canShare = !!navigator.share;
-
-    this.isLoading = false;
   }
 
   // insert a space before any capital letters except the initial letter
@@ -529,6 +519,33 @@ export default class ClaimView extends Vue {
     );
   }
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+    return headers;
+  }
+
   // Isn't there a better way to make this available to the template?
   didInfo(did: string | undefined) {
     return serverUtil.didInfo(
@@ -539,14 +556,14 @@ export default class ClaimView extends Vue {
     );
   }
 
-  async loadClaim(claimId: string, userDid: string) {
+  async loadClaim(claimId: string, identity: IIdentifier) {
     const urlPath = libsUtil.isGlobalUri(claimId)
       ? "/api/claim/byHandle/"
       : "/api/claim/";
     const url = this.apiServer + urlPath + encodeURIComponent(claimId);
 
     try {
-      const headers = await serverUtil.getHeaders(userDid);
+      const headers = await this.getHeaders(identity);
       const resp = await this.axios.get(url, { headers });
       // resp.data is:
       // - a Jwt from https://api.endorser.ch/api-docs/
@@ -586,7 +603,7 @@ export default class ClaimView extends Vue {
         this.apiServer +
         "/api/v2/report/gives?handleId=" +
         encodeURIComponent(this.veriClaim.handleId as string);
-      const giveHeaders = await serverUtil.getHeaders(userDid);
+      const giveHeaders = await this.getHeaders(identity);
       const giveResp = await this.axios.get(giveUrl, {
         headers: giveHeaders,
       });
@@ -604,12 +621,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?";
@@ -650,8 +661,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 +=
@@ -664,19 +674,15 @@ export default class ClaimView extends Vue {
         this.apiServer +
         "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
         encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-      const confirmHeaders = await serverUtil.getHeaders(userDid);
+      const confirmHeaders = await this.getHeaders(identity);
       const response = await this.axios.get(confirmUrl, {
         headers: confirmHeaders,
       });
       if (response.status === 200) {
         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;
@@ -741,7 +747,7 @@ export default class ClaimView extends Vue {
     };
     const result = await serverUtil.createAndSubmitClaim(
       confirmationClaim,
-      this.activeDid,
+      await this.getIdentity(this.activeDid),
       this.apiServer,
       this.axios,
     );
@@ -773,12 +779,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);
+      await this.loadClaim(claimId, JSON.parse(this.accountIdentityStr));
     });
   }
 
+  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)
@@ -796,17 +814,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",
@@ -822,11 +830,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",
@@ -836,7 +844,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

@@ -55,7 +55,7 @@
             {{ new Date(record.issuedAt).toLocaleString() }}
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid == contact?.did">
+            <span v-if="record.agentDid == contact.did">
               <div class="font-bold">
                 {{ displayAmount(record.unit, record.amount) }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
@@ -71,7 +71,7 @@
             </span>
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid == contact?.did">
+            <span v-if="record.agentDid == contact.did">
               <fa icon="arrow-left" class="text-slate-400 fa-fw" />
             </span>
             <span v-else>
@@ -79,7 +79,7 @@
             </span>
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid != contact?.did">
+            <span v-if="record.agentDid != contact.did">
               <div class="font-bold">
                 {{ displayAmount(record.unit, record.amount) }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
@@ -105,20 +105,21 @@
 </template>
 
 <script lang="ts">
-import { AxiosError, AxiosRequestHeaders } from "axios";
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import {
   AgreeVerifiableCredential,
-  createEndorserJwtVcFromClaim,
   displayAmount,
-  getHeaders,
   GiveSummaryRecord,
   GiveVerifiableCredential,
   SCHEMA_ORG_CONTEXT,
@@ -141,12 +142,38 @@ export default class ContactAmountssView extends Vue {
     this.numAccounts = await accountsDB.accounts.count();
   }
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async created() {
     try {
-      const contactDid = (this.$route as Router).query["contactDid"] as string;
+      await db.open();
+      const contactDid = this.$route.query.contactDid as string;
       this.contact = (await db.contacts.get(contactDid)) || null;
 
-      const settings = await retrieveSettingsForActiveAccount();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
       this.activeDid = settings?.activeDid || "";
       this.apiServer = settings?.apiServer || "";
 
@@ -172,14 +199,15 @@ export default class ContactAmountssView extends Vue {
 
   async loadGives(activeDid: string, contact: Contact) {
     try {
+      const identity = await this.getIdentity(this.activeDid);
       let result: Array<GiveSummaryRecord> = [];
       const url =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
-        encodeURIComponent(this.activeDid) +
+        encodeURIComponent(identity.did) +
         "&recipientDid=" +
         encodeURIComponent(contact.did);
-      const headers = await getHeaders(activeDid);
+      const headers = await this.getHeaders(identity);
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         result = resp.data.data;
@@ -205,8 +233,8 @@ export default class ContactAmountssView extends Vue {
         "/api/v2/report/gives?agentDid=" +
         encodeURIComponent(contact.did) +
         "&recipientDid=" +
-        encodeURIComponent(this.activeDid);
-      const headers2 = await getHeaders(activeDid);
+        encodeURIComponent(identity.did);
+      const headers2 = await this.getHeaders(identity);
       const resp2 = await this.axios.get(url2, { headers: headers2 });
       if (resp2.status === 200) {
         result = R.concat(result, resp2.data.data);
@@ -261,44 +289,66 @@ export default class ContactAmountssView extends Vue {
       object: origClaim,
     };
 
-    const vcJwt: string = await createEndorserJwtVcFromClaim(
-      this.activeDid,
-      vcClaim,
-    );
+    // Make a payload for the claim
+    const vcPayload = {
+      vc: {
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
+        type: ["VerifiableCredential"],
+        credentialSubject: vcClaim,
+      },
+    };
 
-    // 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;
+    // Create a signature using private key of identity
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity.keys[0].privateKeyHex !== null) {
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      const privateKeyHex: string = identity.keys[0].privateKeyHex!;
+      const signer = await SimpleSigner(privateKeyHex);
+      const alg = undefined;
+      // Create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(vcPayload, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
 
-    try {
-      const resp = await this.axios.post(url, payload, { headers });
-      if (resp.data?.success) {
-        record.amountConfirmed =
-          (origClaim.object?.amountOfThisGood as number) || 1;
-      }
-    } catch (error) {
-      let userMessage = "There was an error. See logs for more info.";
-      const serverError = error as AxiosError;
-      if (serverError) {
-        if (serverError.message) {
-          userMessage = serverError.message; // Info for the user
-        } else {
-          userMessage = JSON.stringify(serverError.toJSON());
+      // Make the xhr request payload
+      const payload = JSON.stringify({ jwtEncoded: vcJwt });
+      const url = this.apiServer + "/api/v2/claim";
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };
+
+      try {
+        const resp = await this.axios.post(url, payload, { headers });
+        if (resp.data?.success) {
+          record.amountConfirmed = origClaim.object?.amountOfThisGood || 1;
         }
-      } else {
-        userMessage = error as string;
+      } catch (error) {
+        let userMessage = "There was an error. See logs for more info.";
+        const serverError = error as AxiosError;
+        if (serverError) {
+          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: "Error With Server",
+            text: userMessage,
+          },
+          -1,
+        );
       }
-      // Now set that error for the user to see.
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error With Server",
-          text: userMessage,
-        },
-        -1,
-      );
     }
   }
 

src/views/ContactGiftingView.vue

@@ -11,7 +11,8 @@
           class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
           ><fa icon="chevron-left" class="fa-fw"></fa
         ></router-link>
-        Given by...
+
+        Give to Contacts
       </h1>
     </div>
 
@@ -71,15 +72,18 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
+import { IIdentifier } from "@veramo/core";
 
 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, retrieveSettingsForActiveAccount } from "@/db/index";
+import { db, accountsDB } from "@/db/index";
+import { Account, AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
-import { GiverReceiverInputInfo } from "@/libs/util";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
+import { GiverReceiverInputInfo } from "@/libs/endorserServer";
 
 @Component({
   components: { GiftedDialog, QuickNav, EntityIcon },
@@ -90,15 +94,19 @@ export default class ContactGiftingView extends Vue {
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
-  description = "";
-  projectId = "";
-  prompt = "";
+  accounts: typeof AccountsSchema;
+  projectId = localStorage.getItem("projectId") || "";
+
+  async beforeCreate() {
+    accountsDB.open();
+  }
 
   async created() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.apiServer = settings?.apiServer || "";
+      this.activeDid = settings?.activeDid || "";
 
       // .orderBy("name") wouldn't retrieve any entries with a blank name
       // .toCollection.sortBy("name") didn't sort in an order I understood
@@ -107,9 +115,7 @@ export default class ContactGiftingView extends Vue {
         (a.name || "").localeCompare(b.name || ""),
       );
 
-      this.projectId = (this.$route as Router).query["projectId"] || "";
-
-      this.prompt = (this.$route as Router).query["prompt"] ?? this.prompt;
+      localStorage.removeItem("projectId");
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
@@ -128,7 +134,32 @@ export default class ContactGiftingView extends Vue {
     }
   }
 
-  openDialog(giver?: GiverReceiverInputInfo) {
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
+  openDialog(giver: GiverReceiverInputInfo) {
     const recipient = this.projectId
       ? undefined
       : { did: this.activeDid, name: "you" };
@@ -137,7 +168,6 @@ export default class ContactGiftingView extends Vue {
       recipient,
       undefined,
       "Given by " + (giver?.name || "someone not named"),
-      this.prompt,
     );
   }
 }

src/views/ContactImportView.vue

@@ -1,235 +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 class="flex justify-center">
-      <input type="checkbox" v-model="makeVisible" class="mr-2" />
-      Make my activity visible to these 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, retrieveSettingsForActiveAccount } 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";
-import { setVisibilityUtil } from "@/libs/endorserServer";
-
-@Component({
-  components: { EntityIcon, OfferDialog, QuickNav },
-})
-export default class ContactImportView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  AppString = AppString;
-  libsUtil = libsUtil;
-  R = R;
-
-  activeDid = "";
-  apiServer = "";
-  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;
-  makeVisible = true;
-  sameCount = 0;
-
-  async created() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
-
-    // 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++;
-        }
-      }
-    }
-    if (this.makeVisible) {
-      const failedVisibileToContacts = [];
-      for (let i = 0; i < this.contactsImporting.length; i++) {
-        const contact = this.contactsImporting[i];
-        if (contact) {
-          const visResult = await setVisibilityUtil(
-            this.activeDid,
-            this.apiServer,
-            this.axios,
-            db,
-            contact,
-            true,
-          );
-          if (!visResult.success) {
-            failedVisibileToContacts.push(contact);
-          }
-        }
-      }
-      if (failedVisibileToContacts.length) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Visibility Error",
-            text: `Failed to set visibility for ${failedVisibileToContacts.length} contact${
-              failedVisibileToContacts.length == 1 ? "" : "s"
-            }. You must set them individually: ${failedVisibileToContacts.map((c) => c.name).join(", ")}`,
-          },
-          -1,
-        );
-      }
-    }
-
-    this.importing = false;
-
-    this.$notify(
-      {
-        group: "alert",
-        type: "success",
-        title: "Imported",
-        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 -->
@@ -24,24 +24,16 @@
       >
         <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
-      @click="onCopyUrlToClipboard()"
-      v-if="activeDid && activeDid.startsWith(ETHR_DID_PREFIX)"
-      class="text-center"
-    >
+    <div @click="onCopyToClipboard()" v-if="activeDid" class="text-center">
       <!--
         Play with display options: https://qr-code-styling.com/
         See docs: https://www.npmjs.com/package/qr-code-generator-vue3
@@ -52,18 +44,8 @@
         :dotsOptions="{ type: 'square' }"
         class="flex justify-center"
       />
-      <span>
-        Click the QR code to copy your contact info to your clipboard.
-      </span>
-    </div>
-    <div v-else-if="activeDid" class="text-center">
-      <!-- Not an ETHR DID so force them to paste it. (Passkey Peer DIDs are too big.) -->
-      <span @click="onCopyDidToClipboard()" class="text-blue-500">
-        Click here to copy your DID to your clipboard.
-      </span>
-      <span>
-        Then give it to them so they can paste it in their list of People.
-      </span>
+      <span> Click that QR to copy your contact URL to your clipboard. </span>
+      <div>Not scanning? Show it in pieces.</div>
     </div>
     <div class="text-center" v-else>
       You have no identitifiers yet, so
@@ -90,7 +72,7 @@
 
 <script lang="ts">
 import { AxiosError } from "axios";
-import { Buffer } from "buffer/";
+import * as didJwt from "did-jwt";
 import { sha256 } from "ethereum-cryptography/sha256.js";
 import QRCodeVue3 from "qr-code-generator-vue3";
 import * as R from "ramda";
@@ -99,33 +81,32 @@ 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, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import {
   deriveAddress,
   getContactPayloadFromJwtUrl,
   nextDerivationPath,
+  SimpleSigner,
 } from "@/libs/crypto";
 import {
   CONTACT_URL_PREFIX,
-  createEndorserJwtForDid,
   ENDORSER_JWT_URL_LOCATION,
-  generateEndorserJwtForAccount,
   isDid,
   register,
   setVisibilityUtil,
 } from "@/libs/endorserServer";
-import { ETHR_DID_PREFIX } from "@/libs/crypto/vc";
+
+import { Buffer } from "buffer/";
 
 @Component({
   components: {
     QrcodeStream,
     QRCodeVue3,
     QuickNav,
-    UserNameDialog,
   },
 })
 export default class ContactQRScanShow extends Vue {
@@ -138,62 +119,56 @@ export default class ContactQRScanShow extends Vue {
   isRegistered = false;
   qrValue = "";
 
-  ETHR_DID_PREFIX = ETHR_DID_PREFIX;
-
   async created() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
-    this.givenName = settings.firstName || "";
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.activeDid = (settings?.activeDid as string) || "";
+    this.apiServer = (settings?.apiServer as string) || "";
+    this.givenName = (settings?.firstName as string) || "";
     this.hideRegisterPromptOnNewContact =
-      !!settings.hideRegisterPromptOnNewContact;
-    this.isRegistered = !!settings.isRegistered;
+      !!settings?.hideRegisterPromptOnNewContact;
+    this.isRegistered = !!settings?.isRegistered;
 
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === this.activeDid, accounts);
     if (account) {
-      const publicKeyHex = account.publicKeyHex;
+      const identity = await this.getIdentity(this.activeDid);
+      const publicKeyHex = identity.keys[0].publicKeyHex;
       const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
 
+      const newDerivPath = nextDerivationPath(account.derivationPath);
+      const nextPublicHex = deriveAddress(account.mnemonic, newDerivPath)[2];
+      const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
+      const nextPublicEncKeyHash = sha256(nextPublicEncKey);
+      const nextPublicEncKeyHashBase64 =
+        Buffer.from(nextPublicEncKeyHash).toString("base64");
+
       const contactInfo = {
         iat: Date.now(),
         iss: this.activeDid,
         own: {
           name:
-            (settings.firstName || "") +
-            (settings.lastName ? ` ${settings.lastName}` : ""), // lastName is deprecated, pre v 0.1.3
+            (settings?.firstName || "") +
+            (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
           publicEncKey,
-          profileImageUrl: settings.profileImageUrl,
-          registered: settings.isRegistered,
+          nextPublicEncKeyHash: nextPublicEncKeyHashBase64,
+          profileImageUrl: settings?.profileImageUrl,
+          registered: settings?.isRegistered,
         },
       };
 
-      if (account?.mnemonic && account?.derivationPath) {
-        const newDerivPath = nextDerivationPath(account.derivationPath);
-        const nextPublicHex = deriveAddress(account.mnemonic, 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(this.activeDid, contactInfo);
-
+      const alg = undefined;
+      const privateKeyHex: string = identity.keys[0].privateKeyHex;
+      const signer = await SimpleSigner(privateKeyHex);
+      // create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(contactInfo, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
       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,
-      );
+      this.qrValue = viewPrefix + vcJwt;
     }
   }
 
@@ -209,6 +184,23 @@ export default class ContactQRScanShow extends Vue {
     );
   }
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    const account: Account | undefined = R.find(
+      (acc) => acc.did === activeDid,
+      accounts,
+    );
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to show contact info with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
   /**
    *
    * @param content is the result of a QR scan, an array with one item with a rawValue property
@@ -289,7 +281,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;
@@ -297,7 +289,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;
@@ -441,7 +433,7 @@ export default class ContactQRScanShow extends Vue {
     );
   }
 
-  onCopyUrlToClipboard() {
+  onCopyToClipboard() {
     //this.onScanDetect([{ rawValue: this.qrValue }]); // good for testing
     useClipboard()
       .copy(this.qrValue)
@@ -458,22 +450,5 @@ export default class ContactQRScanShow extends Vue {
         );
       });
   }
-
-  onCopyDidToClipboard() {
-    //this.onScanDetect([{ rawValue: this.qrValue }]); // good for testing
-    useClipboard()
-      .copy(this.activeDid)
-      .then(() => {
-        this.$notify(
-          {
-            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.",
-          },
-          5000,
-        );
-      });
-  }
 }
 </script>

src/views/DIDView.vue

@@ -19,119 +19,37 @@
     </div>
 
     <!-- Identity Details -->
-    <div
-      v-if="!!contactFromDid"
-      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>
         <h2 class="text-xl font-semibold">
-          {{ contactFromDid?.name || "(no name)" }}
-          <button
-            @click="
-              contactEdit = true;
-              contactNewName = (contactFromDid?.name as string) || '';
-            "
-            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="contactFromDid?.profileImageUrl"
-          class="flex justify-between"
-        >
+        <span v-if="contact?.profileImageUrl" class="flex justify-between">
           <EntityIcon
             :icon-size="96"
-            :profileImageUrl="contactFromDid?.profileImageUrl"
+            :profileImageUrl="contact?.profileImageUrl"
             class="inline-block align-text-bottom border border-slate-300 rounded"
-            @click="showLargeIdenticonUrl = contactFromDid?.profileImageUrl"
+            @click="showLargeIdenticonUrl = contact?.profileImageUrl"
           />
         </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="
-                  contactFromDid?.seesMe && contactFromDid.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(contactFromDid, false)"
-                title="They can see you"
-              >
-                <fa icon="eye" class="fa-fw" />
-              </button>
-              <button
-                v-else-if="
-                  !contactFromDid?.seesMe && contactFromDid?.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(contactFromDid, 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(contactFromDid)"
-                title="Check Visibility"
-                v-if="contactFromDid?.did !== activeDid"
-              >
-                <fa icon="rotate" class="fa-fw" />
-              </button>
-            </div>
-
-            <button
-              @click="confirmRegister(contactFromDid)"
-              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="contactFromDid?.did !== activeDid"
-              title="Registration"
-            >
-              <fa
-                v-if="contactFromDid?.registered"
-                icon="person-circle-check"
-                class="fa-fw"
-              />
-              <fa v-else icon="person-circle-question" class="fa-fw" />
-            </button>
-          </div>
-
-          <button
-            @click="confirmDeleteContact(contactFromDid)"
-            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="!contactFromDid?.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
@@ -154,41 +72,6 @@
         </div>
       </div>
     </div>
-    <div v-else class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <!-- !contactFromDid -->
-      <div>
-        <h2 class="text-xl font-semibold">
-          {{ isMyDid ? "You" : "(no name)" }}
-        </h2>
-      </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
@@ -222,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>
@@ -235,38 +121,31 @@
       v-if="!isLoading && claims.length === 0"
       class="flex justify-center mt-4"
     >
-      <span v-if="isMyDid">You have no claims yet.</span>
-      <span v-else>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";
 import TopMessage from "@/components/TopMessage.vue";
 import { NotificationIface } from "@/constants/app";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
-import { BoundingBox } from "@/db/tables/settings";
+import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   capitalizeAndInsertSpacesBeforeCaps,
   didInfoForContact,
   displayAmount,
-  getHeaders,
   GenericCredWrapper,
   GenericVerifiableCredential,
   GiveVerifiableCredential,
   OfferVerifiableCredential,
-  register,
-  setVisibilityUtil,
 } from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
 import EntityIcon from "@/components/EntityIcon.vue";
 
 @Component({
@@ -280,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>> = [];
-  contactFromDid?: Contact;
-  contactEdit = false;
-  contactNewName: string = "";
-  contactYaml = "";
+  claims: Array<GenericCredWrapper> = [];
+  contact?: Contact;
   hitEnd = false;
   isLoading = false;
-  isMyDid = false;
   searchBox: { name: string; bbox: BoundingBox } | null = null;
-  showDidDetails = false;
   showLargeIdenticonId?: string;
   showLargeIdenticonUrl?: string;
   viewingDid?: string;
@@ -304,28 +176,55 @@ export default class DIDView extends Vue {
   displayAmount = displayAmount;
 
   async mounted() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.activeDid = (settings?.activeDid as string) || "";
+    this.apiServer = (settings?.apiServer as string) || "";
 
     const pathParam = window.location.pathname.substring("/did/".length);
     if (pathParam) {
       this.viewingDid = decodeURIComponent(pathParam);
-      this.contactFromDid = await db.contacts.get(this.viewingDid);
-      if (this.contactFromDid) {
-        this.contactYaml = yaml.dump(this.contactFromDid);
-      }
+      this.contact = await db.contacts.get(this.viewingDid);
       await this.loadClaimsAbout();
+    } else {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "No claim ID was provided.",
+        },
+        -1,
+      );
+    }
 
+    await accountsDB.open();
+    const allAccounts = await accountsDB.accounts.toArray();
+    this.allMyDids = allAccounts.map((acc) => acc.did);
+  }
+
+  public async buildHeaders(): Promise<HeadersInit> {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    if (this.activeDid) {
       await accountsDB.open();
       const allAccounts = await accountsDB.accounts.toArray();
-      for (const account of allAccounts) {
-        if (account.did === this.viewingDid) {
-          this.isMyDid = true;
-          break;
-        }
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
+      const identity = JSON.parse((account?.identity as string) || "null");
+
+      if (!identity) {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
       }
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
+    } else {
+      // it's OK without auth... we just won't get any identifiers
     }
+    return headers;
   }
 
   /**
@@ -338,133 +237,6 @@ export default class DIDView extends Vue {
     }
   }
 
-  // prompt with confirmation if they want to delete a contact
-  confirmDeleteContact(contact: Contact) {
-    let message =
-      "Are you sure you want to remove " +
-      libsUtil.nameForContact(contact, false) +
-      " from your contact list?";
-    if (contact.seesMe) {
-      message +=
-        " Note that they can see your activity, so if you want to hide your activity from them then you should do that first.";
-    }
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Delete",
-        text: message,
-        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.contactFromDid, 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.");
@@ -483,7 +255,7 @@ export default class DIDView extends Vue {
         this.apiServer + "/api/v2/report/claims?" + queryParams + postfix,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -527,7 +299,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) {
@@ -561,190 +333,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) {
-    if (!this.contactFromDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Not A Contact",
-          text: "First add this on the contact page, then you can edit here.",
-        },
-        5000,
-      );
-      return;
-    }
-    this.contactFromDid.name = newName;
-    return db.contacts
-      .update(this.contactFromDid.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"
@@ -93,16 +89,10 @@
     >
       <fa icon="spinner" class="fa-spin-pulse"></fa>
     </div>
-    <div v-else-if="projects.length === 0" class="text-center mt-8">
-      <p class="text-lg text-slate-500">
-        No projects were found with that search.
-        <span v-if="isLocalActive">Try looking Anywhere.</span>
-      </p>
-    </div>
 
     <!-- Results List -->
     <InfiniteScroll @reached-bottom="loadMoreData">
-      <ul id="listDiscoverResults">
+      <ul>
         <li
           class="border-b border-slate-300"
           v-for="project in projects"
@@ -139,17 +129,17 @@
 
 <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";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import TopMessage from "@/components/TopMessage.vue";
 import { NotificationIface } from "@/constants/app";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
-import { BoundingBox } from "@/db/tables/settings";
-import { didInfo, getHeaders, PlanData } from "@/libs/endorserServer";
+import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
+import { didInfo, PlanData } from "@/libs/endorserServer";
 
 @Component({
   components: {
@@ -179,10 +169,11 @@ export default class DiscoverView extends Vue {
   didInfo = didInfo;
 
   async mounted() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = (settings.activeDid as string) || "";
-    this.apiServer = (settings.apiServer as string) || "";
-    this.searchBox = settings.searchBoxes?.[0] || null;
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.activeDid = (settings?.activeDid as string) || "";
+    this.apiServer = (settings?.apiServer as string) || "";
+    this.searchBox = settings?.searchBoxes?.[0] || null;
 
     this.allContacts = await db.contacts.toArray();
 
@@ -190,8 +181,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 {
@@ -214,6 +203,30 @@ export default class DiscoverView extends Vue {
     }
   }
 
+  public async buildHeaders(): Promise<HeadersInit> {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    if (this.activeDid) {
+      await accountsDB.open();
+      const allAccounts = await accountsDB.accounts.toArray();
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
+      const identity = JSON.parse(account?.identity || "null");
+
+      if (!identity) {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
+      }
+
+      headers["Authorization"] = "Bearer " + (await accessToken(identity));
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
   public async searchAll(beforeId?: string) {
     this.resetCounts();
 
@@ -234,7 +247,7 @@ export default class DiscoverView extends Vue {
         this.apiServer + "/api/v2/report/plans?" + queryParams,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -276,8 +289,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",
@@ -326,7 +337,7 @@ export default class DiscoverView extends Vue {
         this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
         {
           method: "GET",
-          headers: await getHeaders(this.activeDid),
+          headers: await this.buildHeaders(),
         },
       );
 
@@ -404,10 +415,11 @@ export default class DiscoverView extends Vue {
    * @param id of the project
    **/
   onClickLoadProject(id: string) {
+    localStorage.setItem("projectId", id);
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   public computedLocalTabStyleClassNames() {

src/views/GiftedDetails.vue

@@ -21,17 +21,8 @@
     <h1 class="text-4xl text-center font-light px-4 mb-4">What Was Given</h1>
 
     <h1 class="text-xl font-bold text-center mb-4">
-      <span>From {{ giverName || "someone not named" }}</span>
-      <span>
-        to
-        {{
-          givenToProject
-            ? projectName
-            : givenToRecipient
-              ? recipientName
-              : "someone unidentified"
-        }}</span
-      >
+      <span>From {{ giverName || "somebody not named" }}</span>
+      <span> to {{ recipientName || "somebody not named" }}</span>
     </h1>
     <textarea
       class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
@@ -64,9 +55,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
@@ -87,7 +78,7 @@
 
     <div class="h-7 mt-4 flex">
       <input
-        v-if="projectId && !givenToRecipient"
+        v-if="projectId && !givenToUser"
         type="checkbox"
         class="h-6 w-6 mr-2"
         v-model="givenToProject"
@@ -109,24 +100,20 @@
 
     <div class="h-7 mt-4 flex">
       <input
-        v-if="recipientDid && !givenToProject"
+        v-if="!givenToProject"
         type="checkbox"
         class="h-6 w-6 mr-2"
-        v-model="givenToRecipient"
+        v-model="givenToUser"
       />
       <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()"
+        @click="
+          notifyUser('You cannot assign this both a project and also to you.')
+        "
       />
-      <label class="text-sm mt-1">
-        {{
-          recipientDid
-            ? "This was given to " + recipientName
-            : "No recipient was chosen."
-        }}
-      </label>
+      <label class="text-sm mt-1">This was given to you</label>
     </div>
 
     <div class="mt-4 flex">
@@ -134,20 +121,6 @@
       <label class="text-sm mt-1">This was a trade (not a gift)</label>
     </div>
 
-    <div v-if="showGeneralAdvanced" class="mt-4 flex">
-      <router-link
-        :to="{
-          name: 'claim-add-raw',
-          query: {
-            claim: constructGiveParam(),
-          },
-        }"
-        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
@@ -175,25 +148,16 @@
 
 <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";
 import TopMessage from "@/components/TopMessage.vue";
 import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
-import {
-  createAndSubmitGive,
-  didInfo,
-  editAndSubmitGive,
-  GenericCredWrapper,
-  getHeaders,
-  getPlanFromCache,
-  GiveVerifiableCredential,
-  hydrateGive,
-} from "@/libs/endorserServer";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { createAndSubmitGive, getPlanFromCache } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
-import { Contact } from "@/db/tables/contacts";
+import { accessToken } from "@/libs/crypto";
 
 @Component({
   components: {
@@ -210,9 +174,9 @@ export default class GiftedDetails extends Vue {
 
   amountInput = "0";
   description = "";
-  destinationPathAfter = "";
+  destinationNameAfter = "";
   givenToProject = false;
-  givenToRecipient = false;
+  givenToUser = false;
   giverDid: string | undefined;
   giverName = "";
   hideBackButton = false;
@@ -220,142 +184,68 @@ export default class GiftedDetails extends Vue {
   isTrade = false;
   message = "";
   offerId = "";
-  prevCredToEdit?: GenericCredWrapper<GiveVerifiableCredential>;
   projectId = "";
   projectName = "a project";
   recipientDid = "";
   recipientName = "";
-  showGeneralAdvanced = false;
+  showGivenToUser = false;
   unitCode = "HUR";
 
   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 {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+      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.giverDid && !this.giverName) ||
-        (this.recipientDid && !this.recipientName)
-      ) {
-        allContacts = await db.contacts.toArray();
-
-        await accountsDB.open();
-        const allAccounts = await accountsDB.accounts.toArray();
-        allMyDids = allAccounts.map((acc) => acc.did);
-        if (this.giverDid && !this.giverName) {
-          this.giverName = didInfo(
-            this.giverDid,
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
-        }
-        if (this.recipientDid && !this.recipientName) {
-          this.recipientName = didInfo(
-            this.recipientDid,
-            this.activeDid,
-            allMyDids,
-            allContacts,
-          );
-        }
+      if (this.giverDid && !this.giverName) {
+        this.giverName =
+          this.giverDid === this.activeDid ? "you" : "someone not named";
+      }
+      this.givenToUser = this.recipientDid === this.activeDid;
+      if (this.recipientDid && !this.recipientName) {
+        this.recipientName =
+          this.recipientDid === this.activeDid ? "you" : "someone not named";
       }
-      // these should be functions but something's wrong with the syntax in the <> conditional
       this.givenToProject = !!this.projectId;
-      this.givenToRecipient = !this.givenToProject && !!this.recipientDid;
-
-      this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
+      this.givenToUser =
+        !this.projectId && this.recipientDid === this.activeDid;
 
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
@@ -373,12 +263,14 @@ export default class GiftedDetails extends Vue {
 
     if (this.projectId) {
       // console.log("Getting project name from cache", this.projectId);
+      const identity = await libsUtil.getIdentity(this.activeDid);
       const project = await getPlanFromCache(
         this.projectId,
+        identity,
         this.axios,
         this.apiServer,
-        this.activeDid,
       );
+      console.log("Got project name from cache", project);
       this.projectName = project?.name
         ? "the project: " + project.name
         : "a project";
@@ -404,16 +296,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() {
@@ -440,12 +332,17 @@ export default class GiftedDetails extends Vue {
       return;
     }
     try {
-      const headers = await getHeaders(this.activeDid);
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const token = await accessToken(identity);
       const response = await this.axios.delete(
         DEFAULT_IMAGE_API_SERVER +
           "/image/" +
           encodeURIComponent(this.imageUrl),
-        { headers },
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
       );
       if (response.status === 204) {
         // don't bother with a notification
@@ -545,6 +442,18 @@ export default class GiftedDetails extends Vue {
     await this.recordGive();
   }
 
+  notifyUser(message: string) {
+    this.$notify(
+      {
+        group: "alert",
+        type: "warning",
+        title: "Error",
+        text: message,
+      },
+      3000,
+    );
+  }
+
   notifyUserOfProject() {
     if (!this.projectId) {
       this.$notify(
@@ -552,43 +461,18 @@ 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,
       );
     } else {
-      // must be because givenToRecipient is true
+      // must be because givenToUser 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 givenToProject is true
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Error",
-          text: "You cannot assign both to a recipient and to a project.",
+          text: "You cannot assign both to a project and to yourself.",
         },
         3000,
       );
@@ -604,44 +488,28 @@ export default class GiftedDetails extends Vue {
    */
   public async recordGive() {
     try {
-      const recipientDid = this.givenToRecipient
-        ? this.recipientDid
-        : undefined;
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const recipientDid =
+        this.recipientDid === this.activeDid
+          ? this.givenToUser
+            ? this.activeDid
+            : undefined
+          : this.recipientDid;
       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,
+        identity,
+        this.giverDid,
+        recipientDid,
+        this.description,
+        parseFloat(this.amountInput),
+        this.unitCode,
+        projectId,
+        this.offerId,
+        this.isTrade,
+        this.imageUrl,
+      );
 
       if (
         result.type === "error" ||
@@ -669,10 +537,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
@@ -694,26 +562,6 @@ 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,
-      this.giverDid,
-      recipientDid,
-      this.description,
-      parseFloat(this.amountInput),
-      this.unitCode,
-      projectId,
-      this.offerId,
-      this.isTrade,
-      this.imageUrl,
-      this.prevCredToEdit?.id as string,
-    );
-    const claimStr = JSON.stringify(giveClaim);
-    return claimStr;
-  }
-
   // Helper functions for readability
 
   /**

src/views/HelpOnboardingView.vue

@@ -50,8 +50,7 @@
       <h1 class="font-bold text-xl">Discuss Backups</h1>
       <div>
         <p>
-          8) Exporting backups <fa icon="circle-user" /> are important if they lose their phone
-          --- especially for the Identifier Seed!
+          8) Exporting backups <fa icon="circle-user" /> are important if they lose their phone --- especially for the Identifier Seed!
         </p>
       </div>
 

src/views/HelpView.vue

@@ -21,197 +21,52 @@
       </h1>
     </div>
 
-    <!-- eslint-disable prettier/prettier max-len -->
+    <!-- eslint-disable prettier/prettier -->
     <div>
       <p>
-        This app focuses on gifts & gratitude, using them to build cool things together with your network.
+        This app is a window into data that you and your friends own, focused on
+        gifts and collaboration.
       </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
-        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
+        We are building networks of people who want to grow a giving society.
+        First of all, you can see what people have given, and also recognize
+        gifts you've seen, in a way that leaves a permanent record -- one that
+        came from you, and 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.
-      </p>
-      <p>
-        The day after being registered, you'll be able to able to register others, too.
-        Note that there are limits to how many others you can register.
-        Take your time to bring people on... make it an opportunity to get to
-        know their projects, and to show off your own.
-      </p>
-
-      <h2 class="text-xl font-semibold">How do I add someone else?</h2>
-      <p>
-        <a href="/help-onboarding" target="_blank" class="text-blue-500">
-          Use these instructions.
-        </a>
-        To start scanning, go to the
-        <router-link class="text-blue-500" to="/contact-qr">contact-scanning page.</router-link>
-      </p>
-      <p>
-        If they are not nearby to scan QR codes, you each can tap on the QR code
-        and paste it into the text box on the Contacts <fa icon="users" class="fa-fw" /> page.
+        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">
@@ -221,13 +76,29 @@
       <p>
         Go
         <router-link class="text-blue-500" to="/import-account">import your identifier</router-link>.
+        If you don't want the old one, click "Advanced" and check the box to erase it.
+        (The erase option only shows if you have exactly one identifier.
+         For more in-depth surgery, you'll have to erase data from the browser or reinstall.)
+      </p>
+
+      <h2 class="text-xl font-semibold">How do I add someone else?</h2>
+      <p>
+        <a href="/help-onboarding" target="_blank" class="text-blue-500">
+          Use these instructions.
+        </a>
+        To start scanning, go
+        <router-link class="text-blue-500" to="/contact-qr">here.</router-link>
+      </p>
+      <p>
+        If they are not nearby to scan QR codes, you each can tap on the QR code
+        and paste it into the text box on the Contacts <fa icon="users" class="fa-fw" /> page.
       </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">
@@ -248,7 +119,7 @@
         </ul>
 
         <h2 class="text-xl font-semibold">
-          How do I backup my other private text data like settings & contacts?
+          How do I backup my non-secret, non-public text data?
         </h2>
         <ul class="list-disc list-outside ml-4">
           <li>
@@ -262,7 +133,7 @@
         </ul>
 
         <h2 class="text-xl font-semibold">
-          How do I backup my profile image?
+          How do I backup my non-secret, non-public image?
         </h2>
         <ul class="list-disc list-outside ml-4">
           <li>
@@ -272,7 +143,7 @@
         </ul>
 
         <h2 class="text-xl font-semibold">
-          How do I backup other data I've posted?
+          How do I backup my public data?
         </h2>
         <ul class="list-disc list-outside ml-4">
           <li>
@@ -309,21 +180,21 @@
           <li>
             Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page,
             click Advanced, and follow the instructions for the Contacts & Settings Database "Import".
-            Beware that this will erase your existing contact & settings.
           </li>
         </ul>
       </div>
 
       <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 +202,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>
@@ -472,7 +340,7 @@
 
       <h2 class="text-xl font-semibold">What are the terms & conditions and the privacy policy?</h2>
       <p style="display:inline; align-items: center">
-        This work is public domain. If you like rules, reference
+        This work is public domain, governed by
         <a href="http://creativecommons.org/publicdomain/zero/1.0?ref=chooser-v1" target="_blank" rel="license noopener noreferrer">
           <span class="text-blue-500 mr-1">CC0 1.0</span>
           <img
@@ -498,26 +366,6 @@
         </a>
       </p>
 
-      <h2 class="text-xl font-semibold">How can I contribute?</h2>
-      <p>
-        If you have skills, contact us below.
-        If you have Bitcoin, donate to
-        <button
-          @click="
-            doCopyTwoSecRedo(
-              'bc1q90v4ted6cpt63tjfh2lvd5xzfc67sd4g9w8xma',
-              () => (showDidCopy = !showDidCopy)
-            )
-          "
-          class="text-blue-500 ml-2"
-        >
-          bc1q90v4ted6cpt63tjfh2lvd5xzfc67sd4g9w8xma
-          <fa v-show="!showDidCopy" icon="copy" class="text-slate-400 fa-fw" />
-        </button>
-        <span v-show="showDidCopy" class="ml-2 text-sm text-green-500">Copied</span>
-        For other donations, contact us.
-      </p>
-
       <h2 class="text-xl font-semibold">Where can I read more?</h2>
       <p>
         This is part of the
@@ -531,7 +379,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, including removing all your data from the public ledger:
       </h2>
       <p>
         Contact us at
@@ -546,7 +394,6 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
 
 import * as Package from "../../package.json";
 import QuickNav from "@/components/QuickNav.vue";
@@ -558,20 +405,5 @@ 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) {
-    fn();
-    useClipboard()
-      .copy(text)
-      .then(() => setTimeout(fn, 2000));
-  }
 }
 </script>

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">
-      {{ AppString.APP_NAME }}
+    <h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-8">
+      Time Safari
     </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">
@@ -77,94 +77,91 @@
 
       <div v-else>
         <!-- !isCreatingIdentifier -->
-        <!-- They should have an identifier, even if it's an auto-generated one that they'll never use. -->
-        <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"
+        <div
+          v-if="!activeDid"
+          class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+        >
+          <p class="text-lg mb-3">
+            Want to connect with your contacts, or share contributions or
+            projects?
+          </p>
+          <router-link
+            :to="{ name: 'start' }"
+            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"
           >
-            <!-- !isCreatingIdentifier && !isRegistered -->
-            To share, someone must register you.
-            <div class="block text-center">
-              <button
-                @click="showNameThenIdDialog()"
-                class="text-md font-bold bg-gradient-to-b from-blue-400 to-blue-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white mt-2 px-2 py-3 rounded-md"
-              >
-                Show them {{ PASSKEYS_ENABLED ? "default" : "your" }} identifier
-                info
-              </button>
-            </div>
-            <UserNameDialog ref="userNameDialog" />
-            <div v-if="PASSKEYS_ENABLED" class="flex justify-end w-full">
-              <router-link
-                :to="{ name: 'start' }"
-                class="block text-right 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"
-              >
-                See all your options first
-              </router-link>
-            </div>
+            Create An Identifier
+          </router-link>
+        </div>
+
+        <div
+          v-else-if="!isRegistered"
+          class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+        >
+          <!-- activeDid && !isRegistered -->
+          Someone must register you before you can give kudos or make offers or
+          create projects... basically before doing anything.
+          <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 Your Identifier Info
+          </router-link>
+        </div>
+
+        <div v-else>
+          <!-- activeDid && isRegistered -->
+
+          <!-- show the actions for recognizing a give -->
+          <div class="mb-4">
+            <h2 class="text-xl font-bold">Record Something Given By:</h2>
           </div>
 
-          <div v-else id="sectionRecordSomethingGiven">
-            <!-- !isCreatingIdentifier && isRegistered -->
-
-            <!-- show the actions for recognizing a give -->
-            <div class="flex justify-between">
-              <h2 class="text-xl font-bold">Record Something Given By:</h2>
-              <div class="flex justify-end">
-                <button
-                  @click="openGiftedPrompts()"
-                  class="block text-center text-md bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-4 py-2 rounded-md"
-                >
-                  Ideas...
-                </button>
-              </div>
-            </div>
-
-            <ul
-              class="grid grid-cols-4 sm:grid-cols-5 md:grid-cols-6 gap-x-3 gap-y-5 text-center mt-4"
-            >
-              <li @click="openDialog()">
-                <img
-                  src="../assets/blank-square.svg"
-                  class="mx-auto border border-slate-300 rounded-md mb-1"
-                />
-                <h3
-                  class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-                >
-                  Unnamed/Unknown
-                </h3>
-              </li>
-              <li v-if="allContacts.length === 0" class="text-sm">
-                (Add contacts to see more people worthy of recognition.)
-              </li>
-              <li
-                v-for="contact in allContacts.slice(0, 6)"
-                :key="contact.did"
-                @click="openDialog(contact)"
+          <ul
+            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
+                src="../assets/blank-square.svg"
+                class="mx-auto border border-slate-300 rounded-md mb-1"
+              />
+              <h3
+                class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
               >
-                <EntityIcon
-                  :contact="contact"
-                  :iconSize="64"
-                  class="mx-auto border border-slate-300 rounded-md mb-1 cursor-pointer"
-                />
-                <h3
-                  class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-                >
-                  {{ 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>
+                Unnamed/Unknown
+              </h3>
+            </li>
+            <li
+              v-for="contact in allContacts.slice(0, 7)"
+              :key="contact.did"
+              @click="openDialog(contact)"
+            >
+              <EntityIcon
+                :contact="contact"
+                :iconSize="64"
+                class="mx-auto border border-slate-300 rounded-md mb-1 cursor-pointer"
+              />
+              <h3
+                class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
+              >
+                {{ contact.name || contact.did }}
+              </h3>
+            </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>
@@ -175,7 +172,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">
@@ -196,7 +193,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"
@@ -308,10 +305,10 @@
 
 <script lang="ts">
 import { UAParser } from "ua-parser-js";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
 import { Router } from "vue-router";
 
-import App from "../App.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import GiftedPrompts from "@/components/GiftedPrompts.vue";
@@ -319,38 +316,27 @@ 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,
-  PASSKEYS_ENABLED,
-} from "@/constants/app";
-import {
-  db,
-  accountsDB,
-  updateAccountSettings,
-  retrieveSettingsForActiveAccount,
-} from "@/db/index";
+import { NotificationIface } from "@/constants/app";
+import { db, accountsDB } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import {
   BoundingBox,
   isAnyFeedFilterOn,
   MASTER_SETTINGS_KEY,
+  Settings,
 } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   contactForDid,
   containsNonHiddenDid,
   didInfoForContact,
   fetchEndorserRateLimits,
-  getHeaders,
   getPlanFromCache,
+  GiverReceiverInputInfo,
   GiveSummaryRecord,
 } from "@/libs/endorserServer";
-import {
-  generateSaveAndActivateIdentity,
-  GiverReceiverInputInfo,
-  registerSaveAndActivatePasskey,
-} from "@/libs/util";
+import { generateSaveAndActivateIdentity } from "@/libs/util";
 
 interface GiveRecordWithContactInfo extends GiveSummaryRecord {
   giver: {
@@ -368,11 +354,6 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
 }
 
 @Component({
-  computed: {
-    App() {
-      return App;
-    },
-  },
   components: {
     GiftedDialog,
     GiftedPrompts,
@@ -381,15 +362,11 @@ interface GiveRecordWithContactInfo extends GiveSummaryRecord {
     EntityIcon,
     InfiniteScroll,
     TopMessage,
-    UserNameDialog,
   },
 })
 export default class HomeView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  AppString = AppString;
-  PASSKEYS_ENABLED = PASSKEYS_ENABLED;
-
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
@@ -397,7 +374,6 @@ export default class HomeView extends Vue {
   feedData: GiveRecordWithContactInfo[] = [];
   feedPreviousOldestId?: string;
   feedLastViewedClaimId?: string;
-  givenName = "";
   isAnyFeedFilterOn: boolean;
   isCreatingIdentifier = false;
   isFeedFilteredByVisible = false;
@@ -411,43 +387,65 @@ export default class HomeView extends Vue {
   showShortcutBvc = false;
   userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
 
+  public async getIdentity(activeDid: string): Promise<IIdentifier | null> {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+    return identity; // may be null
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async mounted() {
     try {
       await accountsDB.open();
       const allAccounts = await accountsDB.accounts.toArray();
-      if (allAccounts.length > 0) {
-        this.allMyDids = allAccounts.map((acc) => acc.did);
-      } else {
-        this.isCreatingIdentifier = true;
-        const newDid = await generateSaveAndActivateIdentity();
-        this.isCreatingIdentifier = false;
-        this.allMyDids = [newDid];
-      }
+      this.allMyDids = allAccounts.map((acc) => acc.did);
 
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer || "";
-      this.activeDid = settings.activeDid || "";
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.apiServer = settings?.apiServer || "";
+      this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
-      this.feedLastViewedClaimId = settings.lastViewedClaimId;
-      this.givenName = settings.firstName || "";
-      this.isFeedFilteredByVisible = !!settings.filterFeedByVisible;
-      this.isFeedFilteredByNearby = !!settings.filterFeedByNearby;
-      this.isRegistered = !!settings.isRegistered;
-      this.searchBoxes = settings.searchBoxes || [];
-      this.showShortcutBvc = !!settings.showShortcutBvc;
+      this.feedLastViewedClaimId = settings?.lastViewedClaimId;
+      this.isFeedFilteredByVisible = !!settings?.filterFeedByVisible;
+      this.isFeedFilteredByNearby = !!settings?.filterFeedByNearby;
+      this.isRegistered = !!settings?.isRegistered;
+      this.searchBoxes = settings?.searchBoxes || [];
+      this.showShortcutBvc = !!settings?.showShortcutBvc;
 
       this.isAnyFeedFilterOn = isAnyFeedFilterOn(settings);
 
-      // someone may have have registered after sharing contact info, so recheck
+      if (this.allMyDids.length === 0) {
+        this.isCreatingIdentifier = true;
+        this.activeDid = await generateSaveAndActivateIdentity();
+        this.allMyDids = [this.activeDid];
+        this.isCreatingIdentifier = false;
+      }
+
+      // someone may have have registered after sharing contact info
       if (!this.isRegistered && this.activeDid) {
+        const identity = await this.getIdentity(this.activeDid);
         try {
           const resp = await fetchEndorserRateLimits(
             this.apiServer,
             this.axios,
-            this.activeDid,
+            identity as IIdentifier,
           );
           if (resp.status === 200) {
-            await updateAccountSettings(this.activeDid, {
+            // we just needed to know that they're registered
+            await db.open();
+            db.settings.update(MASTER_SETTINGS_KEY, {
               isRegistered: true,
             });
             this.isRegistered = true;
@@ -458,7 +456,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) {
@@ -477,15 +475,6 @@ export default class HomeView extends Vue {
     }
   }
 
-  async generatePasskeyIdentifier() {
-    this.isCreatingIdentifier = true;
-    const account = await registerSaveAndActivatePasskey(
-      AppString.APP_NAME + (this.givenName ? " - " + this.givenName : ""),
-    );
-    this.activeDid = account.did;
-    this.allMyDids = this.allMyDids.concat(this.activeDid);
-    this.isCreatingIdentifier = false;
-  }
   resultsAreFiltered() {
     return this.isFeedFilteredByVisible || this.isFeedFilteredByNearby;
   }
@@ -494,28 +483,49 @@ export default class HomeView extends Vue {
     return "Notification" in window;
   }
 
+  public async buildHeaders() {
+    const headers: HeadersInit = {
+      "Content-Type": "application/json",
+    };
+
+    const identity = await this.getIdentity(this.activeDid);
+    if (this.activeDid) {
+      if (identity) {
+        headers["Authorization"] = "Bearer " + (await accessToken(identity));
+      } else {
+        throw new Error(
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+        );
+      }
+    } else {
+      // it's OK without auth... we just won't get any identifiers
+    }
+    return headers;
+  }
+
   // only called when a setting was changed
   async reloadFeedOnChange() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.isFeedFilteredByVisible = !!settings.filterFeedByVisible;
-    this.isFeedFilteredByNearby = !!settings.filterFeedByNearby;
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    this.isFeedFilteredByVisible = !!settings?.filterFeedByVisible;
+    this.isFeedFilteredByNearby = !!settings?.filterFeedByNearby;
     this.isAnyFeedFilterOn = isAnyFeedFilterOn(settings);
 
     this.feedData = [];
     this.feedPreviousOldestId = undefined;
-    await this.updateAllFeed();
+    this.updateAllFeed();
   }
 
   /**
    * Data loader used by infinite scroller
    * @param payload is the flag from the InfiniteScroll indicating if it should load
    **/
-  async loadMoreGives(payload: boolean) {
+  public async loadMoreGives(payload: boolean) {
     // Since feed now loads projects along the way, it takes longer
     // 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();
     }
   }
 
@@ -532,7 +542,7 @@ export default class HomeView extends Vue {
     }
   }
 
-  async updateAllFeed() {
+  public async updateAllFeed() {
     this.isFeedLoading = true;
     let endOfResults = true;
     await this.retrieveGives(this.apiServer, this.feedPreviousOldestId)
@@ -540,6 +550,7 @@ export default class HomeView extends Vue {
         if (results.data.length > 0) {
           endOfResults = false;
           // include the descriptions of the giver and receiver
+          const identity = await this.getIdentity(this.activeDid);
           for (const record: GiveSummaryRecord of results.data) {
             // similar code is in endorser-mobile utility.ts
             // claim.claim happen for some claims wrapped in a Verifiable Credential
@@ -555,10 +566,10 @@ export default class HomeView extends Vue {
             // This has indeed proven problematic. See loadMoreGives
             // We should display it immediately and then get the plan later.
             const plan = await getPlanFromCache(
-              record.fulfillsPlanHandleId || "",
+              record.fulfillsPlanHandleId,
+              identity,
               this.axios,
               this.apiServer,
-              this.activeDid,
             );
 
             // check if the record should be filtered out
@@ -608,7 +619,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,
             });
           }
@@ -628,7 +639,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;
   }
@@ -639,7 +650,7 @@ export default class HomeView extends Vue {
    * @param beforeId the earliest ID (of previous searches) to search earlier
    * @return claims in reverse chronological order
    */
-  async retrieveGives(endorserApiServer: string, beforeId?: string) {
+  public async retrieveGives(endorserApiServer: string, beforeId?: string) {
     const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
     const response = await fetch(
       endorserApiServer +
@@ -647,7 +658,7 @@ export default class HomeView extends Vue {
         beforeQuery,
       {
         method: "GET",
-        headers: await getHeaders(this.activeDid),
+        headers: await this.buildHeaders(),
       },
     );
 
@@ -743,23 +754,20 @@ export default class HomeView extends Vue {
     return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
   }
 
-  openDialog(giver?: GiverReceiverInputInfo, description?: string) {
+  openDialog(giver?: GiverReceiverInputInfo) {
     (this.$refs.customDialog as GiftedDialog).open(
       giver,
       {
         did: this.activeDid,
         name: "you",
-      } as GiverReceiverInputInfo,
+      },
       undefined,
       "Given by " + (giver?.name || "someone not named"),
-      description,
     );
   }
 
   openGiftedPrompts() {
-    (this.$refs.giftedPrompts as GiftedPrompts).open((giver, description) =>
-      this.openDialog(giver as GiverReceiverInputInfo, description),
-    );
+    (this.$refs.giftedPrompts as GiftedPrompts).open();
   }
 
   openFeedFilters() {
@@ -781,36 +789,5 @@ export default class HomeView extends Vue {
   computeKnownPersonIconStyleClassNames(known: boolean) {
     return known ? "text-slate-500" : "text-slate-100";
   }
-
-  showNameThenIdDialog() {
-    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

@@ -39,43 +39,24 @@
 
     <!-- Other Identity/ies -->
     <ul class="mb-4">
-      <li v-for="ident in otherIdentities" :key="ident.did">
-        <div class="flex items-center justify-between mb-2">
-          <div
-            class="flex flex-grow items-center bg-slate-100 rounded-md px-4 py-3 mb-2 truncate cursor-pointer"
-            @click="switchAccount(ident.did)"
-          >
-            <fa
-              v-if="ident.did === activeDid"
-              icon="circle-check"
-              class="fa-fw text-blue-600 text-xl mr-3"
-            />
-            <fa
-              v-else
-              icon="circle"
-              class="fa-fw text-slate-400 text-xl mr-3"
-            />
-            <span class="flex-grow overflow-hidden">
-              <div class="text-sm text-slate-500 truncate">
-                <b>ID:</b> <code>{{ ident.did }}</code>
-              </div>
-            </span>
+      <li
+        class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
+        v-for="ident in otherIdentities"
+        :key="ident.did"
+        @click="switchAccount(ident.did)"
+      >
+        <fa
+          v-if="ident.did === activeDid"
+          icon="circle-check"
+          class="fa-fw text-blue-600 text-xl mr-3"
+        />
+        <fa v-else icon="circle" class="fa-fw text-slate-400 text-xl mr-3" />
+        <span class="overflow-hidden">
+          <h2 class="text-xl font-semibold mb-0"></h2>
+          <div class="text-sm text-slate-500 truncate">
+            <b>ID:</b> <code>{{ ident.did }}</code>
           </div>
-          <div>
-            <fa
-              v-if="ident.did === activeDid"
-              icon="trash-can"
-              class="text-slate-400 text-xl ml-2 mr-2 cursor-pointer"
-              @click="notifyCannotDelete()"
-            />
-            <fa
-              v-else
-              icon="trash-can"
-              class="text-red-600 text-xl ml-2 mr-2 cursor-pointer"
-              @click="deleteAccount(ident.id)"
-            />
-          </div>
-        </div>
+        </span>
       </li>
     </ul>
 
@@ -99,37 +80,47 @@
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
-import { NotificationIface } from "@/constants/app";
-import { db, accountsDB, retrieveSettingsForActiveAccount } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { AppString, NotificationIface } from "@/constants/app";
+import { db, accountsDB } from "@/db/index";
+import { AccountsSchema } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import QuickNav from "@/components/QuickNav.vue";
 
 @Component({ components: { QuickNav } })
 export default class IdentitySwitcherView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  Constants = AppString;
+  public accounts: typeof AccountsSchema;
   public activeDid = "";
   public activeDidInIdentities = false;
   public apiServer = "";
   public apiServerInput = "";
-  public otherIdentities: Array<{ id: string; did: string }> = [];
+  public otherIdentities: Array<{ did: string }> = [];
+  public showContactGives = false;
 
   async created() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.activeDid = settings.activeDid || "";
-      this.apiServer = settings.apiServer || "";
-      this.apiServerInput = settings.apiServer || "";
+      await db.open();
+      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      this.activeDid = settings?.activeDid || "";
+      this.apiServer = settings?.apiServer || "";
+      this.apiServerInput = settings?.apiServer || "";
+      this.showContactGives = !!settings?.showContactGivesInline;
 
       await accountsDB.open();
       const accounts = await accountsDB.accounts.toArray();
       for (let n = 0; n < accounts.length; n++) {
-        const acct = accounts[n];
-        this.otherIdentities.push({ id: acct.id as string, did: acct.did });
-        if (acct.did && this.activeDid === acct.did) {
-          this.activeDidInIdentities = true;
+        try {
+          const did = accounts[n]["did"];
+          this.otherIdentities.push({ did: did });
+          if (did && this.activeDid === did) {
+            this.activeDidInIdentities = true;
+          }
+        } catch (err) {
+          console.error("Error parsing identity:", err);
+          continue;
         }
       }
     } catch (err) {
@@ -155,38 +146,7 @@ export default class IdentitySwitcherView extends Vue {
     await db.settings.update(MASTER_SETTINGS_KEY, {
       activeDid: did,
     });
-    (this.$router as Router).push({ name: "account" });
-  }
-
-  async deleteAccount(id: string) {
-    this.$notify(
-      {
-        group: "modal",
-        type: "confirm",
-        title: "Delete Identity?",
-        text: "Are you sure you want to erase this identity? (There is no undo. You may want to select it and back it up just in case.)",
-        onYes: async () => {
-          await accountsDB.open();
-          await accountsDB.accounts.delete(id);
-          this.otherIdentities = this.otherIdentities.filter(
-            (ident) => ident.id !== id,
-          );
-        },
-      },
-      -1,
-    );
-  }
-
-  notifyCannotDelete() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "warning",
-        title: "Cannot Delete",
-        text: "You cannot delete the active identity.",
-      },
-      3000,
-    );
+    this.$router.push({ name: "account" });
   }
 }
 </script>

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

@@ -17,7 +17,7 @@
 
     <div>
       <p class="text-center text-xl mb-4 font-light">
-        Will increment the maximum known derivation path from the existing seed.
+        Will increment the maximum derivation path from the existing seed.
       </p>
 
       <p v-if="didArrays.length > 1">
@@ -70,14 +70,12 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
 import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
   newIdentifier,
   nextDerivationPath,
-} from "@/libs/crypto";
+} from "../libs/crypto";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
@@ -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,10 +45,8 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
-
-import { db, retrieveSettingsForActiveAccount } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
 @Component({
   components: {},
@@ -58,22 +56,25 @@ export default class NewEditAccountView extends Vue {
 
   // 'created' hook runs when the Vue instance is first created
   async created() {
-    const settings = await retrieveSettingsForActiveAccount();
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
     this.givenName =
-      (settings.firstName || "") +
-      (settings.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
+      (settings?.firstName || "") +
+      (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();
+    localStorage.setItem("firstName", this.givenName as string);
+    localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
+    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"
       />
@@ -145,30 +142,6 @@
       </l-map>
     </div>
 
-    <div
-      v-if="showGeneralAdvanced && includeLocation && false"
-      class="items-center mb-4"
-    >
-      <div class="flex">
-        <input
-          type="checkbox"
-          class="mr-2"
-          v-model="sendToTrustroots"
-          @click="sendToTrustroots = !sendToTrustroots"
-        />
-        <label>Send to Trustroots</label>
-      </div>
-      <div class="flex">
-        <input
-          type="checkbox"
-          class="mr-2"
-          v-model="sendToTripHopping"
-          @click="sendToTripHopping = !sendToTripHopping"
-        />
-        <label>Send to TripHopping</label>
-      </div>
-    </div>
-
     <div class="mt-8">
       <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
         <button
@@ -200,27 +173,22 @@
 
 <script lang="ts">
 import "leaflet/dist/leaflet.css";
-import { AxiosError, AxiosRequestHeaders } from "axios";
+import { AxiosError } from "axios";
+import * as didJwt from "did-jwt";
 import { DateTime } from "luxon";
-import { accountFromSeedWords } from "nostr-tools/nip06";
+import { IIdentifier } from "@veramo/core";
 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";
-import {
-  DEFAULT_IMAGE_API_SERVER,
-  DEFAULT_PARTNER_API_SERVER,
-  NotificationIface,
-} from "@/constants/app";
-import { accountsDB, retrieveSettingsForActiveAccount } from "@/db/index";
-import {
-  createEndorserJwtVcFromClaim,
-  getHeaders,
-  PlanVerifiableCredential,
-} from "@/libs/endorserServer";
-import { getAccount } from "@/libs/util";
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
+import * as libsUtil from "@/libs/util";
+import { useAppStore } from "@/store/app";
+import { PlanVerifiableCredential } from "@/libs/endorserServer";
+import ImageMethodDialog from "@/components/ImageMethodDialog.vue";
 
 @Component({
   components: { ImageMethodDialog, LMap, LMarker, LTileLayer, QuickNav },
@@ -252,42 +220,74 @@ export default class NewEditProjectView extends Vue {
   latitude = 0;
   longitude = 0;
   numAccounts = 0;
-  projectId = "";
+  projectId = localStorage.getItem("projectId") || "";
   projectIssuerDid = "";
-  sendToTrustroots = false;
-  sendToTripHopping = false;
-  showGeneralAdvanced = false;
   startDateInput?: string;
   startTimeInput?: string;
   zoneName = DateTime.local().zoneName;
   zoom = 2;
 
+  libsUtil = libsUtil;
+
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
+  }
+
+  public async getHeaders(identity: IIdentifier) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
   async mounted() {
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
 
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
-    this.showGeneralAdvanced = !!settings.showGeneralAdvanced;
-
-    this.projectId = (this.$route as Router).query["projectId"] || "";
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.activeDid = (settings?.activeDid as string) || "";
+    this.apiServer = (settings?.apiServer as string) || "";
 
     if (this.projectId) {
       if (this.numAccounts === 0) {
         this.errNote("There was a problem loading your account info.");
       } else {
-        this.loadProject(this.activeDid);
+        const identity = await this.getIdentity(this.activeDid);
+        if (!identity) {
+          throw new Error(
+            "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+          );
+        }
+        this.loadProject(identity);
       }
     }
   }
 
-  async loadProject(userDid: string) {
+  async loadProject(identity: IIdentifier) {
     const url =
       this.apiServer +
       "/api/claim/byHandle/" +
       encodeURIComponent(this.projectId);
-    const headers = await getHeaders(userDid);
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -342,12 +342,17 @@ export default class NewEditProjectView extends Vue {
       return;
     }
     try {
-      const headers = (await getHeaders(this.activeDid)) as AxiosRequestHeaders;
+      const identity = await libsUtil.getIdentity(this.activeDid);
+      const token = await accessToken(identity);
       const response = await this.axios.delete(
         DEFAULT_IMAGE_API_SERVER +
           "/image/" +
           encodeURIComponent(this.imageUrl),
-        { headers },
+        {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+        },
       );
       if (response.status === 204) {
         // don't bother with a notification
@@ -390,7 +395,7 @@ export default class NewEditProjectView extends Vue {
     }
   }
 
-  private async saveProject() {
+  private async saveProject(identity: IIdentifier) {
     // Make a claim
     const vcClaim: PlanVerifiableCredential = this.fullClaim;
     if (this.projectId) {
@@ -441,173 +446,110 @@ export default class NewEditProjectView extends Vue {
     } else {
       delete vcClaim.startTime;
     }
-    const vcJwt = await createEndorserJwtVcFromClaim(this.activeDid, vcClaim);
-
-    // Make the xhr request payload
-
-    const payload = JSON.stringify({ jwtEncoded: vcJwt });
-    const url = this.apiServer + "/api/v2/claim";
-    const headers = await getHeaders(this.activeDid);
-
-    try {
-      const resp = await this.axios.post(url, payload, { headers });
-      if (resp.data?.success?.handleId) {
-        this.errorMessage = "";
-
-        const projectPath = encodeURIComponent(resp.data.success.handleId);
-
-        if (this.sendToTrustroots) {
-          this.sendToNostrPartner(
-            "NOSTR-EVENT-TRUSTROOTS",
-            "Trustroots",
-            resp.data.success.claimId,
-          );
-        }
-        if (this.sendToTripHopping) {
-          this.sendToNostrPartner(
-            "NOSTR-EVENT-TRIPHOPPING",
-            "TripHopping",
-            resp.data.success.claimId,
-          );
-        }
-
-        (this.$router as Router).push({ path: "/project/" + projectPath });
-      } else {
-        console.error(
-          "Got unexpected 'data' inside response from server",
-          resp,
-        );
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Saving Idea",
-            text: "Server did not save the idea. Try again.",
-          },
-          -1,
-        );
-      }
-    } catch (error) {
-      let userMessage = "There was an error saving the project.";
-      const serverError = error as AxiosError<{
-        error?: { message?: string };
-      }>;
-      if (serverError) {
-        console.error("Got error from server", serverError);
-        if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
-          userMessage =
-            (serverError.response?.data?.error?.message as string) ||
-            userMessage;
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "User Message",
-              text: userMessage,
-            },
-            -1,
-          );
-        } else {
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Server Message",
-              text: JSON.stringify(serverError.toJSON()),
-            },
-            -1,
-          );
-        }
-      } else {
-        console.error("Here's the full error trying to save the claim:", error);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Claim Error",
-            text: error as string,
-          },
-          -1,
-        );
-      }
-      // Now set that error for the user to see.
-      this.errorMessage = userMessage;
-    }
-  }
-
-  private async sendToNostrPartner(
-    linkCode: string,
-    serviceName: string,
-    jwtId: string,
-  ) {
-    // first, get the public key for nostr
-    const account = await getAccount(this.activeDid);
-    // get the last number of the derivationPath
-    const finalDerNum = account?.derivationPath?.split?.("/")?.reverse()[0];
-    // remove any trailing '
-    const finalDerNumNoApostrophe = finalDerNum?.replace(/'/g, "");
-    const accountNum = Number(finalDerNumNoApostrophe || 0);
-    const pubPri = accountFromSeedWords(
-      account?.mnemonic as string,
-      "",
-      accountNum,
-    );
-    const nostrPubKey = pubPri?.publicKey;
-
-    const trustrootsUrl = DEFAULT_PARTNER_API_SERVER + "/api/partner/link";
-    const timeSafariUrl = window.location.origin + "/claim/" + jwtId;
-    const content = this.fullClaim.name + " - see " + timeSafariUrl;
-    const trustrootsParams = {
-      jwtId: jwtId,
-      linkCode: linkCode,
-      inputJson: JSON.stringify(content),
-      nostrPubKeyHex: nostrPubKey,
+    // Make a payload for the claim
+    const vcPayload = {
+      vc: {
+        "@context": ["https://www.w3.org/2018/credentials/v1"],
+        type: ["VerifiableCredential"],
+        credentialSubject: vcClaim,
+      },
     };
-    const fullTrustrootsUrl = trustrootsUrl;
-    const headers = await getHeaders(this.activeDid);
-    try {
-      const linkResp = await this.axios.post(
-        fullTrustrootsUrl,
-        trustrootsParams,
-        { headers },
-      );
-      if (linkResp.status === 201) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: `Sent to ${serviceName}`,
-            text: `The project info was sent to ${serviceName}.`,
-          },
-          5000,
-        );
-      } else {
-        // axios never gets here because it throws an error, but just in case
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: `Failed Sending to ${serviceName}`,
-            text: JSON.stringify(linkResp.data),
-          },
-          5000,
-        );
+    // create a signature using private key of identity
+    if (identity.keys[0].privateKeyHex != null) {
+      const privateKeyHex: string = identity.keys[0].privateKeyHex;
+      const signer = await SimpleSigner(privateKeyHex);
+      const alg = undefined;
+      // create a JWT for the request
+      const vcJwt: string = await didJwt.createJWT(vcPayload, {
+        alg: alg,
+        issuer: identity.did,
+        signer: signer,
+      });
+
+      // Make the xhr request payload
+
+      const payload = JSON.stringify({ jwtEncoded: vcJwt });
+      const url = this.apiServer + "/api/v2/claim";
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };
+
+      try {
+        const resp = await this.axios.post(url, payload, { headers });
+        if (resp.data?.success?.handleId) {
+          this.errorMessage = "";
+
+          useAppStore()
+            .setProjectId(resp.data.success.handleId)
+            .then(() => {
+              this.$router.push({ name: "project" });
+            });
+        } else {
+          console.error(
+            "Got unexpected 'data' inside response from server",
+            resp,
+          );
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error Saving Idea",
+              text: "Server did not save the idea. Try again.",
+            },
+            -1,
+          );
+        }
+      } catch (error) {
+        let userMessage = "There was an error saving the project.";
+        const serverError = error as AxiosError<{
+          error?: { message?: string };
+        }>;
+        if (serverError) {
+          console.error("Got error from server", serverError);
+          if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
+            userMessage =
+              (serverError.response?.data?.error?.message as string) ||
+              userMessage;
+            this.$notify(
+              {
+                group: "alert",
+                type: "danger",
+                title: "User Message",
+                text: userMessage,
+              },
+              -1,
+            );
+          } else {
+            this.$notify(
+              {
+                group: "alert",
+                type: "danger",
+                title: "Server Message",
+                text: JSON.stringify(serverError.toJSON()),
+              },
+              -1,
+            );
+          }
+        } else {
+          console.error(
+            "Here's the full error trying to save the claim:",
+            error,
+          );
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Claim Error",
+              text: error as string,
+            },
+            -1,
+          );
+        }
+        // Now set that error for the user to see.
+        this.errorMessage = userMessage;
       }
-    } catch (error) {
-      console.error(`Error sending to ${serviceName}`, error);
-      let errorMessage = `There was an error sending to ${serviceName}.`;
-      if (error.response?.data?.error?.message) {
-        errorMessage = error.response.data.error.message;
-      }
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: `Error Sending to ${serviceName}`,
-          text: errorMessage,
-        },
-        5000,
-      );
     }
   }
 
@@ -618,7 +560,8 @@ export default class NewEditProjectView extends Vue {
     if (this.numAccounts === 0) {
       console.error("Error: there is no account.");
     } else {
-      this.saveProject();
+      const identity = await this.getIdentity(this.activeDid);
+      this.saveProject(identity);
     }
   }
 
@@ -644,7 +587,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="descriptionOfItem"
-      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="descriptionOfCondition"
-      />
-    </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 v-if="showGeneralAdvanced" 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, retrieveSettingsForActiveAccount } from "@/db/index";
-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";
-  descriptionOfCondition = "";
-  descriptionOfItem = "";
-  destinationPathAfter = "";
-  hideBackButton = false;
-  message = "";
-  offeredToProject = false;
-  offeredToRecipient = false;
-  offererDid: string | undefined;
-  offerId = "";
-  prevCredToEdit?: GenericCredWrapper<OfferVerifiableCredential>;
-  projectId = "";
-  projectName = "a project";
-  recipientDid = "";
-  recipientName = "";
-  showGeneralAdvanced = false;
-  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.descriptionOfCondition =
-      this.prevCredToEdit?.claim?.description || this.descriptionOfCondition;
-    this.descriptionOfItem =
-      (this.$route as Router).query["description"] ||
-      this.prevCredToEdit?.claim?.itemOffered?.description ||
-      this.descriptionOfItem;
-    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 {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.apiServer = settings.apiServer ?? "";
-      this.activeDid = settings.activeDid ?? "";
-      this.showGeneralAdvanced = settings.showGeneralAdvanced ?? false;
-
-      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.descriptionOfItem && !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.descriptionOfItem,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.descriptionOfCondition,
-          this.validThroughDateInput,
-          recipientDid,
-          projectId,
-        );
-      } else {
-        result = await createAndSubmitOffer(
-          this.axios,
-          this.apiServer,
-          this.activeDid,
-          this.descriptionOfItem,
-          parseFloat(this.amountInput),
-          this.unitCode,
-          this.descriptionOfCondition,
-          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.descriptionOfItem,
-      parseFloat(this.amountInput),
-      this.unitCode,
-      this.descriptionOfCondition,
-      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>
@@ -220,10 +171,7 @@
         </li>
       </ul>
 
-      <!--
-       Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list
-        (we want to limit the grid count above to 8 or 12 accounts to keep it compact)
-      -->
+      <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
       <a
         v-if="allContacts.length >= 7"
         @click="onClickAllContactsGifting()"
@@ -308,7 +256,6 @@
           contact above.)
         </div>
 
-        <!-- similar to gift display below -->
         <ul v-else class="text-sm border-t border-slate-300">
           <li
             v-for="give in givesToThis"
@@ -316,8 +263,8 @@
             class="py-1.5 border-b border-slate-300"
           >
             <div class="flex justify-between gap-4">
-              <span>
-                <fa icon="user" class="fa-fw text-slate-400" />
+              <span
+                ><fa icon="user" class="fa-fw text-slate-400"></fa>
                 {{
                   serverUtil.didInfo(
                     give.agentDid,
@@ -353,11 +300,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,54 +309,38 @@
 
       <div class="grid items-start grid-cols-1 gap-4">
         <div
-          v-if="givesProvidedByThis.length > 0"
+          v-if="fulfillersToThis.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">
+            Contributions To This Idea
+          </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">Load More</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">
+            Contributions From This Idea
+          </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>
@@ -423,9 +349,9 @@
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
+import { AxiosError, RawAxiosRequestHeaders } from "axios";
+import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
@@ -434,18 +360,18 @@ import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import ProjectIcon from "@/components/ProjectIcon.vue";
 import { NotificationIface } from "@/constants/app";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as libsUtil from "@/libs/util";
 import {
   BLANK_GENERIC_SERVER_RECORD,
   GenericCredWrapper,
-  getHeaders,
+  GiverReceiverInputInfo,
   GiveSummaryRecord,
-  GiveVerifiableCredential,
   OfferSummaryRecord,
-  OfferVerifiableCredential,
   PlanSummaryRecord,
 } from "@/libs/endorserServer";
 import * as serverUtil from "@/libs/endorserServer";
@@ -475,17 +401,14 @@ export default class ProjectViewView extends Vue {
   fulfillersToHitLimit = false;
   givesToThis: Array<GiveSummaryRecord> = [];
   givesHitLimit = false;
-  givesProvidedByThis: Array<GiveSummaryRecord> = [];
-  givesProvidedByHitLimit = false;
   imageUrl = "";
-  isRegistered = false;
   issuer = "";
   latitude = 0;
   longitude = 0;
   name = "";
   offersToThis: Array<OfferSummaryRecord> = [];
   offersHitLimit = false;
-  projectId = ""; // handle ID
+  projectId = localStorage.getItem("projectId") || ""; // handle ID
   showDidCopy = false;
   startTime = "";
   truncatedDesc = "";
@@ -496,30 +419,42 @@ export default class ProjectViewView extends Vue {
   serverUtil = serverUtil;
 
   async created() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.apiServer = settings.apiServer || "";
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    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;
     const accountsArr: Account[] = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
+    const account = accountsArr.find((acc) => acc.did === this.activeDid);
+    const identity = JSON.parse((account?.identity as string) || "null");
 
     const pathParam = window.location.pathname.substring("/project/".length);
     if (pathParam) {
       this.projectId = decodeURIComponent(pathParam);
     }
-    this.loadProject(this.projectId, this.activeDid);
+    this.loadProject(this.projectId, identity);
+  }
+
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = (await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first()) as Account;
+    const identity = JSON.parse(account?.identity || "null");
+    return identity;
   }
 
   onEditClick() {
+    localStorage.setItem("projectId", this.projectId as string);
     const route = {
       name: "new-edit-project",
-      query: { projectId: this.projectId },
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   // Isn't there a better way to make this available to the template?
@@ -531,12 +466,18 @@ export default class ProjectViewView extends Vue {
     this.expanded = false;
   }
 
-  async loadProject(projectId: string, userDid: string) {
+  async loadProject(projectId: string, identity: IIdentifier) {
     this.projectId = projectId;
 
     const url =
       this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
-    const headers = await getHeaders(userDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
 
     try {
       const resp = await this.axios.get(url, { headers });
@@ -599,12 +540,15 @@ export default class ProjectViewView extends Vue {
 
     this.loadGives();
 
-    this.loadGivesProvidedBy();
-
     this.loadOffers();
 
-    this.loadPlanFulfillersTo();
+    this.loadFulfillersTo();
 
+    // now load fulfilled-by, a single project
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
     const fulfilledByUrl =
       this.apiServer +
       "/api/v2/report/planFulfilledByPlan?planHandleId=" +
@@ -654,7 +598,15 @@ export default class ProjectViewView extends Vue {
     }
     const givesInUrl = givesUrl + postfix;
 
-    const headers = await getHeaders(this.activeDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+
     try {
       const resp = await this.axios.get(givesInUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
@@ -701,7 +653,15 @@ export default class ProjectViewView extends Vue {
     }
     const offersInUrl = offersUrl + postfix;
 
-    const headers = await getHeaders(this.activeDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+
     try {
       const resp = await this.axios.get(offersInUrl, { headers });
       if (resp.status === 200 && resp.data.data) {
@@ -736,7 +696,7 @@ export default class ProjectViewView extends Vue {
     }
   }
 
-  async loadPlanFulfillersTo() {
+  async loadFulfillersTo() {
     const fulfillsUrl =
       this.apiServer +
       "/api/v2/report/planFulfillersToPlan?planHandleId=" +
@@ -749,7 +709,15 @@ export default class ProjectViewView extends Vue {
     }
     const fulfillsInUrl = fulfillsUrl + postfix;
 
-    const headers = await getHeaders(this.activeDid);
+    const headers: RawAxiosRequestHeaders = {
+      "Content-Type": "application/json",
+    };
+    const identity = await this.getIdentity(this.activeDid);
+    if (identity) {
+      const token = await accessToken(identity);
+      headers["Authorization"] = "Bearer " + token;
+    }
+
     try {
       const resp = await this.axios.get(fulfillsInUrl, { headers });
       if (resp.status === 200) {
@@ -784,66 +752,17 @@ export default class ProjectViewView extends Vue {
     }
   }
 
-  async loadGivesProvidedBy() {
-    const providedByUrl =
-      this.apiServer +
-      "/api/v2/report/givesProvidedBy?providerId=" +
-      encodeURIComponent(this.projectId);
-    let postfix = "";
-    if (this.givesProvidedByThis.length > 0) {
-      postfix =
-        "&beforeId=" +
-        this.givesProvidedByThis[this.givesProvidedByThis.length - 1].jwtId;
-    }
-    const providedByFullUrl = providedByUrl + postfix;
-
-    const headers = await getHeaders(this.activeDid);
-    try {
-      const resp = await this.axios.get(providedByFullUrl, { headers });
-      if (resp.status === 200) {
-        this.givesProvidedByThis = this.givesProvidedByThis.concat(
-          resp.data.data,
-        );
-        this.givesProvidedByHitLimit = resp.data.hitLimit;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve gives that were provided by this project.",
-          },
-          5000,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving gives that were provided by this project.",
-        },
-        5000,
-      );
-      console.error(
-        "Something went wrong retrieving gives that were provided by this project:",
-        serverError.message,
-      );
-    }
-  }
-
   /**
    * Handle clicking on a project entry found in the list
    * @param id of the project
    **/
   async onClickLoadProject(projectId: string) {
+    localStorage.setItem("projectId", projectId);
     const route = {
       path: "/project/" + encodeURIComponent(projectId),
     };
-    (this.$router as Router).push(route);
-    this.loadProject(projectId, this.activeDid);
+    this.$router.push(route);
+    this.loadProject(projectId, await this.getIdentity(this.activeDid));
   }
 
   getOpenStreetMapUrl() {
@@ -860,7 +779,7 @@ export default class ProjectViewView extends Vue {
     );
   }
 
-  openGiftDialog(contact?: libsUtil.GiverReceiverInputInfo) {
+  openGiftDialog(contact?: GiverReceiverInputInfo) {
     (this.$refs.customGiveDialog as GiftedDialog).open(
       contact,
       undefined,
@@ -874,24 +793,22 @@ export default class ProjectViewView extends Vue {
   }
 
   onClickAllContactsGifting() {
+    localStorage.setItem("projectId", this.projectId);
     const route = {
       name: "contact-gift",
-      query: {
-        projectId: this.projectId,
-      },
     };
-    (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",
@@ -901,12 +818,12 @@ 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,
     };
-    const giver: libsUtil.GiverReceiverInputInfo = {
+    const giver: GiverReceiverInputInfo = {
       did: libsUtil.offerGiverDid(offerRecord),
     };
     (this.$refs.customGiveDialog as GiftedDialog).open(
@@ -946,17 +863,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) {
@@ -993,7 +906,7 @@ export default class ProjectViewView extends Vue {
     };
     const result = await serverUtil.createAndSubmitClaim(
       confirmationClaim,
-      this.activeDid,
+      await this.getIdentity(this.activeDid),
       this.apiServer,
       this.axios,
     );

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>
@@ -150,10 +139,7 @@
                       <span
                         v-if="offer.amountGivenConfirmed >= offer.amountGiven"
                       >
-                        <!--
-                         There's no need for a green icon:
-                         it's unnecessary if there's already a green, and confusing if there's a yellow.
-                        -->
+                        <!-- no need for green icon; unnecessary if there's already a green, confusing if there's a yellow -->
                         all
                       </span>
                       <span v-else>
@@ -203,25 +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>
-        <div v-else>
-          <button
-            @click="showNameThenIdDialog()"
-            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"
-          >
-            Get someone to onboard you.
-          </button>
-          <UserNameDialog ref="userNameDialog" />
-        </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"
@@ -256,35 +229,22 @@
 <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, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import * as libsUtil from "@/libs/util";
+import { IIdentifier } from "@veramo/core";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 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 { OfferSummaryRecord, PlanData } from "@/libs/endorserServer";
 import EntityIcon from "@/components/EntityIcon.vue";
-import { Contact } from "@/db/tables/contacts";
-import UserNameDialog from "@/components/UserNameDialog.vue";
 
 @Component({
-  components: {
-    EntityIcon,
-    InfiniteScroll,
-    QuickNav,
-    ProjectIcon,
-    TopMessage,
-    UserNameDialog,
-  },
+  components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
 })
 export default class ProjectsView extends Vue {
   $notify!: (notification: NotificationIface, timeout?: number) => void;
@@ -295,40 +255,33 @@ export default class ProjectsView extends Vue {
     );
   }
 
-  activeDid = "";
-  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
   apiServer = "";
-  givenName = "";
+  projects: PlanData[] = [];
+  currentIid: IIdentifier;
   isLoading = false;
   isRegistered = false;
+  numAccounts = 0;
   offers: OfferSummaryRecord[] = [];
-  projectNameFromHandleId: Record<string, string> = {}; // mapping from handleId to description
-  projects: PlanData[] = [];
   showOffers = true;
   showProjects = false;
 
   libsUtil = libsUtil;
-  didInfo = didInfo;
 
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.activeDid = settings.activeDid || "";
-      this.apiServer = settings.apiServer || "";
-      this.isRegistered = !!settings.isRegistered;
-      this.givenName = settings.firstName || "";
-
-      this.allContacts = await db.contacts.toArray();
+      await db.open();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+      const activeDid: string = (settings?.activeDid as string) || "";
+      this.apiServer = (settings?.apiServer as string) || "";
+      this.isRegistered = !!settings?.isRegistered;
 
       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 {
+        this.currentIid = await this.getIdentity(activeDid);
         await this.loadOffers();
       }
     } catch (err) {
@@ -342,9 +295,13 @@ export default class ProjectsView extends Vue {
    * @param url the url used to fetch the data
    * @param token Authorization token
    **/
-  async projectDataLoader(url: string) {
+  async projectDataLoader(url: string, token: string) {
+    const headers: { [key: string]: string } = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    };
+
     try {
-      const headers = await getHeaders(this.activeDid);
       this.isLoading = true;
       const resp = await this.axios.get(url, { headers } as AxiosRequestConfig);
       if (resp.status === 200 && resp.data.data) {
@@ -384,18 +341,39 @@ 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.currentIid,
+        `beforeId=${latestProject.rowid}`,
+      );
     }
   }
 
   /**
    * Load projects initially
-   * @param issuerDid of the user
+   * @param identifier of the user
    * @param urlExtra additional url parameters in a string
    **/
-  async loadProjects(urlExtra: string = "") {
+  async loadProjects(identifier?: IIdentifier, urlExtra: string = "") {
+    const identity = identifier || this.currentIid;
     const url = `${this.apiServer}/api/v2/report/plansByIssuer?${urlExtra}`;
-    await this.projectDataLoader(url);
+    const token: string = await accessToken(identity);
+    await this.projectDataLoader(url, token);
+  }
+
+  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse((account?.identity as string) || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identifier available.",
+      );
+    }
+    return identity;
   }
 
   /**
@@ -403,27 +381,29 @@ export default class ProjectsView extends Vue {
    * @param id of the project
    **/
   onClickLoadProject(id: string) {
+    localStorage.setItem("projectId", id);
     const route = {
       path: "/project/" + encodeURIComponent(id),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   /**
    * Handling clicking on the new project button
    **/
   onClickNewProject(): void {
+    localStorage.removeItem("projectId");
     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);
   }
 
   /**
@@ -431,28 +411,17 @@ export default class ProjectsView extends Vue {
    * @param url the url used to fetch the data
    * @param token Authorization token
    **/
-  async offerDataLoader(url: string) {
-    const headers = await getHeaders(this.activeDid);
+  async offerDataLoader(url: string, token: string) {
+    const headers: { [key: string]: string } = {
+      "Content-Type": "application/json",
+      Authorization: `Bearer ${token}`,
+    };
 
     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;
-            this.projectNameFromHandleId[offer.fulfillsPlanHandleId] =
-              projectName;
-          }
-          this.offers = this.offers.concat([offer]);
-        }
+        this.offers = this.offers.concat(resp.data.data);
       } else {
         console.error(
           "Bad server response & data for offers:",
@@ -493,49 +462,20 @@ 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.currentIid, `&beforeId=${latestOffer.jwtId}`);
     }
   }
 
   /**
    * Load offers initially
-   * @param issuerDid of the user
+   * @param identifier 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}`;
-    await this.offerDataLoader(url);
-  }
-
-  showNameThenIdDialog() {
-    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,
-    );
+  async loadOffers(identifier?: IIdentifier, urlExtra: string = "") {
+    const identity = identifier || this.currentIid;
+    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${identity.did}${urlExtra}`;
+    const token: string = await accessToken(identity);
+    await this.offerDataLoader(url, token);
   }
 
   public computedOfferTabClassNames() {

src/views/QuickActionBvcBeginView.vue

@@ -72,7 +72,7 @@ import { Component, Vue } from "vue-facing-decorator";
 import QuickNav from "@/components/QuickNav.vue";
 import TopMessage from "@/components/TopMessage.vue";
 import { NotificationIface } from "@/constants/app";
-import { retrieveSettingsForActiveAccount } from "@/db/index";
+import { db } from "@/db/index";
 import {
   BVC_MEETUPS_PROJECT_CLAIM_ID,
   bvcMeetingJoinClaim,
@@ -80,6 +80,7 @@ import {
   createAndSubmitGive,
 } from "@/libs/endorserServer";
 import * as libsUtil from "@/libs/util";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
 @Component({
   components: {
@@ -116,12 +117,14 @@ export default class QuickActionBvcBeginView extends Vue {
   }
 
   async record() {
-    const settings = await retrieveSettingsForActiveAccount();
-    const activeDid = settings.activeDid || "";
-    const apiServer = settings.apiServer || "";
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    const activeDid = settings?.activeDid || "";
+    const apiServer = settings?.apiServer || "";
 
     try {
       const hoursNum = libsUtil.numberOrZero(this.hoursStr);
+      const identity = await libsUtil.getIdentity(activeDid);
 
       this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
 
@@ -131,7 +134,7 @@ export default class QuickActionBvcBeginView extends Vue {
         const timeResult = await createAndSubmitGive(
           axios,
           apiServer,
-          activeDid,
+          identity,
           activeDid,
           undefined,
           undefined,
@@ -162,7 +165,7 @@ export default class QuickActionBvcBeginView extends Vue {
       if (this.attended) {
         const attendResult = await createAndSubmitClaim(
           bvcMeetingJoinClaim(activeDid, this.todayOrPreviousStartDate),
-          activeDid,
+          identity,
           apiServer,
           axios,
         );

src/views/QuickActionBvcEndView.vue

@@ -138,25 +138,28 @@
 import axios from "axios";
 import { DateTime } from "luxon";
 import * as R from "ramda";
+import { IIdentifier } from "@veramo/core";
 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, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
 import {
   BVC_MEETUPS_PROJECT_CLAIM_ID,
   claimSpecialDescription,
   containsHiddenDid,
   createAndSubmitConfirmation,
   createAndSubmitGive,
+  ErrorResult,
   GenericCredWrapper,
   GenericVerifiableCredential,
-  getHeaders,
-  ErrorResult,
 } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
 
 @Component({
   methods: { claimSpecialDescription },
@@ -174,20 +177,22 @@ export default class QuickActionBvcBeginView extends Vue {
   apiServer = "";
   claimCountByUser = 0;
   claimCountWithHidden = 0;
-  claimsToConfirm: GenericCredWrapper<GenericVerifiableCredential>[] = [];
+  claimsToConfirm: GenericCredWrapper[] = [];
   claimsToConfirmSelected: string[] = [];
   description = "breakfast";
   loadingConfirms = true;
   someoneGave = false;
 
   async created() {
-    this.loadingConfirms = true;
-
-    const settings = await retrieveSettingsForActiveAccount();
-    this.apiServer = settings.apiServer || "";
-    this.activeDid = settings.activeDid || "";
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    this.apiServer = settings?.apiServer || "";
+    this.activeDid = settings?.activeDid || "";
     this.allContacts = await db.contacts.toArray();
+  }
 
+  async mounted() {
+    this.loadingConfirms = true;
     let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
     if (currentOrPreviousSat.weekday < 6) {
       // it's not Saturday or Sunday,
@@ -208,7 +213,16 @@ export default class QuickActionBvcBeginView extends Vue {
     await accountsDB.open();
     const allAccounts = await accountsDB.accounts.toArray();
     this.allMyDids = allAccounts.map((acc) => acc.did);
-    const headers = await getHeaders(this.activeDid);
+    const account: Account | undefined = await accountsDB.accounts
+      .where("did")
+      .equals(this.activeDid)
+      .first();
+    const identity: IIdentifier = JSON.parse(
+      (account?.identity as string) || "null",
+    );
+    const headers = {
+      Authorization: "Bearer " + (await accessToken(identity)),
+    };
     try {
       const response = await fetch(
         this.apiServer +
@@ -225,8 +239,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(
@@ -257,11 +270,13 @@ export default class QuickActionBvcBeginView extends Vue {
     const route = {
       path: "/claim/" + encodeURIComponent(jwtId),
     };
-    (this.$router as Router).push(route);
+    this.$router.push(route);
   }
 
   async record() {
     try {
+      const identity = await libsUtil.getIdentity(this.activeDid);
+
       this.$notify({ group: "alert", type: "toast", title: "Sent..." }, 1000);
 
       // in parallel, make a confirmation for each selected claim and send them all to the server
@@ -273,8 +288,9 @@ export default class QuickActionBvcBeginView extends Vue {
           if (!record) {
             return { type: "error", error: "Record not found." };
           }
+          const identity = await libsUtil.getIdentity(this.activeDid);
           return createAndSubmitConfirmation(
-            this.activeDid,
+            identity,
             record.claim as GenericVerifiableCredential,
             record.id,
             record.handleId,
@@ -308,7 +324,7 @@ export default class QuickActionBvcBeginView extends Vue {
         const giveResult = await createAndSubmitGive(
           axios,
           this.apiServer,
-          this.activeDid,
+          identity,
           undefined,
           this.activeDid,
           this.description,

src/views/SearchAreaView.vue

@@ -105,11 +105,10 @@ import {
   LRectangle,
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
-import { Router } from "vue-router";
 
 import QuickNav from "@/components/QuickNav.vue";
 import { NotificationIface } from "@/constants/app";
-import { db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { db } from "@/db/index";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 const DEFAULT_LAT_LONG_DIFF = 0.01;
@@ -142,8 +141,9 @@ export default class DiscoverView extends Vue {
   searchBox: { name: string; bbox: BoundingBox } | null = null;
 
   async mounted() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.searchBox = settings.searchBoxes?.[0] || null;
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.searchBox = settings?.searchBoxes?.[0] || null;
     this.resetLatLong();
   }
 
@@ -198,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;
@@ -213,7 +213,7 @@ export default class DiscoverView extends Vue {
           },
           7000,
         );
-        (this.$router as Router).back();
+        this.$router.back();
       } catch (err) {
         this.$notify(
           {
@@ -245,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,14 +64,14 @@
 </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";
-import { accountsDB, retrieveSettingsForActiveAccount } from "@/db/index";
+import { accountsDB, db } from "@/db/index";
 import { Account } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 @Component({ components: { QuickNav } })
 export default class SeedBackupView extends Vue {
@@ -114,15 +79,14 @@ 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
   async created() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      const activeDid = settings.activeDid || "";
+      await db.open();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+      const activeDid = settings?.activeDid || "";
 
       await accountsDB.open();
       const accounts = await accountsDB.accounts.toArray();
@@ -142,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,121 +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, retrieveSettingsForActiveAccount } from "@/db/index";
-import { generateEndorserJwtForAccount } from "@/libs/endorserServer";
-
-@Component({
-  components: { QuickNav, TopMessage },
-})
-export default class ShareMyContactInfoView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  async onClickShare() {
-    const settings = await retrieveSettingsForActiveAccount();
-    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";
@@ -75,10 +63,10 @@ import {
   IMAGE_TYPE_PROFILE,
   NotificationIface,
 } from "@/constants/app";
-import { db, retrieveSettingsForActiveAccount } from "@/db/index";
+import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { getIdentity } from "@/libs/util";
 import { accessToken } from "@/libs/crypto";
-import { base64ToBlob, SHARED_PHOTO_BASE64_KEY } from "@/libs/util";
 
 @Component({ components: { PhotoDialog, QuickNav } })
 export default class SharedPhotoView extends Vue {
@@ -94,22 +82,18 @@ export default class SharedPhotoView extends Vue {
   // 'created' hook runs when the Vue instance is first created
   async mounted() {
     try {
-      const settings = await retrieveSettingsForActiveAccount();
-      this.activeDid = settings.activeDid;
+      await db.open();
+      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);
@@ -128,17 +112,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);
+        });
       }
     });
   }
@@ -146,10 +128,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,
@@ -161,7 +143,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) {
@@ -170,10 +152,10 @@ export default class SharedPhotoView extends Vue {
     let result;
     try {
       // send the image to the server
-      const token = await accessToken(this.activeDid);
+      const identifier = await getIdentity(this.activeDid as string);
+      const token = await accessToken(identifier);
       const headers = {
         Authorization: "Bearer " + token,
-        // axios fills in Content-Type of multipart/form-data
       };
       const formData = new FormData();
       formData.append(

src/views/StartView.vue

@@ -17,7 +17,7 @@
 
       <!-- Heading -->
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Generate an Identity
+        Start Here
       </h1>
     </div>
 
@@ -25,59 +25,33 @@
     <div id="start-question" class="mt-8">
       <div class="max-w-3xl mx-auto">
         <p class="text-center text-xl font-light">
-          How do you want to create this identifier?
+          Do you want a new identifier of your own?
         </p>
-        <p v-if="PASSKEYS_ENABLED" class="text-center font-light mt-6">
-          A <strong>passkey</strong> is easy to manage, though it is less
-          interoperable with other systems for advanced uses.
-          <a
-            href="https://www.perplexity.ai/search/what-are-passkeys-v2SHV3yLQlyA2CYH6.Nvhg"
-            target="_blank"
-          >
-            <fa icon="info-circle" class="fa-fw text-blue-500" />
-          </a>
+        <p class="text-center font-light">
+          If you haven't used this before, click "Yes" to generate a new
+          identifier.
         </p>
-        <p class="text-center font-light mt-4">
-          A <strong>new seed</strong> allows you full control over the keys,
-          though you are responsible for backups.
-          <a
-            href="https://www.perplexity.ai/search/what-is-a-seed-phrase-OqiP9foVRXidr_2le5OFKA"
-            target="_blank"
-          >
-            <fa icon="info-circle" class="fa-fw text-blue-500" />
-          </a>
+        <p class="text-center mb-4 font-light">
+          Only click "No" if you have a seed of 12 or 24 words generated
+          elsewhere.
         </p>
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-4">
-          <a
-            v-if="PASSKEYS_ENABLED"
-            @click="onClickNewPasskey()"
-            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"
-          >
-            Generate one with a passkey
-          </a>
-          <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>
-        </div>
-        <p class="text-center font-light mt-4">
-          You can also import an existing seed or derive a new address from an
-          existing seed.
-        </p>
-        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2 mt-2">
+        <a
+          @click="onClickYes()"
+          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"
+        >
+          Yes, generate one
+        </a>
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
           <a
             @click="onClickNo()"
-            class="block w-full text-center 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-1.5 py-2 rounded-md cursor-pointer"
+            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"
           >
-            You have a seed
+            No, I have a seed
           </a>
           <a
             v-if="numAccounts > 0"
             @click="onClickDerive()"
-            class="block w-full text-center 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-1.5 py-2 rounded-md cursor-pointer"
+            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"
           >
             Derive new address from existing seed
           </a>
@@ -89,46 +63,30 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { Router } from "vue-router";
 
-import { AppString, PASSKEYS_ENABLED } from "@/constants/app";
-import { accountsDB, retrieveSettingsForActiveAccount } from "@/db/index";
-import { registerSaveAndActivatePasskey } from "@/libs/util";
+import { accountsDB } from "@/db/index";
 
 @Component({
   components: {},
 })
 export default class StartView extends Vue {
-  PASSKEYS_ENABLED = PASSKEYS_ENABLED;
-
-  givenName = "";
   numAccounts = 0;
 
   async mounted() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.givenName = settings.firstName || "";
-
     await accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  public onClickNewSeed() {
-    (this.$router as 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" });
+  public onClickYes() {
+    this.$router.push({ name: "new-identifier" });
   }
 
   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/StatisticsView.vue

@@ -25,13 +25,12 @@
       Here is a view of the activity you can see.
       <ul class="list-disc outside ml-4">
         <li>Each identity and claim has a unique position.</li>
-        <li>
-          Each will show at their time of appearance relative to all others.
-        </li>
-        <li>
-          Note that the ones on the left and right edges are randomized because
-          their data isn't all visible to you.
+        <!-- eslint-disable prettier/prettier --><!-- If we format prettier then there is extra space at the start of the line. -->
+        <li>Each will show at their time of appearance relative to all others.</li>
+        <li>Note that the ones on the left and right edges are randomized
+          because their data isn't all visible to you.
         </li>
+        <!-- eslint-enable -->
       </ul>
     </div>
 
@@ -47,9 +46,7 @@
         {{ worldProperties.animationDurationSeconds }} seconds
       </div>
     </div>
-    <button class="float-right text-blue-600" @click="captureGraphics()">
-      Screenshot
-    </button>
+    <button class="float-right text-blue-600" @click="captureGraphics()">Screenshot</button>
     <div id="scene-container" class="h-screen"></div>
   </section>
 </template>

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>
@@ -174,65 +173,59 @@
     <div class="mt-8">
       <h2 class="text-xl font-bold mb-4">Passkeys</h2>
       See console for results.
-      <br />
-      See existing passkeys in Chrome at: chrome://settings/passkeys
-      <br />
-      Active DID: {{ activeDid || "nothing, which" }}
-      {{ credIdHex ? "has a passkey ID" : "has no passkey ID" }}
-
+      <br/>
+      Active DID: {{ activeDid }}
+      {{ credIdHex ? "has passkey ID" : "has no passkey ID" }}
       <div>
-        Register Passkey
+        Register
         <button
           @click="register()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Simplewebauthn
         </button>
       </div>
-
       <div>
-        Create JWT
+        Create
         <button
           @click="createJwtSimplewebauthn()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Simplewebauthn
         </button>
         <button
           @click="createJwtNavigator()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Navigator
         </button>
       </div>
-
       <div v-if="jwt">
-        Verify New JWT
+        Verify
         <button
           @click="verifySimplewebauthn()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           Simplewebauthn
         </button>
         <button
           @click="verifyWebCrypto()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           WebCrypto
         </button>
         <button
           @click="verifyP256()"
-          class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+          class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
         >
           p256 - broken
         </button>
       </div>
-      <div v-else>Verify New JWT -- requires creation first</div>
       <button
         @click="verifyMyJwt()"
-        class="font-bold uppercase bg-slate-500 text-white px-3 py-2 rounded-md mr-2"
+        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
       >
-        Verify Hard-Coded JWT
+        Verify Mine
       </button>
     </div>
   </section>
@@ -243,25 +236,18 @@ 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";
-import { accountsDB, db, retrieveSettingsForActiveAccount } from "@/db/index";
-import * as vcLib from "@/libs/crypto/vc";
+import { accountsDB, db } from "@/db/index";
 import {
+  createPeerDid,
   PeerSetup,
+  registerCredential,
   verifyJwtP256,
   verifyJwtSimplewebauthn,
   verifyJwtWebCrypto,
-} from "@/libs/crypto/vc/passkeyDidPeer";
-import {
-  AccountKeyInfo,
-  blobToBase64,
-  getAccount,
-  registerAndSavePasskey,
-  SHARED_PHOTO_BASE64_KEY,
-} from "@/libs/util";
+} from "@/libs/didPeer";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 const inputFileNameRef = ref<Blob>();
 
@@ -277,8 +263,6 @@ const TEST_PAYLOAD = {
 
 @Component({ components: { QuickNav } })
 export default class Help extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
   // for file import
   fileName?: string;
 
@@ -290,9 +274,10 @@ export default class Help extends Vue {
   userName?: string;
 
   async mounted() {
-    const settings = await retrieveSettingsForActiveAccount();
-    this.activeDid = settings.activeDid || "";
-    this.userName = settings.firstName;
+    await db.open();
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.activeDid = (settings?.activeDid as string) || "";
+    this.userName = settings?.firstName as string;
 
     await accountsDB.open();
     const account: { identity?: string } | undefined = await accountsDB.accounts
@@ -309,7 +294,7 @@ export default class Help extends Vue {
   }
 
   async uploadFile(event: Event) {
-    inputFileNameRef.value = event.target?.["files"][0];
+    inputFileNameRef.value = event.target.files[0];
     // https://developer.mozilla.org/en-US/docs/Web/API/File
     // ... plus it has a `type` property from my testing
     const file = inputFileNameRef.value;
@@ -321,13 +306,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 });
           }
         }
       };
@@ -340,41 +324,21 @@ export default class Help extends Vue {
   }
 
   public async register() {
-    const DEFAULT_USERNAME = AppString.APP_NAME + " Tester";
-    if (!this.userName) {
-      this.$notify(
-        {
-          group: "modal",
-          type: "confirm",
-          title: "No Name",
-          text: "You should have a name to attach to this passkey. Would you like to enter your own name first?",
-          onNo: async () => {
-            this.userName = DEFAULT_USERNAME;
-          },
-          onYes: async () => {
-            (this.$router as Router).push({ name: "new-edit-account" });
-          },
-          noText: "try again and use " + DEFAULT_USERNAME,
-        },
-        -1,
-      );
-      return;
-    }
-    const account = await registerAndSavePasskey(
-      AppString.APP_NAME + " - " + this.userName,
-    );
-    this.activeDid = account.did;
-    this.credIdHex = account.passkeyCredIdHex;
+    const cred = await registerCredential(this.userName);
+    const publicKeyBytes = cred.publicKeyBytes;
+    this.activeDid = createPeerDid(publicKeyBytes as Uint8Array);
+    this.credIdHex = cred.credIdHex as string;
+
+    await accountsDB.open();
+    await accountsDB.accounts.add({
+      dateCreated: new Date().toISOString(),
+      did: this.activeDid,
+      passkeyCredIdHex: this.credIdHex,
+      publicKeyHex: Buffer.from(publicKeyBytes).toString("hex"),
+    });``
   }
 
   public async createJwtSimplewebauthn() {
-    const account: AccountKeyInfo | undefined = await getAccount(
-      this.activeDid || "",
-    );
-    if (!vcLib.isFromPasskey(account)) {
-      alert(`The DID ${this.activeDid} is not passkey-enabled.`);
-      return;
-    }
     this.peerSetup = new PeerSetup();
     this.jwt = await this.peerSetup.createJwtSimplewebauthn(
       this.activeDid as string,
@@ -385,13 +349,6 @@ export default class Help extends Vue {
   }
 
   public async createJwtNavigator() {
-    const account: AccountKeyInfo | undefined = await getAccount(
-      this.activeDid || "",
-    );
-    if (!vcLib.isFromPasskey(account)) {
-      alert(`The DID ${this.activeDid} is not passkey-enabled.`);
-      return;
-    }
     this.peerSetup = new PeerSetup();
     this.jwt = await this.peerSetup.createJwtNavigator(
       this.activeDid as string,
@@ -403,46 +360,44 @@ export default class Help extends Vue {
 
   public async verifyP256() {
     const decoded = await verifyJwtP256(
-      this.credIdHex as string,
+      this.credIdHex as Base64URLString,
       this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
+      this.peerSetup.authenticatorData as ArrayBuffer,
+      this.peerSetup.challenge as Uint8Array,
+      this.peerSetup.clientDataJsonBase64Url as Base64URLString,
+      this.peerSetup.signature as Base64URLString,
     );
     console.log("decoded", decoded);
   }
 
   public async verifySimplewebauthn() {
     const decoded = await verifyJwtSimplewebauthn(
-      this.credIdHex as string,
+      this.credIdHex as Base64URLString,
       this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
+      this.peerSetup.authenticatorData as ArrayBuffer,
+      this.peerSetup.challenge as Uint8Array,
+      this.peerSetup.clientDataJsonBase64Url as Base64URLString,
+      this.peerSetup.signature as Base64URLString,
     );
     console.log("decoded", decoded);
   }
 
   public async verifyWebCrypto() {
     const decoded = await verifyJwtWebCrypto(
-      this.credIdHex as string,
+      this.credIdHex as Base64URLString,
       this.activeDid as string,
-      this.peerSetup?.authenticatorData as ArrayBuffer,
-      this.peerSetup?.challenge as Uint8Array,
-      this.peerSetup?.clientDataJsonBase64Url as Base64URLString,
-      this.peerSetup?.signature as Base64URLString,
+      this.peerSetup.authenticatorData as ArrayBuffer,
+      this.peerSetup.challenge as Uint8Array,
+      this.peerSetup.clientDataJsonBase64Url as Base64URLString,
+      this.peerSetup.signature as Base64URLString,
     );
     console.log("decoded", decoded);
   }
-
   public async verifyMyJwt() {
-    const did =
-      "did:peer:0zKMFjvUgYrM1hXwDciYHiA9MxXtJPXnRLJvqoMNAKoDLX9pKMWLb3VDsgua1p2zW1xXRsjZSTNsfvMnNyMS7dB4k7NAhFwL3pXBrBXgyYJ9ri";
     const jwt =
       "eyJ0eXAiOiJKV0FOVCIsImFsZyI6IkVTMjU2In0.eyJBdXRoZW50aWNhdGlvbkRhdGFCNjRVUkwiOiJTWllONVlnT2pHaDBOQmNQWkhaZ1c0X2tycm1paGpMSG1Wenp1b01kbDJNRkFBQUFBQSIsIkNsaWVudERhdGFKU09OQjY0VVJMIjoiZXlKMGVYQmxJam9pZDJWaVlYVjBhRzR1WjJWMElpd2lZMmhoYkd4bGJtZGxJam9pWlhsS01sbDVTVFpsZVVwcVkyMVdhMXBYTlRCaFYwWnpWVE5XYVdGdFZtcGtRMGsyWlhsS1FWa3lPWFZrUjFZMFpFTkpOa2x0YURCa1NFSjZUMms0ZG1NeVRtOWFWekZvVEcwNWVWcDVTWE5KYTBJd1pWaENiRWxxYjJsU01td3lXbFZHYW1SSGJIWmlhVWx6U1cxU2JHTXlUbmxoV0VJd1lWYzVkVWxxYjJsalIydzJaVzFGYVdaWU1ITkpiV3hvWkVOSk5rMVVZM2hQUkZVMFRtcHJOVTFEZDJsaFdFNTZTV3B2YVZwSGJHdFBia0pzV2xoSk5rMUljRXhVVlZweFpHeFdibGRZU2s1TlYyaFpaREJTYW1GV2JFbGhWVVUxVkZob1dXUkZjRkZYUnpWVFZFVndNbU5YT1U1VWEwWk1ZakJTVFZkRWJIZFRNREZZVkVkSmVsWnJVbnBhTTFab1RWaEJlV1ZzWTNobFJtaFRZekp3WVZVeFVrOWpNbG95VkZjMVQyVlZNVlJPTWxKRFRrZHpNMVJyUm05U2JtUk5UVE5DV1ZGdVNrTlhSMlExVjFWdk5XTnRhMmxtVVNJc0ltOXlhV2RwYmlJNkltaDBkSEE2THk5c2IyTmhiR2h2YzNRNk9EQTRNQ0lzSW1OeWIzTnpUM0pwWjJsdUlqcG1ZV3h6WlgwIiwiaWF0IjoxNzE4NTg2OTkyLCJpc3MiOiJkaWQ6cGVlcjowektNRmp2VWdZck0xaFh3RGNpWUhpQTlNeFh0SlBYblJMSnZxb01OQUtvRExYOXBLTVdMYjNWRHNndWExcDJ6VzF4WFJzalpTVE5zZnZNbk55TVM3ZEI0azdOQWhGd0wzcFhCckJYZ3lZSjlyaSJ9.MEUCIQDJyCTbMPIFnuBoW3FYnlgtDEIHZ2OrkCEvqVnHU7kJDQIgVxjBjfW1TwQfcSOYwK8Z7AdCWGJlyxtLEsrnPif7caE";
     const pieces = jwt.split(".");
+    console.log("pieces", typeof pieces[1], pieces);
     const payload = JSON.parse(Buffer.from(pieces[1], "base64").toString());
     const authData = Buffer.from(payload["AuthenticationDataB64URL"], "base64");
     const clientJSON = Buffer.from(
@@ -453,8 +408,8 @@ export default class Help extends Vue {
     const challenge = clientData.challenge;
     const signatureB64URL = pieces[2];
     const decoded = await verifyJwtWebCrypto(
-      this.credIdHex as string,
-      did,
+      this.credIdHex as Base64URLString,
+      this.activeDid as string,
       authData,
       challenge,
       payload["ClientDataJSONB64URL"],

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,143 +0,0 @@
-import { test, expect } from '@playwright/test';
-import { deleteContact, 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 ability to share contact', 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 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 test API setting (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();
-
-  // now delete the contact to test that pages still do reasonable things
-  await deleteContact(page, newDid);
-  // go the activity page for this new person
-  await page.goto('./did/' + encodeURIComponent(newDid));
-  // maybe replace by: const popupPromise = page.waitForEvent('popup');
-  let error;
-  try {
-    await page.waitForSelector('div[role="alert"]', { timeout: 2000 });
-    error = new Error('Error alert should not show.');
-  } catch (error) {
-    // success
-  } finally {
-    if (error) {
-      throw error;
-    }
-  }
-});

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,58 +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 ";
-  const standardWebsite = 'https://example.com';
-
-  // 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);
-  }
-
-  // Set date
-  const today = new Date();
-  const oneMonthAhead = new Date(today.setDate(today.getDate() + 30));
-  const standardDate = oneMonthAhead.toISOString().split('T')[0];
-
-  // Set time
-  const now = new Date();
-  const futureTime = new Date(now.setHours(now.getHours() + 1));
-  const standardHour = futureTime.getHours().toString().padStart(2, '0');
-  const standardMinute = futureTime.getMinutes().toString().padStart(2, '0');
-  const standardTime = `${standardHour}:${standardMinute}`;
-
-  // 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(standardWebsite);
-    await page.getByPlaceholder('Start Date').fill(standardDate);
-    await page.getByPlaceholder('Start Time').fill(standardTime);
-    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 9 new gifts', async ({ page }) => {
-  const giftCount = 9; // because 10 has taken us above 30 seconds
-
-  // 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,197 +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 #000 renamed';
-
-  // 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();
-  // await page.locator('.dialog > .flex > button').first().click(); // close alert
-
-  // 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('./');
-
-  // Firefox complains on load the initial feed here when we use the test server.
-  // It may be similar to the CORS problem below.
-  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('Without being registered, add contacts without registration', async ({ page, context }) => {
-  await page.goto('./account');
-  // wait until the DID shows on the page in the 'did' element
-  const didElem = await page.getByTestId('didWrapper').locator('code');
-  const newDid = await didElem.innerText();
-  expect(newDid.trim()).toEqual('');
-
-  // Add new contact without registering
-  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"] span:has-text("Contact Added")')).toBeVisible();
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss info alert
-  // wait for the alert to disappear, which also ensures that there is no "Register" button waiting
-  await expect(page.locator('div[role="alert"]')).toBeHidden();
-
-});
-
-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
-  await expect(page.locator('div[role="alert"]')).toBeHidden();
-  // 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();
-  await page.getByRole('heading', { name: 'Identifier Details' }).isVisible();
-  // 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();
-
-  // Firefox has a problem when we run this against the test server. It doesn't load the feed.
-  // It says there's a CORS problem; maybe it's more strict than the other browsers.
-  // It works when we set the config to use a local server.
-  // Seems like we hit a similar problem above.
-  await page.locator('div[role="alert"] button > svg.fa-xmark').click(); // dismiss alert
-  await expect(page.locator('div[role="alert"]')).toBeHidden();
-
-  // 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);
-
-  // Import via the file backup-import
-  await page.goto('./account');
-  await page.getByRole('heading', { name: 'Advanced' }).click();
-  const fileSelect = await page.locator('input[type="file"]')
-  //fileSelect.click();
-  fileSelect.setInputFiles('./test-playwright/exported-data.json');
-  await page.locator('button', { hasText: 'Import Only Contacts' }).click();
-  // we're on the contact-import page
-  await expect(page.locator('li', { hasText: '- New' })).toHaveCount(3);
-  await expect(page.locator('li', { hasText: '- Existing' })).toHaveCount(1);
-  await expect(page.locator('span').filter({ hasText: 'the same as' })).toBeHidden();
-  await page.locator('button', { hasText: 'Import' }).click();
-  // check that there are more contacts
-  await expect(page.getByTestId('contactListItem')).toHaveCount(5);
-  // The visibility error is because currently the server returns an error for the same person.
-  // But it should only show that one, for User #000.
-
-});