fix tests, add test for offer update

Reviewed-on: trent_larson/crowd-funder-for-time-pwa#122

.env.development

@@ -0,0 +1,3 @@
+
+# I tried and failed to set things here with vue-cli-service but
+# things may be more reliable with vite so let's try again.

.env.production

@@ -0,0 +1,4 @@
+# Only the variables that start with VITE_ are seen in the application import.meta.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

.eslintrc.js

@@ -2,6 +2,7 @@ module.exports = {
   root: true,
   env: {
     node: true,
+    es2022: true,
   },
   extends: [
     "plugin:vue/vue3-essential",
@@ -9,9 +10,9 @@ module.exports = {
     "@vue/typescript/recommended",
     "plugin:prettier/recommended",
   ],
-  parserOptions: {
-    ecmaVersion: 2020,
-  },
+  // parserOptions: {
+  //   ecmaVersion: 2020,
+  // },
   rules: {
     "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
     "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",

.github/workflows/playwright.yml

@@ -0,0 +1,27 @@
+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

@@ -2,6 +2,8 @@
 node_modules
 /dist
 signature.bin
+# generated during `npm run build`
+sw_scripts-combined.js
 *.pem
 verified.txt
 myenv
@@ -25,3 +27,7 @@ pnpm-debug.log*
 *.njsproj
 *.sln
 *.sw?
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/

CHANGELOG.md

@@ -6,10 +6,279 @@ 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).
 
 
-## [Unreleased]
+## ?
+### Fixed
+- List of offers wasn't showing.
 
+
+## [0.3.17] - 2024.07.11 - cefa384ff1a2d922848c370640c096c529920fab
 ### Added
-- Web push notifications
+- 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
+### Added
+- Clearer give-confirmation screen
+- BX currency https://thebx.medium.com/
+- Deselection of project on gifted details page
+### Fixed
+- Don't show registration pop-up for a new contact that is registered
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.13] - 2024.05.24 - 08b67984e443c58d9178ad3776013b0bce7afddc
+### Added
+- Photos on projects
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.12] - 2024.05.19 - 141fb39ad19c44d82fe1a33bf85115beacf50870
+### Fixed
+- Photo share (share_target) failed because requests were sent to server
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.11] - 2024.05.19 - 567bcad88dfb7e9ac8fea72530d1163985e4a7cc
+### Added
+- Choose a file for gifts, and a URL for gifts & profiles
+### Fixed
+- Multiple button pushes were required to switch camera
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.10] - 2024.05.11 - 03ac31d98110f7828cf9acb366db8d01b185f64c
+### Added
+- Share an image
+- Choose a file on the device for a profile image
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.9] - 2024.04.28 - 874e717e698b93a1ace9f588e675b8a3dccd7617
+### Added
+- Offers on contacts page
+- Checks on front page until they show as registered
+### Changed
+- Scanned contacts now add immediately and prompt for registration.
+- Better UI for gives on contact page
+- Better UI for all confirmation messages
+### Fixed
+- Repeated elements at top of main feed
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.8] - 2024.04.20 - 15c026c80ce03a26cae3ff80b0888934c101c7e2
+### Added
+- Profile image for user
+### Fixed
+- Slow loading of home page feed
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.7] - 2024.04.10 - cf18f1543a700d62a5f9e764905a4aafe1fb229b
+### Added
+- Filter on home page feed
+- Ability to set time of daily notification
+- Jump to app on click of notification
+### Changed
+- Built with vite
+- Descriptions on home page to include projects
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.6] - 2024.03.24 - 3a07e31d6313ab95711265562d9023c42916e141
+### Added
+- Button to mirror photo during video
+- More detailed onboarding help screen
+- Public-data blurb
+### Changed in DB or environment
+- Nothing
+
+
+## [0.3.5] - 2024.03.23 - 28754bdfb1e11aa221dd49a5dce4219b69cf6a9d
+### Added
+- Photo on gift records
+### Fixed
+- Environment variable for BVC meetings project
+- Environment variables and build enhancements for test vs prod
+### Changed in DB or environment
+- New environment variable for image API server
+- Test that a new browser session will get the right default APIs.
+- Test that a new browser session will send the right BVC meetings project.
+
+
+## [0.2.17] - 2024.03.01 - 3612ea42240c5e1b7d7eff29a39ff18f1b869b36
+### Added
+- Shortcut page for Bountiful Voluntaryist Community
+### Changed
+- More readable, targeted summaries in home-page feed items
+### Changed in DB
+- Nothing
+
+
+## [0.2.14] - 2024.02.14 - 5f9edea1167dbfb64e16648764eed8c09b24eaeb
+### Changed
+- Combine all service worker scripts into a single file.
+### Changed in DB
+- Nothing
+
+
+## [0.2.13] - 2024.02.07
+### Added
+- Display of user's offers
+- Check for valid DIDs
+### Fixed
+- Name display on give prompt
+- Non-numbers on number input & autocapitalize on URL input
+### Changed in DB
+- Nothing
+
+
+## [0.2.12] - 2024.02.01
+### Added
+- Prompts for gratitude
+
+
+## [0.2.11] - 2024.01.28
+### Added
+- Actions to share claim data with contacts
+- Bulk CSV import from Endorser Mobile export
+- Dates on give summaries
+
+
+## [0.2.10] - 2024.01.18 - 667e1e8890b42de59cd939caca1a01c7a7a702be
+### Added
+- Person identicons for contacts
+- Confirmation & delivery directly from project page
+- Offer dialog now allows units
+- Links from claim detail page to the fulfilled project or offer
+- Link to project from home feed
+- Copy to clipboard in more places
+### Fixed
+- "More Contacts" for give on project page now links correctly.
+
+
+## [0.2.9] - 2024.01.15 - e5e702f8a5a53a6efbed48d35f0bc3cee63024a0
+### Fixed
+- Set visibility for new contact.
+
+
+## [0.2.8] - 2024.01.14
+### Added
+- Automatic ID creation from home page
+- Agent who can also edit a project
+### Fixed
+- Cannot declare anonymous gift
+
+
+## [0.2.7] - 2024.01.12
+### Added
+- Give to fulfill a particular offer
+- Give as part of a trade as opposed to a donation
+- Error notifications on import
+### Changed
+- Library security updates
+- Visibility of actions & confirmations on claim page
+### Fixed
+- Name of offerer
+
+
+## [0.2.2] - 2024.01.05
+### Added
+- Check for notification capability on front screen
+- Contact next-public-key-hash in manual textual input
+- Confirmation for contact visibility change
+- YAML rendering of full claim details
+- Hints for onboarding on the contact screen
+
+
+## [0.2.0] - 2024.01.04
+### Added
+- Contact next-public-key-hash
+- Icon for Android
+- More thorough messaging and testing for notifications
+
+
+## [0.1.9] - 2024.01.01
+### Added
+- Import for contacts and settings
+- Second download button for DuckDuckGo
+### Changed
+- Removed some keys from Dexie's IndexedDB declarations
+
+
+## [0.1.8] - 2023.12.27- d26d1d360152a7d0e559b68486e85b72b88bd9ff
+### Added
+- DB logging for service-worker events
+- Help page for notifications
+- Test notification & web-push triggers inside app
+- Check that the app is installed
+### Fixed
+- Project issuer display name
+
+
+## [0.1.7] - 2023.12.19 - 91c6c7c11c71f96006cc876fc946f1f98a274ba2
+### Changed
+- Icons
+### Fixed
+- Notification switch now shows message
+- Prod/test server warning message at top of page
+
+
+## [0.1.6] - 2023.12.17 - b445b1234fbfcf6b37d695373f259aab0eda1118
+### Added
+- Infinite scroll on home page
+### Changed
+- UI improvements
+- Show web-push subscription info
+- Icon
+
+
+## [0.1.5] - 2023.12.09 - 9c36bb509a9bae9bb3306d3bd9eeb144b67aa8ad
+### Added
+- Web push notifications (though not finalized)
+- Credentials details page
+- See more data without an ID
+- Change units of a give
+
+
+## [0.1.4] - 2023.11.20 - 7311d36726f3667ec4c68f241f91d404273ad4db
+### Added
+- Offer on a project
+### Changed
+- Automatically set as visible when importing a contact
+
 
 ## [0.1.3] - 2023.11.08 - 910f57ec7d2e50803ae3d04f4b927e0f5219fbde
 ### Added

CONTRIBUTING.md

@@ -0,0 +1,11 @@
+# Contributing
+
+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.

README.md

@@ -1,56 +1,118 @@
 # TimeSafari.app - Crowd-Funder for Time - PWA
 
-## Project setup
+[Time Safari](https://timesafari.org/) allows people to ease into collaboration: start with expressions of gratitude
+and expand to crowd-fund with time & money, then record and see the impact of contributions.
 
-We have pkgx.dev set up in package.json, so you can use `dev` to set up the dev environment.
+## Roadmap
+
+See [project.task.yaml](project.task.yaml) for current priorities.
+(Numbers at the beginning of lines are estimated hours. See [taskyaml.org](https://taskyaml.org/) for details.)
+
+## Setup
+
+We like pkgx: `sh <(curl https://pkgx.sh) +npm sh`
 
 ```
 npm install
 ```
 
-### Compiles and hot-reloads for development
+### Compile and hot-reloads for development
+```
+npm run dev
+```
+
+### Build the test & production app
 ```
 npm run serve
 ```
 
-### Lints and fixes files
+### Lint and fix files
 ```
 npm run lint
 ```
 
-### Compiles and minifies for production
+### Compile and minify for test & production
 
-If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
+* If there are DB changes: before updating the test server, open browser(s) with current version to test DB migrations.
 
+* `npx prettier --write ./sw_scripts/`
+
+* 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
 ```
+# (Let's replace this with a .env.development or .env.staging file.)
+# The test BVC_MEETUPS_PROJECT_CLAIM_ID does not resolve as a URL because it's only in the test DB and the prod redirect won't redirect there.
+TIME_SAFARI_APP_TITLE="TimeSafari_Test" VITE_BVC_MEETUPS_PROJECT_CLAIM_ID=https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK VITE_DEFAULT_ENDORSER_API_SERVER=https://test-api.endorser.ch VITE_DEFAULT_IMAGE_API_SERVER=https://test-image-api.timesafari.app VITE_PASSKEYS_ENABLED=yep npm run build
+```
+
+  * Production
+```
+# This picks up values from .env.production
 npm run build
 ```
 
-```
-npx prettier --write ./sw_scripts/
-```
-to make sure the service worker scripts are in proper form
+* Get on the server and back up the time-safari/dist folder.
+
+* `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari`
+
+* Commit changes. Record the new hash in the changelog. Edit package.json to increment version & add "-beta", `npm install`, and commit. Also record what version is on production.
+
+* [Tag with the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases)
 
-... then copy the contents of the `sw_scripts` folder to the `dist` folder - except additional_scripts.js.
 
 
 
 ## Tests
 
+### Automated
+
+Use the locally running Endorser server:
+
+* Clone and set up https://github.com/trentlarson/endorser-ch and run the following in that directory:
+```
+test/test.sh
+NODE_ENV=test-local npm run dev
+```
+
+* Now run the local tests:
+```
+npm run test-all
+```
+
+Note that a test will sometimes fail and rerunning may succeed (and repeat if a different test fails).
+
+
+
+
+It's possible to use the global test Endorser (ledger) server (but currently the tests don't all succeed):
+`npx playwright test`
+
+
+
+
+It's possible to run with a minimal set of data: the following starts with the bare minimum of test data (but currently the tests don't all succeed):
+```
+rm ../endorser-ch-test-local.sqlite3
+NODE_ENV=test-local npm run flyway migrate
+NODE_ENV=test-local npm run test test/controller0
+NODE_ENV=test-local npm run dev
+```
+
+
 ### Register new user on test server
 
 On the test server, User #0 has rights to register others, so you can start
-playing one of two ways:
-
-- Import the keys for the test User `did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F` by importing this seed phrase:
-  `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
-  (Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
-
-- Alternatively, register someone else under User #0 automatically:
-
-  * In the `src/views/AccountViewView.vue` file, uncomment the lines referring to "testServerRegisterUser".
-
-  * Visit the `/account` page.
+playing by importing that user and registering others. Import the keys for the test User
+`did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F` by importing this seed phrase:
+`rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
+(Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
 
 ### Create multiple identifiers
 
@@ -68,46 +130,70 @@ For your own web-push tests, change the push server URL in Advanced settings on
 
 To add an icon, add to main.ts and reference with `fa` element and `icon` attribute with the hyphenated name.
 
-### Manual walk-through
+### Manual walk-through test
 
-- Clear the browser cache for localhost for a new user.
-  - See that it's using the test API.
-  - On each page, verify the messaging.
-  - On the home page, see the feed without names, and see a message prompting to generate an ID.
+- Backup seed & data & get a CSV dump from Endorser Mobile.
+- If there were any DB changes, check that you're on the old version and reload the page and ensure you can still act and haven't lost data (ie. contacts, identities).
+- Use a mobile user as well as a desktop user.
+- Check that the version is updated.
+  - Clear the browser data & add identity & import Time Safari contacts and then CSV contacts.
+- Make sure that it's using the test API (under Identity in 'Advanced').
+- Clear the browser data again. (See "Reset" below.)
+  - Go to the account page before visiting the home page to see that there is no ID.
+  - On the home page:
+    - Check that it generated an ID.
+    - Check the feed without names.
+    - Copy the contact URL.
+  - On each page, verify the messaging, and that they cannot take action.
   - On the discovery page, check that they can see projects, and set a search area to see projects nearby.
-- As User #0 in another browser on the test API, add a give & a project. (See User #0 details above.)
-  - With the new user on the home page, see the feed that shows User #0 in network but without the name.
-- As the new user on the contacts page, add User #0 as a contact.
-  - On the home page, see the feed that shows User #0 with a name.
-- Generate an ID.
-  - On the home page, check that it now prompts them to get registered.
+  - On the contacts page, check that they can add a contact even without their own ID.
+- Install the PWA.
+- As User 0 in another browser on the test API, add a give & a project.
+  - Note that some combinations of desktop with mobile emulation stretch the image.
+  - Import User 0 with seed: `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
+  - Add new user as a contact (which allows them to see User 0).
+  - With the new user on the home page, see the feed that shows User 0 in network but without the name.
+- As the new user, import contacts & identifiers.
+- As the new user on the contacts page, add User 0 as a contact.
+  - On the home page, see the feed that shows User 0 with a name.
+- Switch back to the generated identifier.
   - On the account page, check that they see messages on limits.
-- Register the ID from User #0.
-  - As the new user on the home page, check that they can now record a gift.
-  - On the contacts page, check that they cannot register someone else yet.
+- As User 0, register the ID.
+- As the new user on the home page, check that they can now record a gift, and record an offer & delivery.
+- On the contacts page, check that they cannot register someone else yet.
 - Walk through the functions on each page.
-
-
-
-## Scenarios
-
-- Create a new identity as prompted. Go to "Your Identity" screen and copy the ID to the clipboard.
-
-- Go back to /start and import test User `did:ethr:0x000Ee5654b9742f6Fe18ea970e32b97ee2247B51` with this this seed phrase:
-  `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
-  (Other test users are found [here](https://github.com/trentlarson/endorser-ch/blob/master/test/util.js).)
-
-- Go to "Your Contacts" screen and add the ID you copied to the clipboard, and hit "+" to add them.
-
-- Click on the "Registration Unknown" button and register that person to be able to make claims as them.
+- Set and run notifications.
+- Export & import, both seed and contacts & settings.
+- Choose location on the search map.
+- Offer, deliver a give, and confirm. Create a third user and test connections.
+- On mobile, share an image with the app.
+- Switch to "no identifier" to see that things look OK without any ID.
 
 ### Clear/Reset data & restart
 
-* Clear cache for site. (In Chrome, go to `chrome://settings/cookies` and "all site data and permissions"; in Firefox, go to `about:preferences` and search for cache.)
-* Unregister service worker (in Chrome, go to `chrome://serviceworker-internals/`; in Firefox, go to `about:serviceworkers` or `about:debugging`).
-* Clear notification permission (in Chrome, go to `chrome://settings/content/notifications`; in Firefox, go to `about:preferences` and search).
-* Clear Cache Storage (in Chrome, in dev tools under Application; in Firefox, in dev tools under Storage).
+* Clear cache for site. (In Chrome, go to `chrome://settings/cookies` and "all site data and permissions"; in Firefox, go to `about:preferences` and search for "cache" then "Manage Data", and also manually remove the IndexedDB data if the DBs still show.)
+* Clear notification permission. (In Chrome, go to `chrome://settings/content/notifications`; in Firefox, go to `about:preferences` and search for "notifications".)
+* Unregister service worker. (In Chrome, go to `chrome://serviceworker-internals`; in Firefox, go to `about:serviceworkers`.)
+* Clear Cache Storage manually, possibly deleting the DB. (In Chrome, in dev tools under Application; in Firefox, in dev tools under Storage.)
 
+(If you find more, add them to the HelpNotificationsView.vue file.)
+
+
+
+## Troubleshooting
+
+* A problem with `GET http://localhost:8080/web-push/vapid` means the py-push-server is not running
+  (and notifications won't work for a local app without special routing from the browser's web push service provider, anyway).
+
+* Red errors everywhere with a console message like this:
+  `Error: An ID is chosen but there are no keys for it so it cannot be used to talk with the service`
+  ... has happened on account switching when the current account was erased (or maybe replaced -- once I had a duplicate and I don't know how).
+
+* The error `DEXIE ENCRYPT ADDON: Could not decrypt message!` or
+  `Encryption key has changed` means that the encryption key is wrong,
+  sometimes seen after clearing storage for testing; you can make it happen by clearing localStorage.
+  Maybe only part of the storage was cleared out. Unless you got a copy of that password, you'll
+  have to erase storage and reload the identifier.
 
 
 
@@ -120,12 +206,18 @@ To add an icon, add to main.ts and reference with `fa` element and `icon` attrib
 
 * [Customize Vue configuration](https://cli.vuejs.org/config/).
 
+* If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
+
 
 ### Kudos
 
 Gifts make the world go 'round!
 
+* [WebStorm by JetBrains](https://www.jetbrains.com/webstorm/) for the free open-source license
 * [Máximo Fernández](https://medium.com/@maxfarenas) for the 3D [code](https://github.com/maxfer03/vue-three-ns) and [explanatory post](https://medium.com/nicasource/building-an-interactive-web-portfolio-with-vue-three-js-part-three-implementing-three-js-452cb375ef80)
-* [Many tools & libraries]() such as Nodejs.org, IntelliJ Idea, Veramo.io, Vuejs.org, threejs.org
+* [Many tools & libraries](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/src/branch/master/package.json#L10) such as Nodejs.org, IntelliJ Idea, Veramo.io, Vuejs.org, threejs.org
 * [Bush 3D model](https://sketchfab.com/3d-models/lupine-plant-bf30f1110c174d4baedda0ed63778439)
 * [Forest floor image](https://www.goodfreephotos.com/albums/textures/leafy-autumn-forest-floor.jpg)
+* Time Safari logo assisted by [DALL-E in ChatGPT](https://chat.openai.com/g/g-2fkFE8rbu-dall-e)
+* [DiceBear](https://www.dicebear.com/licenses/) and [Avataaars](https://www.dicebear.com/styles/avataaars/#details) for human-looking identicons
+* Some gratitude prompts thanks to [Develop Good Habits](https://www.developgoodhabits.com/gratitude-journal-prompts/)

babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  presets: ["@vue/cli-plugin-babel/preset"],
-};

doc/README.md

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

doc/usage-guide.md

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

index.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width,initial-scale=1.0">
+    <link rel="icon" href="/favicon.ico">
+    <title>TimeSafari</title>
+  </head>
+  <body>
+    <noscript>
+      <strong>We're sorry but TimeSafari doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+    </noscript>
+    <div id="app"></div>
+    <script type="module" src="/src/main.ts"></script>
+  </body>
+</html>

package.json

@@ -1,88 +1,101 @@
 {
-  "name": "crowd-funder-for-time-pwa",
-  "version": "0.1.4",
-  "private": true,
+  "name": "TimeSafari",
+  "version": "0.3.18-beta",
   "scripts": {
-    "serve": "vue-cli-service serve",
-    "build": "vue-cli-service build",
-    "lint": "vue-cli-service lint"
+    "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"
   },
   "dependencies": {
+    "@dicebear/collection": "^5.4.1",
+    "@dicebear/core": "^5.4.1",
     "@ethersproject/hdnode": "^5.7.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.2",
-    "@fortawesome/free-solid-svg-icons": "^6.4.2",
-    "@fortawesome/vue-fontawesome": "^3.0.3",
+    "@fortawesome/fontawesome-svg-core": "^6.5.1",
+    "@fortawesome/free-solid-svg-icons": "^6.5.1",
+    "@fortawesome/vue-fontawesome": "^3.0.6",
+    "@peculiar/asn1-ecc": "^2.3.8",
+    "@peculiar/asn1-schema": "^2.3.8",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
-    "@tweenjs/tween.js": "^21.0.0",
-    "@veramo/core": "^5.4.1",
-    "@veramo/credential-w3c": "^5.4.1",
-    "@veramo/data-store": "^5.4.1",
-    "@veramo/did-manager": "^5.4.1",
-    "@veramo/did-provider-ethr": "^5.4.1",
-    "@veramo/did-resolver": "^5.4.1",
-    "@veramo/key-manager": "^5.4.1",
-    "@vueuse/core": "^10.4.1",
+    "@simplewebauthn/browser": "^10.0.0",
+    "@simplewebauthn/server": "^10.0.0",
+    "@tweenjs/tween.js": "^21.1.1",
+    "@veramo/core": "^5.6.0",
+    "@veramo/credential-w3c": "^5.6.0",
+    "@veramo/data-store": "^5.6.0",
+    "@veramo/did-manager": "^5.6.0",
+    "@veramo/did-provider-ethr": "^5.6.0",
+    "@veramo/did-provider-peer": "^6.0.0",
+    "@veramo/did-resolver": "^5.6.0",
+    "@veramo/key-manager": "^5.6.0",
+    "@vueuse/core": "^10.9.0",
     "@zxing/text-encoding": "^0.9.0",
-    "axios": "^1.5.0",
-    "buffer": "^6.0.3",
+    "asn1-ber": "^1.2.2",
+    "axios": "^1.6.8",
+    "cbor-x": "^1.5.9",
     "class-transformer": "^0.5.1",
-    "core-js": "^3.32.1",
-    "dexie": "^3.2.4",
-    "dexie-export-import": "^4.0.7",
-    "did-jwt": "^7.2.7",
-    "ethereum-cryptography": "^2.1.2",
+    "dexie": "^3.2.7",
+    "dexie-export-import": "^4.1.1",
+    "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",
-    "localstorage-slim": "^2.5.0",
-    "luxon": "^3.4.3",
-    "merkletreejs": "^0.3.10",
-    "moment": "^2.29.4",
+    "localstorage-slim": "^2.7.0",
+    "lru-cache": "^10.2.0",
+    "luxon": "^3.4.4",
+    "merkletreejs": "^0.3.11",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
     "pina": "^0.20.2204228",
-    "pinia-plugin-persistedstate": "^3.2.0",
+    "pinia-plugin-persistedstate": "^3.2.1",
     "qr-code-generator-vue3": "^1.4.21",
-    "ramda": "^0.29.0",
-    "readable-stream": "^4.4.2",
-    "reflect-metadata": "^0.1.13",
+    "ramda": "^0.29.1",
+    "readable-stream": "^4.5.2",
+    "reflect-metadata": "^0.1.14",
     "register-service-worker": "^1.7.2",
+    "simple-vue-camera": "^1.1.3",
     "three": "^0.156.1",
+    "ua-parser-js": "^1.0.37",
     "util": "^0.12.5",
-    "vue": "^3.3.4",
+    "vue": "^3.4.21",
     "vue-axios": "^3.5.2",
-    "vue-facing-decorator": "^3.0.2",
-    "vue-qrcode-reader": "^5.4.1",
-    "vue-router": "^4.2.4",
+    "vue-facing-decorator": "^3.0.4",
+    "vue-picture-cropper": "^0.7.0",
+    "vue-qrcode-reader": "^5.5.3",
+    "vue-router": "^4.3.0",
     "web-did-resolver": "^2.0.27"
   },
   "devDependencies": {
+    "@playwright/test": "^1.45.2",
     "@types/js-yaml": "^4.0.9",
-    "@types/leaflet": "^1.9.4",
-    "@types/ramda": "^0.29.3",
+    "@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",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
+    "@types/ua-parser-js": "^0.7.39",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
+    "@vitejs/plugin-vue": "^5.0.4",
     "@vue-leaflet/vue-leaflet": "^0.10.1",
-    "@vue/cli-plugin-babel": "~5.0.8",
-    "@vue/cli-plugin-eslint": "~5.0.8",
-    "@vue/cli-plugin-pwa": "~5.0.8",
-    "@vue/cli-plugin-router": "~5.0.8",
-    "@vue/cli-plugin-typescript": "~5.0.8",
-    "@vue/cli-plugin-vuex": "~5.0.8",
-    "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-typescript": "^11.0.3",
-    "autoprefixer": "^10.4.15",
-    "eslint": "^8.53.0",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-prettier": "^5.0.0",
-    "eslint-plugin-vue": "^9.17.0",
+    "autoprefixer": "^10.4.19",
+    "eslint": "^8.57.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-vue": "^9.23.0",
     "leaflet": "^1.9.4",
-    "postcss": "^8.4.29",
-    "prettier": "^3.1.0",
-    "tailwindcss": "^3.3.3",
-    "typescript": "~5.2.2"
+    "postcss": "^8.4.38",
+    "prettier": "^3.2.5",
+    "tailwindcss": "^3.4.1",
+    "typescript": "~5.2.2",
+    "vite": "^5.2.0",
+    "vite-plugin-pwa": "^0.19.8"
   }
 }

playwright.config-local.ts

@@ -0,0 +1,98 @@
+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: 10000,
+
+  /* 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

@@ -0,0 +1,82 @@
+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,
+  // },
+});

project.task.yaml

@@ -1,122 +1,4 @@
 
-tasks:
+tasks :
 
-- 40 notifications :
-  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
-  - extract private_key_hex in py-push-server webpush.py
-  - lock down regenerate_vapid endpoint (so only we admins can do it on demand)
-  - remove sleep in py-push-server app.py
-  - revisit "maybe" and "never" buttons on accont screen
-  - see if we can detect OS-level notifications if turned off
-  - write troubleshooting docs for notifications
-  - in py-push-server, when sending a push to a subscriber and we get on a 410 "error #106", delete the subscription record
-
-- .3 fix the Project-location-selection map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
-
-- .5 Add infinite scroll to gifts on the home page
-
-- .5 If notifications are not enabled, add message to front page with link/button to enable
-
-- add note after contact addition that they can see your info
-- enhance help page instructions for debugging
-- add way to test quickly a push notification
-- help instructions for PWA install problems (secret failed, must reinstall)
-- look at other examples for better UI friend.tech
-
-- show VC details... somehow:
-  - 01 show my VCs - most interesting, or via search
-  - 01 allow download of each VC (& confirmations, to show that they actually own their data)
-  - 04 allow user to download VCs, mine + ones I can see about me from others
-  - add VC confirmation?
-
-- Release Minimum Viable Product :
-  - generate new webpush.db entry, webpush.py private_key_hex & subscription_info & vapid_claims email
-  - .5 deploy endorser.ch server above Dec 1 (to get plan searches by names as well as descriptions)
-  - 08 thorough testing for errors & edge cases
-  - 01 ensure ability to recover server remotely, and add redundant access
-  - Turn off stats-world or ensure it's usable (eg. cannot zoom out too far and lose world, cannot screenshot).
-  - Add disclaimers.
-  - Switch default server to the public server.
-  - Deploy to a server.
-  - Ensure public server has limits that work for group adoption.
-  - Test PWA features on Android and iOS.
-  - Other features - donation vs give, show offers, show give & outstanding totals, show network view, restrict registration, connect to contacts
-  blocks: ref:https://raw.githubusercontent.com/trentlarson/lives-of-gifts/master/project.yaml#kickstarter%20for%20time
-
-- make identicons for contacts into more-memorable faces (and maybe change project identicons, too)
-- allow some gives even if they aren't registered
-- .5 Add start date to project
-- .3 check that Android shows "back" buttons on screens without bottom tray
-- .1 Make give description text box into something that expands as they type?
-- .5 customize favicon assignee-group:ui
-- .2 Show a warning if both giver and recipient are the same (but still allow?)
-- 01 Would it look better to shrink the buttons on many pages so they don't expand to the width of the screen? assignee-group:ui
-- .5 Display a more appealing confirmation on the map when erasing the marker
-- .5 include the hash of the latest commit on help page next to version (maybe Trent's git-hash branch)
-- .5 remove references to localStorage for projectId (now that it's pulling from the path)
-- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
-- switch some checks for activeDid to check for isRegistered
-- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
-- .5 fix cert generation on server (since it didn't happen automatically for Nov 30)
-- contacts v+ :
-  - 01 Import all the non-sensitive data (ie. contacts & settings).
-  - .2 show error to user when adding a duplicate contact
-  - 01 parse input more robustly (with CSV lib and not commas)
-- stats v1 :
-  - 01 show numeric stats
-  - 04 show different graphic for projects vs people (gnome?) on world
-  - 01 link to world for specific stats
-  - .5 don't load another instance of a bush if it already exists
-  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
-  - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)
-
-- .5 show seed phrase in a QR code for transfer to another device
-- .5 on DiscoverView, switch to a filter UI (eg. just from friend
-- .5 don't show "Offer" on project screen if they aren't registered
-
-- 24 Move to Vite
-- 32 accept images for projects
-- 32 accept images for contacts
-
-- linking between projects or plans :
-  - show total time given to & from a project
-  - terminology:
-    - for subtasks: fulfills (is it really the same?), feeds, contributes to, supplies, boosts, advances
-    - for blocking: blocks, precedes, comes before, is sought by -- vs follows, seeks, builds on ("contributes to" isn't specific enough, "succeeds" has different, possibly confusing meaning)
-
-- .5 add "back" button to all screens that aren't part of the bottom tray
-- .5 fit as many icons as possible on home & project view screens but only going halfway down the page assignee-group:ui
-- .5 Replace Gifted/Give in ContactsView with GiftedDialog
-
-- Stats :
-  - 01 point out user's location on the world
-  - 01 present a credential selected from the stats
-  - 04 show gives spreading to other places
-  - badge for most gives/receives/confirms per day/week/month
-  - badge for amount given/offered to your project
-  - set a goal of given/offers
-
-- automated tests, eg. cypress
-
-- Notifications (wake on the phone, push notifications)
-
-- Connect with phone contacts
-
-- Multiple identities
-
-- Support KERI AIDs
-- Support Peer DIDs
-- Support messaging through DIDComm
-- Write to or read from a different ledger (eg. private ACDC, EAS & attest.sh)
-
-- Do we want split first name & last name?
-
-- 40 notifications v+ :
-  - pull, w/ scheduled runs
-
-- 01 On nearby search, if user starts changing their box but cancels and goes back to the map it is zoomed far out. Fix to fit the box better.
-- 16 From the home screen, make the quick action even easier.
-
-log:
-- videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29
-- project lists, contact totals & actions, multiple identifiers, stats-world, activity feed, rename of this project file (use "--follow --") milestone:2 done:2023-06-27
+- This list has moved - see https://sharing.clickup.com/9014278710/l/h/6-901402735154-1/685f1be3f9b150d

public/index.html

@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-<html lang="">
-  <head>
-    <meta charset="utf-8">
-    <meta http-equiv="X-UA-Compatible" content="IE=edge">
-    <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
-    <title><%= htmlWebpackPlugin.options.title %></title>
-  </head>
-  <body>
-    <noscript>
-      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
-    </noscript>
-    <div id="app"></div>
-    <!-- built files will be auto injected -->
-  </body>
-</html>

src/App.vue

@@ -1,7 +1,7 @@
 <template>
   <router-view />
 
-  <!-- https://github.com/emmanuelsw/notiwind -->
+  <!-- Messages in the upper-right - https://github.com/emmanuelsw/notiwind -->
   <NotificationGroup group="alert">
     <div
       class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
@@ -129,6 +129,10 @@
     </div>
   </NotificationGroup>
 
+  <!--
+    This "group" of "modal" is the prompt for an answer.
+    Set "type" as follows: "confirm" for yes/no, and "notification" ones: "-permission", "-mute", "-off"
+  -->
   <NotificationGroup group="modal">
     <div class="fixed z-[100] top-0 inset-x-0 w-full">
       <Notification
@@ -142,12 +146,97 @@
         move="transition duration-500"
         move-delay="delay-300"
       >
+        <!-- see NotificationIface in constants/app.ts -->
         <div
           v-for="notification in notifications"
           :key="notification.id"
           class="w-full"
           role="alert"
         >
+          <!--
+           Type of "confirm" will post a message.
+           With onYes function, show a "Yes" button to call that function.
+           With onNo function, show a "No" button to call that function,
+             and pass it state of "askAgain" field shown if you set promptToStopAsking.
+          -->
+          <div
+            v-if="notification.type === 'confirm'"
+            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
+          >
+            <div
+              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
+            >
+              <div class="w-full px-6 py-6 text-slate-900 text-center">
+                <span class="font-semibold text-lg">
+                  {{ notification.title }}
+                </span>
+                <p class="text-sm mb-2">{{ notification.text }}</p>
+
+                <button
+                  v-if="notification.onYes"
+                  @click="
+                    notification.onYes();
+                    close(notification.id);
+                  "
+                  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 : "" }}
+                </button>
+
+                <button
+                  v-if="notification.onNo"
+                  @click="
+                    notification.onNo(stopAsking);
+                    close(notification.id);
+                    stopAsking = false; // reset value
+                  "
+                  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 : "" }}
+                </button>
+
+                <label
+                  v-if="notification.promptToStopAsking && notification.onNo"
+                  for="toggleStopAsking"
+                  class="flex items-center justify-between cursor-pointer my-4"
+                  @click="stopAsking = !stopAsking"
+                >
+                  <!-- label -->
+                  <span class="ml-2">... and do not ask again.</span>
+                  <!-- toggle -->
+                  <div class="relative ml-2">
+                    <!-- input -->
+                    <input
+                      type="checkbox"
+                      v-model="stopAsking"
+                      name="stopAsking"
+                      class="sr-only"
+                    />
+                    <!-- line -->
+                    <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+                    <!-- dot -->
+                    <div
+                      class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+                    ></div>
+                  </div>
+                </label>
+
+                <button
+                  @click="
+                    notification.onCancel
+                      ? notification.onCancel(stopAsking)
+                      : null;
+                    close(notification.id);
+                    stopAsking = false; // reset value
+                  "
+                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
+                >
+                  {{ notification.onYes ? "Cancel" : "Close" }}
+                </button>
+              </div>
+            </div>
+          </div>
           <div
             v-if="notification.type === 'notification-permission'"
             class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
@@ -156,33 +245,52 @@
               class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
             >
               <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <p class="text-lg mb-4">
-                  Would you like to <b>turn on</b> notifications for this app?
+                <p v-if="serviceWorkerReady" class="text-lg mb-4">
+                  Would you like to be notified of new activity once a day?
+                </p>
+                <p v-else class="text-lg mb-4">
+                  Waiting for system initialization, which may take up to 10
+                  seconds...
+                  <fa icon="spinner" spin />
                 </p>
 
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
-                    close(notification.id);
-                    turnOnNotifications();
-                  "
-                >
-                  Turn on Notifications
-                </button>
-                <div class="grid grid-cols-2 gap-2">
+                <div v-if="serviceWorkerReady">
+                  <span class="flex flex-row justify-center">
+                    <span class="mt-2">Yes, tell me at: </span>
+                    <input
+                      type="number"
+                      class="rounded-l border border-r-0 border-slate-400 ml-2 mt-2 px-2 py-2 text-center w-20"
+                      v-model="hourInput"
+                    />
+                    <span
+                      class="rounded-r border border-slate-400 bg-slate-200 text-center text-blue-500 mt-2 px-2 py-2 w-20"
+                      @click="hourAm = !hourAm"
+                    >
+                      <span v-if="hourAm"> AM <fa icon="chevron-down" /> </span>
+                      <span v-else> PM <fa icon="chevron-up" /> </span>
+                    </span>
+                  </span>
                   <button
-                    @click="maybeLater(notification.id)"
-                    class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
+                    class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white mt-2 px-2 py-2 rounded-md"
+                    @click="
+                      () => {
+                        if (checkHour()) {
+                          close(notification.id);
+                          turnOnNotifications();
+                        }
+                      }
+                    "
                   >
-                    Maybe Later
-                  </button>
-                  <button
-                    @click="never(notification.id)"
-                    class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md"
-                  >
-                    Never
+                    Turn on Daily Message
                   </button>
                 </div>
+
+                <button
+                  @click="close(notification.id)"
+                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white mt-4 px-2 py-2 rounded-md"
+                >
+                  No, Not Now
+                </button>
               </div>
             </div>
           </div>
@@ -238,6 +346,10 @@
                 </p>
 
                 <button
+                  @click="
+                    close(notification.id);
+                    turnOffNotifications();
+                  "
                   class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md mb-2"
                 >
                   Turn Off Notifications
@@ -260,8 +372,11 @@
 <style></style>
 
 <script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
 import axios from "axios";
+import { Vue, Component } from "vue-facing-decorator";
+
+import * as libsUtil from "@/libs/util";
+
 interface ServiceWorkerMessage {
   type: string;
   data: string;
@@ -285,64 +400,78 @@ interface VapidResponse {
   };
 }
 
-import { AppString } from "@/constants/app";
+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";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { sendTestThroughPushServer } from "@/libs/util";
 
 @Component
 export default class App extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
+  stopAsking = false;
   b64 = "";
+  hourAm = true;
+  hourInput = "8";
+  serviceWorkerReady = true;
 
   async mounted() {
     try {
       await db.open();
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      let pushUrl: string = AppString.DEFAULT_PUSH_SERVER;
+      let pushUrl = DEFAULT_PUSH_SERVER;
       if (settings?.webPushServer) {
         pushUrl = settings.webPushServer;
       }
 
-      await axios
-        .get(pushUrl + "/web-push/vapid")
-        .then((response: VapidResponse) => {
-          this.b64 = response.data?.vapidKey || "";
-          console.log("Got vapid key:", this.b64);
-          navigator.serviceWorker.addEventListener("controllerchange", () => {
-            console.log("New service worker is now controlling the page");
+      if (pushUrl.startsWith("http://localhost")) {
+        console.log("Not checking for VAPID in this local environment.");
+      } else {
+        await axios
+          .get(pushUrl + "/web-push/vapid")
+          .then((response: VapidResponse) => {
+            this.b64 = response.data?.vapidKey || "";
+            console.log("Got vapid key:", this.b64);
+            navigator.serviceWorker.addEventListener("controllerchange", () => {
+              console.log("New service worker is now controlling the page");
+            });
           });
-        });
-      if (!this.b64) {
+        if (!this.b64) {
+          this.$notify(
+            {
+              group: "alert",
+              type: "danger",
+              title: "Error Setting Notifications",
+              text: "Could not set notifications.",
+            },
+            -1,
+          );
+        }
+      }
+    } catch (error) {
+      if (window.location.host.startsWith("localhost")) {
+        console.log("Ignoring the error getting VAPID for local development.");
+      } else {
+        console.error("Got an error initializing notifications:", error);
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error Setting Notifications",
-            text: "Could not set notifications.",
+            text: "Got an error setting notifications.",
           },
           -1,
         );
       }
-    } catch (error) {
-      console.error("Got an error initializing notifications:", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Setting Notifications",
-          text: "Got an error setting notifications.",
-        },
-        -1,
-      );
     }
+    // there may be a long pause here on first initialization
+    navigator.serviceWorker?.ready.then(() => {
+      this.serviceWorkerReady = true;
+    });
   }
 
   private sendMessageToServiceWorker(
@@ -370,6 +499,7 @@ export default class App extends Vue {
   }
 
   private askPermission(): Promise<NotificationPermission> {
+    console.log("Requesting permission for notifications:", navigator);
     if (!("serviceWorker" in navigator && navigator.serviceWorker.controller)) {
       return Promise.reject("Service worker not available.");
     }
@@ -410,14 +540,59 @@ export default class App extends Vue {
   private requestNotificationPermission(): Promise<NotificationPermission> {
     return Notification.requestPermission().then((permission) => {
       if (permission !== "granted") {
-        alert("We need notification permission to provide certain features.");
+        alert(
+          "Allow this app permission to make notifications for personal reminders." +
+            " You can adjust them at any time in your settings.",
+        );
         throw new Error("We weren't granted permission.");
       }
       return permission;
     });
   }
 
-  async turnOnNotifications() {
+  // this allows us to show an error without closing the dialog
+  checkHour() {
+    if (!libsUtil.isNumeric(this.hourInput)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Number",
+          text: "The time must be an hour number.",
+        },
+        5000,
+      );
+      return false;
+    }
+    const hourNum = libsUtil.numberOrZero(this.hourInput);
+    if (!Number.isInteger(hourNum)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Whole Number",
+          text: "The time must be a whole hour number.",
+        },
+        5000,
+      );
+      return false;
+    }
+    if (hourNum < 1 || 12 < hourNum) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Not a Whole Number",
+          text: "The time must be an hour between 1 and 12.",
+        },
+        5000,
+      );
+      return false;
+    }
+    return true;
+  }
+
+  public async turnOnNotifications() {
     return this.askPermission()
       .then((permission) => {
         console.log("Permission granted:", permission);
@@ -426,20 +601,54 @@ export default class App extends Vue {
         this.subscribeToPush()
           .then(() => {
             console.log("Subscribed successfully.");
-            return navigator.serviceWorker.ready;
+            return navigator.serviceWorker?.ready;
           })
           .then((registration) => {
             return registration.pushManager.getSubscription();
           })
-          .then((subscription) => {
+          .then(async (subscription) => {
             if (subscription) {
-              return this.sendSubscriptionToServer(subscription);
+              await this.$notify(
+                {
+                  group: "alert",
+                  type: "info",
+                  title: "Notification Setup Underway",
+                  text: "Setting up notifications for interesting activity, which takes about 10 seconds. If you don't see a final confirmation, check the 'Troubleshoot' page.",
+                },
+                -1,
+              );
+              // we already checked that this is a valid hour number
+              const rawHourNum = libsUtil.numberOrZero(this.hourInput);
+              const adjHourNum = rawHourNum + (this.hourAm ? 0 : 12);
+              const hourNum = adjHourNum % 24;
+              const utcHour =
+                hourNum + Math.round(new Date().getTimezoneOffset() / 60);
+              const finalUtcHour = (utcHour + (utcHour < 0 ? 24 : 0)) % 24;
+
+              const subscriptionWithTime: PushSubscriptionWithTime = {
+                notifyTime: { utcHour: finalUtcHour },
+                ...subscription.toJSON(),
+              };
+              await this.sendSubscriptionToServer(subscriptionWithTime);
+              return subscriptionWithTime;
             } else {
               throw new Error("Subscription object is not available.");
             }
           })
-          .then(() => {
-            console.log("Subscription data sent to server.");
+          .then(async (subscription: PushSubscriptionWithTime) => {
+            console.log(
+              "Subscription data sent to server and all finished successfully.",
+            );
+            await sendTestThroughPushServer(subscription, true);
+            this.$notify(
+              {
+                group: "alert",
+                type: "success",
+                title: "Notifications Turned On",
+                text: "Notifications are on. You should see at least one on your device; if not, check the 'Troubleshoot' page.",
+              },
+              -1,
+            );
           })
           .catch((error) => {
             console.error(
@@ -452,8 +661,11 @@ export default class App extends Vue {
           });
       })
       .catch((error) => {
-        console.error("An error occurred:", error);
-        alert("Some error occurred." + error);
+        console.error(
+          "An error occurred setting notification permissions:",
+          error,
+        );
+        alert("Some error occurred setting notification permissions.");
       });
   }
 
@@ -500,11 +712,7 @@ export default class App extends Vue {
           resolve();
         })
         .catch((error) => {
-          console.error(
-            "Subscription or server communication failed:",
-            error,
-            options,
-          );
+          console.error("Push subscription failed:", error, options);
 
           // Inform the user about the issue
           alert(
@@ -518,9 +726,9 @@ export default class App extends Vue {
   }
 
   private sendSubscriptionToServer(
-    subscription: PushSubscription,
+    subscription: PushSubscriptionWithTime,
   ): Promise<void> {
-    console.log(subscription);
+    console.log("About to send subscription...", subscription);
     return fetch("/web-push/subscribe", {
       method: "POST",
       headers: {
@@ -535,12 +743,49 @@ export default class App extends Vue {
     });
   }
 
-  never(ID: string) {
-    alert(ID);
-  }
+  async turnOffNotifications() {
+    let subscription;
+    const pushProviderSuccess = await navigator.serviceWorker?.ready
+      .then((registration) => {
+        return registration.pushManager.getSubscription();
+      })
+      .then((subscript) => {
+        subscription = subscript;
+        if (subscription) {
+          return subscription.unsubscribe();
+        } else {
+          console.log("Subscription object is not available.");
+          return false;
+        }
+      })
+      .catch((error) => {
+        console.error("Push provider server communication failed:", error);
+        return false;
+      });
 
-  maybeLater(ID: string) {
-    alert(ID);
+    const pushServerSuccess = await fetch("/web-push/unsubscribe", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(subscription),
+    })
+      .then((response) => {
+        return response.ok;
+      })
+      .catch((error) => {
+        console.error("Push server communication failed:", error);
+        return false;
+      });
+
+    alert(
+      "Notifications are off. Push provider unsubscribe " +
+        (pushProviderSuccess ? "succeeded" : "failed") +
+        (pushProviderSuccess === pushServerSuccess ? " and" : " but") +
+        " push server unsubscribe " +
+        (pushServerSuccess ? "succeeded" : "failed") +
+        ".",
+    );
   }
 }
 </script>

src/assets/blank-square.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64" viewBox="0 0 64 64">
+  <rect width="64" height="64" fill="#ffffff"></rect>
+</svg>

src/assets/help/apple-share-icon.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 50 50" enable-background="new 0 0 50 50">
+  <path d="M30.3 13.7L25 8.4l-5.3 5.3-1.4-1.4L25 5.6l6.7 6.7z"/><path d="M24 7h2v21h-2z"/><path d="M35 40H15c-1.7 0-3-1.3-3-3V19c0-1.7 1.3-3 3-3h7v2h-7c-.6 0-1 .4-1 1v18c0 .6.4 1 1 1h20c.6 0 1-.4 1-1V19c0-.6-.4-1-1-1h-7v-2h7c1.7 0 3 1.3 3 3v18c0 1.7-1.3 3-3 3z"/>
+</svg>

src/assets/help/creative-commons-circle.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.0//EN" "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
+<svg version="1.0" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="64px" height="64px" viewBox="5.5 -3.5 64 64" enable-background="new 5.5 -3.5 64 64" xml:space="preserve">
+<g>
+	<circle fill="#FFFFFF" cx="37.785" cy="28.501" r="28.836"/>
+	<path d="M37.441-3.5c8.951,0,16.572,3.125,22.857,9.372c3.008,3.009,5.295,6.448,6.857,10.314
+		c1.561,3.867,2.344,7.971,2.344,12.314c0,4.381-0.773,8.486-2.314,12.313c-1.543,3.828-3.82,7.21-6.828,10.143
+		c-3.123,3.085-6.666,5.448-10.629,7.086c-3.961,1.638-8.057,2.457-12.285,2.457s-8.276-0.808-12.143-2.429
+		c-3.866-1.618-7.333-3.961-10.4-7.027c-3.067-3.066-5.4-6.524-7-10.372S5.5,32.767,5.5,28.5c0-4.229,0.809-8.295,2.428-12.2
+		c1.619-3.905,3.972-7.4,7.057-10.486C21.08-0.394,28.565-3.5,37.441-3.5z M37.557,2.272c-7.314,0-13.467,2.553-18.458,7.657
+		c-2.515,2.553-4.448,5.419-5.8,8.6c-1.354,3.181-2.029,6.505-2.029,9.972c0,3.429,0.675,6.734,2.029,9.913
+		c1.353,3.183,3.285,6.021,5.8,8.516c2.514,2.496,5.351,4.399,8.515,5.715c3.161,1.314,6.476,1.971,9.943,1.971
+		c3.428,0,6.75-0.665,9.973-1.999c3.219-1.335,6.121-3.257,8.713-5.771c4.99-4.876,7.484-10.99,7.484-18.344
+		c0-3.543-0.648-6.895-1.943-10.057c-1.293-3.162-3.18-5.98-5.654-8.458C50.984,4.844,44.795,2.272,37.557,2.272z M37.156,23.187
+		l-4.287,2.229c-0.458-0.951-1.019-1.619-1.685-2c-0.667-0.38-1.286-0.571-1.858-0.571c-2.856,0-4.286,1.885-4.286,5.657
+		c0,1.714,0.362,3.084,1.085,4.113c0.724,1.029,1.791,1.544,3.201,1.544c1.867,0,3.181-0.915,3.944-2.743l3.942,2
+		c-0.838,1.563-2,2.791-3.486,3.686c-1.484,0.896-3.123,1.343-4.914,1.343c-2.857,0-5.163-0.875-6.915-2.629
+		c-1.752-1.752-2.628-4.19-2.628-7.313c0-3.048,0.886-5.466,2.657-7.257c1.771-1.79,4.009-2.686,6.715-2.686
+		C32.604,18.558,35.441,20.101,37.156,23.187z M55.613,23.187l-4.229,2.229c-0.457-0.951-1.02-1.619-1.686-2
+		c-0.668-0.38-1.307-0.571-1.914-0.571c-2.857,0-4.287,1.885-4.287,5.657c0,1.714,0.363,3.084,1.086,4.113
+		c0.723,1.029,1.789,1.544,3.201,1.544c1.865,0,3.18-0.915,3.941-2.743l4,2c-0.875,1.563-2.057,2.791-3.541,3.686
+		c-1.486,0.896-3.105,1.343-4.857,1.343c-2.896,0-5.209-0.875-6.941-2.629c-1.736-1.752-2.602-4.19-2.602-7.313
+		c0-3.048,0.885-5.466,2.658-7.257c1.77-1.79,4.008-2.686,6.713-2.686C51.117,18.558,53.938,20.101,55.613,23.187z"/>
+</g>
+</svg>

src/assets/help/creative-commons-zero.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 13.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 14948)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="64px" height="64px" viewBox="-0.5 0.5 64 64" enable-background="new -0.5 0.5 64 64" xml:space="preserve">
+<g>
+	<circle fill="#FFFFFF" cx="31.325" cy="32.873" r="30.096"/>
+	<path id="text2809_1_" d="M31.5,14.08c-10.565,0-13.222,9.969-13.222,18.42c0,8.452,2.656,18.42,13.222,18.42
+		c10.564,0,13.221-9.968,13.221-18.42C44.721,24.049,42.064,14.08,31.5,14.08z M31.5,21.026c0.429,0,0.82,0.066,1.188,0.157
+		c0.761,0.656,1.133,1.561,0.403,2.823l-7.036,12.93c-0.216-1.636-0.247-3.24-0.247-4.437C25.808,28.777,26.066,21.026,31.5,21.026z
+		 M36.766,26.987c0.373,1.984,0.426,4.056,0.426,5.513c0,3.723-0.258,11.475-5.69,11.475c-0.428,0-0.822-0.045-1.188-0.136
+		c-0.07-0.021-0.134-0.043-0.202-0.067c-0.112-0.032-0.23-0.068-0.336-0.11c-1.21-0.515-1.972-1.446-0.874-3.093L36.766,26.987z"/>
+	<path id="path2815_1_" d="M31.433,0.5c-8.877,0-16.359,3.09-22.454,9.3c-3.087,3.087-5.443,6.607-7.082,10.532
+		C0.297,24.219-0.5,28.271-0.5,32.5c0,4.268,0.797,8.32,2.397,12.168c1.6,3.85,3.921,7.312,6.969,10.396
+		c3.085,3.049,6.549,5.399,10.398,7.037c3.886,1.602,7.939,2.398,12.169,2.398c4.229,0,8.34-0.826,12.303-2.465
+		c3.962-1.639,7.496-3.994,10.621-7.081c3.011-2.933,5.289-6.297,6.812-10.106C62.73,41,63.5,36.883,63.5,32.5
+		c0-4.343-0.77-8.454-2.33-12.303c-1.562-3.885-3.848-7.32-6.857-10.33C48.025,3.619,40.385,0.5,31.433,0.5z M31.567,6.259
+		c7.238,0,13.412,2.566,18.554,7.709c2.477,2.477,4.375,5.31,5.67,8.471c1.296,3.162,1.949,6.518,1.949,10.061
+		c0,7.354-2.516,13.454-7.506,18.33c-2.592,2.516-5.502,4.447-8.74,5.781c-3.2,1.334-6.498,1.994-9.927,1.994
+		c-3.468,0-6.788-0.653-9.949-1.948c-3.163-1.334-6.001-3.238-8.516-5.716c-2.515-2.514-4.455-5.353-5.826-8.516
+		c-1.333-3.199-2.017-6.498-2.017-9.927c0-3.467,0.684-6.787,2.017-9.949c1.371-3.2,3.312-6.074,5.826-8.628
+		C18.092,8.818,24.252,6.259,31.567,6.259z"/>
+</g>
+</svg>

src/assets/styles/tailwind.css

@@ -1,9 +1,8 @@
+@import url('https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&display=swap');
 @tailwind base;
 @tailwind components;
 @tailwind utilities;
 
-@import url('https://fonts.googleapis.com/css2?family=Work+Sans:ital,wght@0,300;0,400;0,500;0,600;0,700;1,300;1,400;1,500;1,600;1,700&display=swap');
-
 @layer base {
     html {
         font-family: 'Work Sans', ui-sans-serif, system-ui, sans-serif !important;

src/components/EntityIcon.vue

@@ -1,31 +1,40 @@
 <template>
-  <div v-html="generateIdenticon()" class="w-fit"></div>
+  <div v-html="generateIcon()" class="w-fit"></div>
 </template>
 <script lang="ts">
+import { createAvatar, StyleOptions } from "@dicebear/core";
+import { avataaars } from "@dicebear/collection";
 import { Vue, Component, Prop } from "vue-facing-decorator";
-import { toSvg } from "jdenticon";
-
-const BLANK_CONFIG = {
-  lightness: {
-    color: [1.0, 1.0],
-    grayscale: [1.0, 1.0],
-  },
-  saturation: {
-    color: 0.0,
-    grayscale: 0.0,
-  },
-  backColor: "#0000",
-};
+import { Contact } from "@/db/tables/contacts";
 
 @Component
 export default class EntityIcon extends Vue {
-  @Prop entityId = "";
+  @Prop contact: Contact;
+  @Prop entityId = ""; // overridden by contact.did or profileImageUrl
   @Prop iconSize = 0;
+  @Prop profileImageUrl = ""; // overridden by contact.profileImageUrl
 
-  generateIdenticon() {
-    const config = this.entityId ? undefined : BLANK_CONFIG;
-    const svgString = toSvg(this.entityId, this.iconSize, config);
-    return svgString;
+  generateIcon() {
+    const imageUrl = this.contact?.profileImageUrl || this.profileImageUrl;
+    if (imageUrl) {
+      return `<img src="${imageUrl}" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`;
+    } else {
+      const identifier = this.contact?.did || this.entityId;
+      if (!identifier) {
+        return `<img src="../src/assets/blank-square.svg" class="rounded" width="${this.iconSize}" height="${this.iconSize}" />`;
+      }
+      // https://api.dicebear.com/8.x/avataaars/svg?seed=
+      // ... does not render things with the same seed as this library.
+      // "did:ethr:0x222BB77E6Ff3774d34c751f3c1260866357B677b" yields a girl with flowers in her hair and a lightning earring
+      // ... which looks similar to '' at the dicebear site but which is different.
+      const options: StyleOptions<object> = {
+        seed: (identifier as string) || "",
+        size: this.iconSize,
+      };
+      const avatar = createAvatar(avataaars, options);
+      const svgString = avatar.toString();
+      return svgString;
+    }
   }
 }
 </script>

src/components/FeedFilters.vue

@@ -0,0 +1,219 @@
+<template>
+  <div v-if="visible" id="dialogFeedFilters" class="dialog-overlay">
+    <div class="dialog">
+      <h1 class="text-xl font-bold text-center mb-4">Feed Filters</h1>
+
+      <p class="mb-4 font-bold">Show only activities that…</p>
+
+      <div class="grid grid-cols-1 gap-2">
+        <div
+          class="flex items-center justify-between cursor-pointer"
+          @click="toggleHasVisibleDid()"
+        >
+          <!-- label -->
+          <div>Include someone visible to me</div>
+          <!-- toggle -->
+          <div class="relative ml-2">
+            <!-- input -->
+            <input
+              type="checkbox"
+              v-model="hasVisibleDid"
+              name="toggleFilterFromMyContacts"
+              class="sr-only"
+            />
+            <!-- line -->
+            <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+            <!-- dot -->
+            <div
+              class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+            ></div>
+          </div>
+        </div>
+
+        <em>or</em>
+
+        <div
+          class="flex items-center justify-between cursor-pointer"
+          @click="
+            hasSearchBox
+              ? toggleNearby()
+              : $router.push({ name: 'search-area' })
+          "
+        >
+          <!-- label -->
+          <div>Are nearby</div>
+          <!-- toggle -->
+          <div v-if="hasSearchBox" class="relative ml-2">
+            <!-- input -->
+            <input
+              type="checkbox"
+              v-model="isNearby"
+              name="toggleFilterNearby"
+              class="sr-only"
+            />
+            <!-- line -->
+            <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+            <!-- dot -->
+            <div
+              class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+            ></div>
+          </div>
+          <div v-else class="relative ml-2">
+            <button class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500">
+              Select Location
+            </button>
+          </div>
+        </div>
+      </div>
+
+      <div class="grid grid-cols-1 sm:grid-cols-3 gap-2 mt-4">
+        <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="setAll()"
+        >
+          Set All
+        </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="clearAll()"
+        >
+          Clear All
+        </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="done()"
+        >
+          Done
+        </button>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component } from "vue-facing-decorator";
+import {
+  LMap,
+  LMarker,
+  LRectangle,
+  LTileLayer,
+} from "@vue-leaflet/vue-leaflet";
+
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { db } from "@/db/index";
+
+@Component({
+  components: {
+    LRectangle,
+    LMap,
+    LMarker,
+    LTileLayer,
+  },
+})
+export default class FeedFilters extends Vue {
+  onCloseIfChanged = () => {};
+  hasSearchBox = false;
+  hasVisibleDid = false;
+  isNearby = false;
+  settingChanged = false;
+  visible = false;
+
+  async open(onCloseIfChanged: () => void) {
+    this.onCloseIfChanged = onCloseIfChanged;
+
+    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;
+    }
+
+    this.settingChanged = false;
+    this.visible = true;
+  }
+
+  async toggleHasVisibleDid() {
+    this.settingChanged = true;
+    this.hasVisibleDid = !this.hasVisibleDid;
+    await db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByVisible: this.hasVisibleDid,
+    });
+  }
+
+  async toggleNearby() {
+    this.settingChanged = true;
+    this.isNearby = !this.isNearby;
+    await db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByNearby: this.isNearby,
+    });
+  }
+
+  async clearAll() {
+    if (this.hasVisibleDid || this.isNearby) {
+      this.settingChanged = true;
+    }
+
+    await db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByNearby: false,
+      filterFeedByVisible: false,
+    });
+
+    this.hasVisibleDid = false;
+    this.isNearby = false;
+  }
+
+  async setAll() {
+    if (!this.hasVisibleDid || !this.isNearby) {
+      this.settingChanged = true;
+    }
+
+    await db.settings.update(MASTER_SETTINGS_KEY, {
+      filterFeedByNearby: true,
+      filterFeedByVisible: true,
+    });
+
+    this.hasVisibleDid = true;
+    this.isNearby = true;
+  }
+
+  close() {
+    if (this.settingChanged) {
+      this.onCloseIfChanged();
+    }
+    this.visible = false;
+  }
+
+  done() {
+    this.close();
+  }
+}
+</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;
+}
+
+#dialogFeedFilters.dialog-overlay {
+  z-index: 99999;
+  overflow: scroll;
+}
+
+.dialog {
+  background-color: white;
+  padding: 1rem;
+  border-radius: 0.5rem;
+  width: 100%;
+  max-width: 500px;
+}
+</style>

src/components/GiftedDialog.vue

@@ -2,31 +2,31 @@
   <div v-if="visible" class="dialog-overlay">
     <div class="dialog">
       <h1 class="text-xl font-bold text-center mb-4">
-        {{ message }} {{ giver?.name || "somebody not named" }}
+        {{ customTitle }}
       </h1>
       <input
         type="text"
         class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-        placeholder="What was received"
+        placeholder="What was given"
         v-model="description"
       />
-      <div class="flex flex-row">
+      <div class="flex flex-row justify-center">
         <span
-          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center px-2 py-2"
+          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()"
         >
-          {{ UNIT_SHORT[unitCode] }}
+          {{ libsUtil.UNIT_SHORT[unitCode] || unitCode }}
         </span>
         <div
           class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-          @click="decrement()"
-          v-if="amountInput !== '0'"
+          @click="amountInput === '0' ? null : decrement()"
         >
           <fa icon="chevron-left" />
         </div>
         <input
-          type="text"
-          class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
+          id="inputGivenAmount"
+          type="number"
+          class="border border-r-0 border-slate-400 px-2 py-2 text-center w-20"
           v-model="amountInput"
         />
         <div
@@ -36,108 +36,142 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div v-if="showGivenToUser" class="mt-2 text-right">
-        <input type="checkbox" class="mr-2" v-model="givenToUser" />
-        <label class="text-sm">Given to you</label>
+      <div class="mt-4 flex justify-center">
+        <span>
+          <router-link
+            :to="{
+              name: 'gifted-details',
+              query: {
+                amountInput,
+                description,
+                giverDid: giver?.did,
+                giverName: giver?.name,
+                offerId,
+                projectId,
+                recipientDid: receiver?.did,
+                recipientName: receiver?.name,
+                unitCode,
+              },
+            }"
+            class="text-blue-500"
+          >
+            Photo & more options ...
+          </router-link>
+        </span>
       </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>
-      <button
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <button
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
+      <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>
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
-import { createAndSubmitGive, GiverInputInfo } from "@/libs/endorserServer";
+
+import { NotificationIface } from "@/constants/app";
+import {
+  createAndSubmitGive,
+  didInfo,
+  GiverReceiverInputInfo,
+} from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { Contact } from "@/db/tables/contacts";
 
 @Component
 export default class GiftedDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  @Prop message = "";
   @Prop projectId = "";
-  @Prop showGivenToUser = false;
 
   activeDid = "";
+  allContacts: Array<Contact> = [];
+  allMyDids: Array<string> = [];
   apiServer = "";
 
   amountInput = "0";
-  giver?: GiverInputInfo; // undefined means no identified giver agent
+  callbackOnSuccess?: (amount: number) => void = () => {};
+  customTitle?: string;
   description = "";
-  givenToUser = false;
+  giver?: GiverReceiverInputInfo; // undefined means no identified giver agent
+  isTrade = false;
+  offerId = "";
+  receiver?: GiverReceiverInputInfo;
   unitCode = "HUR";
   visible = false;
 
-  /* eslint-disable prettier/prettier */
-  UNIT_SHORT: Record<string, string> = {
-    "BTC": "BTC",
-    "ETH": "ETH",
-    "HUR": "Hours",
-    "USD": "US $",
-  };
-  /* eslint-enable prettier/prettier */
+  libsUtil = libsUtil;
 
-  /* eslint-disable prettier/prettier */
-  UNIT_LONG: Record<string, string> = {
-    "BTC": "BTC",
-    "ETH": "ETH",
-    "HUR": "hours",
-    "USD": "dollars",
-  };
-  /* eslint-enable prettier/prettier */
+  async open(
+    giver?: GiverReceiverInputInfo,
+    receiver?: GiverReceiverInputInfo,
+    offerId?: string,
+    customTitle?: string,
+    callbackOnSuccess?: (amount: number) => void,
+  ) {
+    this.customTitle = customTitle;
+    this.description = "";
+    this.giver = giver;
+    this.receiver = receiver;
+    // if we show "given to user" selection, default checkbox to true
+    this.amountInput = "0";
+    this.callbackOnSuccess = callbackOnSuccess;
+    this.offerId = offerId || "";
 
-  async created() {
     try {
       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();
+
+      await accountsDB.open();
+      const allAccounts = await accountsDB.accounts.toArray();
+      this.allMyDids = allAccounts.map((acc) => acc.did);
+
+      if (this.giver && !this.giver.name) {
+        this.giver.name = didInfo(
+          this.giver.did,
+          this.activeDid,
+          this.allMyDids,
+          this.allContacts,
+        );
+      }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.log("Error retrieving settings from database:", err);
+      console.error("Error retrieving settings from database:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text:
-            err.message ||
-            "There was an error retrieving the latest sweet, sweet action.",
+          text: err.message || "There was an error retrieving your settings.",
         },
         -1,
       );
     }
-  }
-
-  open(giver: GiverInputInfo) {
-    this.description = "";
-    this.giver = giver;
-    // if we show "given to user" selection, default checkbox to true
-    this.givenToUser = this.showGivenToUser;
-    this.amountInput = "0";
 
     this.visible = true;
   }
@@ -148,7 +182,7 @@ export default class GiftedDialog extends Vue {
   }
 
   changeUnitCode() {
-    const units = Object.keys(this.UNIT_SHORT);
+    const units = Object.keys(this.libsUtil.UNIT_SHORT);
     const index = units.indexOf(this.unitCode);
     this.unitCode = units[(index + 1) % units.length];
   }
@@ -172,11 +206,50 @@ export default class GiftedDialog extends Vue {
   eraseValues() {
     this.description = "";
     this.giver = undefined;
-    this.givenToUser = this.showGivenToUser;
     this.amountInput = "0";
+    this.unitCode = "HUR";
   }
 
   async confirm() {
+    if (!this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "You must select an identifier before you can record a give.",
+        },
+        3000,
+      );
+      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.description && !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.close();
     this.$notify(
       {
@@ -189,7 +262,8 @@ export default class GiftedDialog extends Vue {
     );
     // this is asynchronous, but we don't need to wait for it to complete
     await this.recordGive(
-      this.giver?.did as string | undefined,
+      (this.giver?.did as string) || null,
+      (this.receiver?.did as string) || null,
       this.description,
       parseFloat(this.amountInput),
       this.unitCode,
@@ -198,74 +272,34 @@ export default class GiftedDialog extends Vue {
     });
   }
 
-  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 for DID ${activeDid} but no identity was found",
-      );
-    }
-    return identity;
-  }
-
   /**
    *
    * @param giverDid may be null
+   * @param recipientDid may be null
    * @param description may be an empty string
-   * @param amountInput may be 0
+   * @param amount may be 0
+   * @param unitCode may be omitted, defaults to "HUR"
    */
-  public async recordGive(
-    giverDid?: string,
-    description?: string,
-    amountInput?: number,
-    unitCode?: string,
+  async recordGive(
+    giverDid: string | null,
+    recipientDid: string | null,
+    description: string,
+    amount: number,
+    unitCode: string = "HUR",
   ) {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identity before you can record a give.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    if (!description && !amountInput) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: `You must enter a description or some number of ${
-            this.UNIT_LONG[this.unitCode]
-          }.`,
-        },
-        -1,
-      );
-      return;
-    }
-
     try {
-      const identity = await this.getIdentity(this.activeDid);
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
-        identity,
-        giverDid,
-        this.givenToUser ? this.activeDid : undefined,
+        this.activeDid,
+        giverDid as string,
+        recipientDid as string,
         description,
-        amountInput,
+        amount,
         unitCode,
         this.projectId,
+        this.offerId,
+        this.isTrade,
       );
 
       if (
@@ -273,7 +307,7 @@ export default class GiftedDialog extends Vue {
         this.isGiveCreationError(result.response)
       ) {
         const errorMessage = this.getGiveCreationErrorMessage(result);
-        console.log("Error with give creation result:", result);
+        console.error("Error with give creation result:", result);
         this.$notify(
           {
             group: "alert",
@@ -289,15 +323,18 @@ export default class GiftedDialog extends Vue {
             group: "alert",
             type: "success",
             title: "Success",
-            text: "That gift was recorded.",
+            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
           },
           7000,
         );
+        if (this.callbackOnSuccess) {
+          this.callbackOnSuccess(amount);
+        }
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      console.log("Error with give recordation caught:", error);
-      const message =
+      console.error("Error with give recordation caught:", error);
+      const errorMessage =
         error.userMessage ||
         error.response?.data?.error?.message ||
         "There was an error recording the give.";
@@ -306,7 +343,7 @@ export default class GiftedDialog extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: message,
+          text: errorMessage,
         },
         -1,
       );
@@ -336,6 +373,18 @@ export default class GiftedDialog extends Vue {
       result.response?.data?.error?.message
     );
   }
+
+  explainData() {
+    this.$notify(
+      {
+        group: "alert",
+        type: "success",
+        title: "Data Sharing",
+        text: libsUtil.PRIVACY_MESSAGE,
+      },
+      -1,
+    );
+  }
 }
 </script>
 

src/components/GiftedPrompts.vue

@@ -0,0 +1,242 @@
+<template>
+  <div v-if="visible" class="dialog-overlay">
+    <div class="dialog">
+      <h1 class="text-xl font-bold text-center mb-4 relative">
+        Here's one:
+        <div
+          class="text-lg text-center p-2 leading-none absolute right-0 -top-1"
+          @click="cancel"
+        >
+          <fa icon="xmark" class="w-[1em]"></fa>
+        </div>
+      </h1>
+      <span class="flex justify-between">
+        <span
+          class="rounded-l border border-slate-400 bg-slate-200 px-4 py-2 flex"
+          @click="prevIdea()"
+        >
+          <fa icon="chevron-left" class="m-auto" />
+        </span>
+
+        <div class="m-2">
+          <span v-if="currentIdeaIndex < IDEAS.length">
+            <p class="text-center text-lg font-bold">
+              {{ IDEAS[currentIdeaIndex] }}
+            </p>
+          </span>
+          <div v-if="currentIdeaIndex == IDEAS.length + 0">
+            <p class="text-center">
+              <span
+                v-if="currentContact == null"
+                class="text-orange-500 text-lg font-bold"
+              >
+                That's all your contacts.
+              </span>
+              <span v-else>
+                <span class="text-lg font-bold">
+                  Did {{ currentContact.name || AppString.NO_CONTACT_NAME }}
+                  <br />
+                  or someone near them do anything &ndash; maybe a while ago?
+                </span>
+                <span class="flex justify-between">
+                  <span />
+                  <button
+                    class="text-center bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-1.5 py-2 rounded-md mt-4"
+                    @click="nextIdeaPastContacts()"
+                  >
+                    Skip Contacts <fa icon="forward" />
+                  </button>
+                </span>
+              </span>
+            </p>
+          </div>
+        </div>
+
+        <span
+          class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2 flex"
+          @click="nextIdea()"
+        >
+          <fa icon="chevron-right" class="m-auto" />
+        </span>
+      </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="cancel"
+      >
+        That's it!
+      </button>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component } from "vue-facing-decorator";
+
+import { AppString, NotificationIface } from "@/constants/app";
+import { db } from "@/db/index";
+import { Contact } from "@/db/tables/contacts";
+
+@Component
+export default class GivenPrompts extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  IDEAS = [
+    "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?",
+    "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?",
+    "Did some organization give something worth respect?",
+    "Who last gave you a good laugh?",
+    "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
+
+  currentContact: Contact | undefined = undefined;
+  currentIdeaIndex = 0;
+  numContacts = 0;
+  shownContactDbIndices: number[] = [];
+  visible = false;
+
+  AppString = AppString;
+
+  async open() {
+    this.visible = true;
+
+    await db.open();
+    this.numContacts = await db.contacts.count();
+  }
+
+  close() {
+    // close the dialog but don't change values (just in case some actions are added later)
+    this.visible = false;
+  }
+
+  /**
+   * Get the next idea.
+   * If it is a contact prompt, loop through.
+   */
+  async nextIdea() {
+    // 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();
+    } 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 = [];
+    }
+  }
+
+  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) {
+        this.currentIdeaIndex = this.IDEAS.length - 1 + this.OTHER_PROMPTS;
+      }
+      // ... and clear out any other prompt info
+      this.currentContact = undefined;
+      this.shownContactDbIndices = [];
+    }
+  }
+
+  nextIdeaPastContacts() {
+    this.currentIdeaIndex = 0;
+    this.currentContact = undefined;
+    this.shownContactDbIndices = [];
+  }
+
+  async findNextUnshownContact() {
+    // 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();
+    }
+  }
+
+  cancel() {
+    this.currentContact = undefined;
+    this.currentIdeaIndex = 0;
+    this.numContacts = 0;
+    this.shownContactDbIndices = [];
+
+    this.close();
+  }
+}
+</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/ImageMethodDialog.vue

@@ -0,0 +1,177 @@
+<template>
+  <div v-if="visible" class="dialog-overlay z-[60]">
+    <div class="dialog relative">
+      <div class="text-lg text-center font-light relative z-50">
+        <div
+          id="ViewHeading"
+          class="text-center font-bold absolute top-0 left-0 right-0 px-4 py-0.5 bg-black/50 text-white leading-none"
+        >
+          Camera or Other?
+        </div>
+        <div
+          class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"
+          @click="close()"
+        >
+          <fa icon="xmark" class="w-[1em]"></fa>
+        </div>
+      </div>
+
+      <div>
+        <div class="text-center mt-8">
+          <div class>
+            <fa
+              icon="camera"
+              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-2 py-2 rounded-md"
+              @click="openPhotoDialog()"
+            />
+          </div>
+          <div class="mt-4">
+            <input type="file" @change="uploadImageFile" />
+          </div>
+          <div class="mt-4">
+            <span class="mt-2">
+              ... or paste a URL:
+              <input type="text" v-model="imageUrl" class="border-2" />
+            </span>
+            <span class="ml-2">
+              <fa
+                v-if="imageUrl"
+                icon="check"
+                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-2 py-2 rounded-md cursor-pointer"
+                @click="acceptUrl"
+              />
+              <!-- so that there's no shifting when it becomes visible -->
+              <fa v-else icon="check" class="text-white bg-white px-2 py-2" />
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+  <PhotoDialog ref="photoDialog" />
+</template>
+
+<script lang="ts">
+import axios from "axios";
+import { ref } from "vue";
+import { Component, Vue } from "vue-facing-decorator";
+
+import PhotoDialog from "@/components/PhotoDialog.vue";
+import { NotificationIface } from "@/constants/app";
+
+const inputImageFileNameRef = ref<Blob>();
+
+@Component({
+  components: { PhotoDialog },
+})
+export default class ImageMethodDialog extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  claimType: string;
+  crop: boolean = false;
+  imageCallback: (imageUrl?: string) => void = () => {};
+  imageUrl?: string;
+  visible = false;
+
+  open(setImageFn: (arg: string) => void, claimType: string, crop?: boolean) {
+    this.claimType = claimType;
+    this.crop = !!crop;
+    this.imageCallback = setImageFn;
+
+    this.visible = true;
+  }
+
+  openPhotoDialog(blob?: Blob, fileName?: string) {
+    this.visible = false;
+
+    (this.$refs.photoDialog as PhotoDialog).open(
+      this.imageCallback,
+      this.claimType,
+      this.crop,
+      blob,
+      fileName,
+    );
+  }
+
+  async uploadImageFile(event: Event) {
+    this.visible = false;
+
+    inputImageFileNameRef.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 = inputImageFileNameRef.value;
+    if (file != null) {
+      const reader = new FileReader();
+      reader.onload = async (e) => {
+        const data = e.target?.result as ArrayBuffer;
+        if (data) {
+          const blob = new Blob([new Uint8Array(data)], {
+            type: file.type,
+          });
+          this.openPhotoDialog(blob, file.name as string);
+        }
+      };
+      reader.readAsArrayBuffer(file as Blob);
+    }
+  }
+
+  async acceptUrl() {
+    this.visible = false;
+    if (this.crop) {
+      try {
+        const urlBlobResponse: Blob = await axios.get(this.imageUrl as string, {
+          responseType: "blob", // This ensures the data is returned as a Blob
+        });
+        const fullUrl = new URL(this.imageUrl as string);
+        const fileName = fullUrl.pathname.split("/").pop() as string;
+        (this.$refs.photoDialog as PhotoDialog).open(
+          this.imageCallback,
+          this.claimType,
+          this.crop,
+          urlBlobResponse.data as Blob,
+          fileName,
+        );
+      } catch (error) {
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was an error retrieving that image.",
+          },
+          5000,
+        );
+      }
+    } else {
+      this.imageCallback(this.imageUrl);
+    }
+  }
+
+  close() {
+    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: 700px;
+}
+</style>

src/components/OfferDialog.vue

@@ -4,26 +4,30 @@
       <h1 class="text-xl font-bold text-center mb-4">Offer Help</h1>
       <input
         type="text"
+        data-testId="inputDescription"
         class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
         placeholder="Description, prerequisites, terms, etc."
         v-model="description"
       />
-      <div class="flex flex-row mb-6">
+      <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"
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center text-blue-500 px-2 py-2"
+          @click="changeUnitCode()"
         >
-          Hours
+          {{ libsUtil.UNIT_SHORT[amountUnitCode] }}
         </span>
         <div
           class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
           @click="decrement()"
+          v-if="amountInput !== '0'"
         >
           <fa icon="chevron-left" />
         </div>
         <input
-          type="text"
+          data-testId="inputOfferAmount"
+          type="number"
           class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
-          v-model="hours"
+          v-model="amountInput"
         />
         <div
           class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
@@ -32,108 +36,136 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="flex flex-row mb-6">
-        <span
-          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
-        >
-          Expiration
+      <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>
         </span>
-        <input
-          type="text"
-          class="w-full border border-slate-400 px-2 py-2 rounded-r"
-          :placeholder="'Date, eg. ' + new Date().toISOString().slice(0, 10)"
-          v-model="expirationDateInput"
-        />
       </div>
-      <p class="text-center mb-2 italic">Sign & Send to publish to the world</p>
-      <button
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <button
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
+      <p class="text-center mt-6 mb-2 italic">
+        Sign & Send to publish to the world
+      </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>
     </div>
   </div>
 </template>
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
-import { createAndSubmitOffer } from "@/libs/endorserServer";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Account } from "@/db/tables/accounts";
 
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { NotificationIface } from "@/constants/app";
+import { createAndSubmitOffer } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 
 @Component
 export default class OfferDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
-  @Prop message = "";
-  @Prop projectId = "";
+  @Prop projectId?;
+  @Prop projectName?;
 
   activeDid = "";
   apiServer = "";
 
+  amountInput = "0";
+  amountUnitCode = "HUR";
   description = "";
   expirationDateInput = "";
-  hours = "0";
+  recipientDid? = "";
+  recipientName? = "";
   visible = false;
 
-  async created() {
+  libsUtil = libsUtil;
+
+  async open(recipientDid?: string, recipientName?: string) {
     try {
+      this.recipientDid = recipientDid;
+      this.recipientName = recipientName;
+
       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) {
-      console.log("Error retrieving settings from database:", err);
+      console.error("Error retrieving settings from database:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text:
-            err.message ||
-            "There was an error retrieving the latest sweet, sweet action.",
+          text: err.message || "There was an error retrieving your settings.",
         },
         -1,
       );
     }
-  }
 
-  open() {
     this.visible = true;
   }
 
   close() {
+    // close the dialog but don't change values (since it might be submitting info)
     this.visible = false;
   }
 
+  changeUnitCode() {
+    const units = Object.keys(this.libsUtil.UNIT_SHORT);
+    const index = units.indexOf(this.amountUnitCode);
+    this.amountUnitCode = units[(index + 1) % units.length];
+  }
+
   increment() {
-    this.hours = `${(parseFloat(this.hours) || 0) + 1}`;
+    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
   }
 
   decrement() {
-    this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
+    this.amountInput = `${Math.max(
+      0,
+      (parseFloat(this.amountInput) || 1) - 1,
+    )}`;
   }
 
   cancel() {
     this.close();
+    this.eraseValues();
+  }
+
+  eraseValues() {
     this.description = "";
-    this.hours = "0";
+    this.amountInput = "0";
+    this.amountUnitCode = "HUR";
   }
 
   async confirm() {
@@ -150,38 +182,25 @@ export default class OfferDialog extends Vue {
     // this is asynchronous, but we don't need to wait for it to complete
     this.recordOffer(
       this.description,
-      parseFloat(this.hours),
+      parseFloat(this.amountInput),
+      this.amountUnitCode,
       this.expirationDateInput,
     ).then(() => {
       this.description = "";
-      this.hours = "0";
+      this.amountInput = "0";
     });
   }
 
-  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 Offer records for DID ${activeDid} but no identity was found",
-      );
-    }
-    return identity;
-  }
-
   /**
    *
    * @param description may be an empty string
    * @param hours may be 0
+   * @param unitCode may be omitted, defaults to "HUR"
    */
   public async recordOffer(
-    description?: string,
-    hours?: number,
+    description: string,
+    amount: number,
+    unitCode: string = "HUR",
     expirationDateInput?: string,
   ) {
     if (!this.activeDid) {
@@ -190,20 +209,20 @@ export default class OfferDialog extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "You must select an identity before you can record an offer.",
+          text: "You must select an identifier before you can record an offer.",
         },
         -1,
       );
       return;
     }
 
-    if (!description && !hours) {
+    if (!description && !amount) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "You must enter a description or some number of hours.",
+          text: `You must enter a description or some number of ${this.libsUtil.UNIT_LONG[unitCode]}.`,
         },
         -1,
       );
@@ -211,14 +230,15 @@ export default class OfferDialog extends Vue {
     }
 
     try {
-      const identity = await this.getIdentity(this.activeDid);
       const result = await createAndSubmitOffer(
         this.axios,
         this.apiServer,
-        identity,
+        this.activeDid,
         description,
-        hours,
+        amount,
+        unitCode,
         expirationDateInput,
+        this.recipientDid,
         this.projectId,
       );
 
@@ -227,7 +247,7 @@ export default class OfferDialog extends Vue {
         this.isOfferCreationError(result.response)
       ) {
         const errorMessage = this.getOfferCreationErrorMessage(result);
-        console.log("Error with offer creation result:", result);
+        console.error("Error with offer creation result:", result);
         this.$notify(
           {
             group: "alert",
@@ -250,7 +270,7 @@ export default class OfferDialog extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      console.log("Error with offer recordation caught:", error);
+      console.error("Error with offer recordation caught:", error);
       const message =
         error.userMessage ||
         error.response?.data?.error?.message ||

src/components/PhotoDialog.vue

@@ -0,0 +1,440 @@
+<template>
+  <div v-if="visible" class="dialog-overlay z-[60]">
+    <div class="dialog relative">
+      <div class="text-lg text-center font-light relative z-50">
+        <div
+          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"
+        >
+          <span v-if="uploading"> Uploading... </span>
+          <span v-else-if="blob"> Look Good? </span>
+          <span v-else> Say "Cheese"! </span>
+        </div>
+
+        <div
+          class="text-lg text-center px-2 py-0.5 leading-none absolute right-0 top-0 text-white"
+          @click="close()"
+        >
+          <fa icon="xmark" class="w-[1em]"></fa>
+        </div>
+      </div>
+
+      <div v-if="uploading" class="flex justify-center">
+        <fa
+          icon="spinner"
+          class="fa-spin fa-3x text-center block px-12 py-12"
+        />
+      </div>
+      <div v-else-if="blob">
+        <div v-if="crop">
+          <VuePictureCropper
+            :boxStyle="{
+              backgroundColor: '#f8f8f8',
+              margin: 'auto',
+            }"
+            :img="createBlobURL(blob)"
+            :options="{
+              viewMode: 1,
+              dragMode: 'crop',
+              aspectRatio: 9 / 9,
+            }"
+            class="max-h-[90vh] max-w-[90vw] object-contain"
+          />
+          <!-- This gives a round cropper.
+            :presetMode="{
+              mode: 'round',
+            }"
+          -->
+        </div>
+        <div v-else>
+          <div class="flex justify-center">
+            <img
+              :src="createBlobURL(blob)"
+              class="mt-2 rounded max-h-[90vh] max-w-[90vw] object-contain"
+            />
+          </div>
+        </div>
+        <div class="absolute bottom-[1rem] left-[1rem] px-2 py-1">
+          <button
+            @click="uploadImage"
+            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 py-1 px-2 rounded-md"
+          >
+            <span>Upload</span>
+          </button>
+        </div>
+        <div
+          v-if="showRetry"
+          class="absolute bottom-[1rem] right-[1rem] px-2 py-1"
+        >
+          <button
+            @click="retryImage"
+            class="bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white py-1 px-2 rounded-md"
+          >
+            <span>Retry</span>
+          </button>
+        </div>
+      </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:
+          :resolution="{ width: 375, height: 812 }"
+        -->
+        <camera
+          facingMode="environment"
+          autoplay
+          ref="camera"
+          @started="cameraStarted()"
+        >
+          <div
+            class="absolute portrait:bottom-0 portrait:left-0 portrait:right-0 portrait:pb-2 landscape:right-0 landscape:top-0 landscape:bottom-0 landscape:pr-4 flex landscape:flex-row justify-center items-center"
+          >
+            <button
+              @click="takeImage()"
+              class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
+            >
+              <fa icon="camera" class="w-[1em]"></fa>
+            </button>
+          </div>
+          <div
+            class="absolute portrait:bottom-2 portrait:right-16 landscape:right-0 landscape:bottom-16 landscape:pr-4 flex justify-center items-center"
+          >
+            <button
+              @click="swapMirrorClass()"
+              class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
+            >
+              <fa icon="left-right" class="w-[1em]"></fa>
+            </button>
+          </div>
+          <div v-if="numDevices > 1" class="absolute bottom-2 right-4">
+            <button
+              @click="switchCamera()"
+              class="bg-blue-500 hover:bg-blue-700 text-white font-bold p-3 rounded-full text-2xl leading-none"
+            >
+              <fa icon="rotate" class="w-[1em]"></fa>
+            </button>
+          </div>
+        </camera>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import axios from "axios";
+import Camera from "simple-vue-camera";
+import { Component, Vue } from "vue-facing-decorator";
+import VuePictureCropper, { cropper } from "vue-picture-cropper";
+
+import { DEFAULT_IMAGE_API_SERVER, NotificationIface } from "@/constants/app";
+import { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { accessToken } from "@/libs/crypto";
+
+@Component({ components: { Camera, VuePictureCropper } })
+export default class PhotoDialog extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  activeDeviceNumber = 0;
+  activeDid = "";
+  blob?: Blob;
+  claimType = "";
+  crop = false;
+  fileName?: string;
+  mirror = false;
+  numDevices = 0;
+  setImageCallback: (arg: string) => void = () => {};
+  showRetry = true;
+  uploading = false;
+  visible = false;
+
+  URL = window.URL || window.webkitURL;
+
+  async mounted() {
+    try {
+      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);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: err.message || "There was an error retrieving your settings.",
+        },
+        -1,
+      );
+    }
+  }
+
+  open(
+    setImageFn: (arg: string) => void,
+    claimType: string,
+    crop?: boolean,
+    blob?: Blob, // for image upload, just to use the cropping function
+    inputFileName?: string,
+  ) {
+    this.visible = true;
+    this.claimType = claimType;
+    this.crop = !!crop;
+    const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
+    if (bottomNav) {
+      bottomNav.style.display = "none";
+    }
+    this.setImageCallback = setImageFn;
+    if (blob) {
+      this.blob = blob;
+      this.fileName = inputFileName;
+      // doesn't make sense to retry the file upload; they can cancel if they picked the wrong one
+      this.showRetry = false;
+    } else {
+      this.blob = undefined;
+      this.fileName = undefined;
+      this.showRetry = true;
+    }
+  }
+
+  close() {
+    this.visible = false;
+    const bottomNav = document.querySelector("#QuickNav") as HTMLElement;
+    if (bottomNav) {
+      bottomNav.style.display = "";
+    }
+    this.blob = undefined;
+  }
+
+  async cameraStarted() {
+    const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
+    if (cameraComponent) {
+      this.numDevices = (await cameraComponent.devices(["videoinput"])).length;
+      this.mirror = cameraComponent.facingMode === "user";
+      // figure out which device is active
+      const currentDeviceId = cameraComponent.currentDeviceID();
+      const devices = await cameraComponent.devices(["videoinput"]);
+      this.activeDeviceNumber = devices.findIndex(
+        (device) => device.deviceId === currentDeviceId,
+      );
+    }
+  }
+
+  async switchCamera() {
+    const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
+    this.activeDeviceNumber = (this.activeDeviceNumber + 1) % this.numDevices;
+    const devices = await cameraComponent?.devices(["videoinput"]);
+    await cameraComponent?.changeCamera(
+      devices[this.activeDeviceNumber].deviceId,
+    );
+  }
+
+  async takeImage(/* payload: MouseEvent */) {
+    const cameraComponent = this.$refs.camera as InstanceType<typeof Camera>;
+
+    /**
+     * This logic to set the image height & width correctly.
+     * Without it, the portrait orientation ends up with an image that is stretched horizontally.
+     * Note that it's the same with raw browser Javascript; see the "drawImage" example below.
+     * Now that I've done it, I can't explain why it works.
+     */
+    let imageHeight = cameraComponent?.resolution?.height;
+    let imageWidth = cameraComponent?.resolution?.width;
+    const initialImageRatio = imageWidth / imageHeight;
+    const windowRatio = window.innerWidth / window.innerHeight;
+    if (initialImageRatio > 1 && windowRatio < 1) {
+      // the image is wider than it is tall, and the window is taller than it is wide
+      // For some reason, mobile in portrait orientation renders a horizontally-stretched image.
+      // We're gonna force it opposite.
+      imageHeight = cameraComponent?.resolution?.width;
+      imageWidth = cameraComponent?.resolution?.height;
+    } else if (initialImageRatio < 1 && windowRatio > 1) {
+      // the image is taller than it is wide, and the window is wider than it is tall
+      // Haven't seen this happen, but we'll do it just in case.
+      imageHeight = cameraComponent?.resolution?.width;
+      imageWidth = cameraComponent?.resolution?.height;
+    }
+    const newImageRatio = imageWidth / imageHeight;
+    if (newImageRatio < windowRatio) {
+      // the image is a taller ratio than the window, so fit the height first
+      imageHeight = window.innerHeight / 2;
+      imageWidth = imageHeight * newImageRatio;
+    } else {
+      // the image is a wider ratio than the window, so fit the width first
+      imageWidth = window.innerWidth / 2;
+      imageHeight = imageWidth / newImageRatio;
+    }
+
+    // The resolution is only necessary because of that mobile portrait-orientation case.
+    // The mobile emulation in a browser shows something stretched vertically, but real devices work fine.
+    this.blob =
+      (await cameraComponent?.snapshot({
+        height: imageHeight,
+        width: imageWidth,
+      })) || undefined;
+    // png is default
+    this.fileName = "snapshot.png";
+    if (!this.blob) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error taking the picture. Please try again.",
+        },
+        5000,
+      );
+      return;
+    }
+  }
+
+  private createBlobURL(blob: Blob): string {
+    return URL.createObjectURL(blob);
+  }
+
+  async retryImage() {
+    this.blob = undefined;
+  }
+
+  /****
+
+   Here's an approach to photo capture without a library. It has similar quirks.
+   Now that we've fixed styling for simple-vue-camera, it's not critical to refactor. Maybe someday.
+
+   <button id="start-camera" @click="cameraClicked">Start Camera</button>
+   <video id="video" width="320" height="240" autoplay></video>
+   <button id="snap-photo" @click="photoSnapped">Snap Photo</button>
+   <canvas id="canvas" width="320" height="240"></canvas>
+
+  async cameraClicked() {
+    const video = document.querySelector("#video");
+    const stream = await navigator.mediaDevices.getUserMedia({
+      video: true,
+      audio: false,
+    });
+    if (video instanceof HTMLVideoElement) {
+      video.srcObject = stream;
+    }
+  }
+  photoSnapped() {
+    const video = document.querySelector("#video");
+    const canvas = document.querySelector("#canvas");
+    if (
+      canvas instanceof HTMLCanvasElement &&
+      video instanceof HTMLVideoElement
+    ) {
+      canvas
+        ?.getContext("2d")
+        ?.drawImage(video, 0, 0, canvas.width, canvas.height);
+      // ... or set the blob:
+      // canvas?.toBlob(
+      //   (blob) => {
+      //     this.blob = blob;
+      //   },
+      //   "image/jpeg",
+      //   1,
+      // );
+
+      // data url of the image
+      const image_data_url = canvas?.toDataURL("image/jpeg");
+    }
+  }
+  ****/
+
+  async uploadImage() {
+    this.uploading = true;
+
+    if (this.crop) {
+      this.blob = (await cropper?.getBlob()) || undefined;
+    }
+
+    const token = await accessToken(this.activeDid);
+    const headers = {
+      Authorization: "Bearer " + token,
+      // axios fills in Content-Type of multipart/form-data
+    };
+    const formData = new FormData();
+    if (!this.blob) {
+      // yeah, this should never happen, but it helps with subsequent type checking
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error finding the picture. Please try again.",
+        },
+        5000,
+      );
+      this.uploading = false;
+      return;
+    }
+    formData.append("image", this.blob, this.fileName || "snapshot.png");
+    formData.append("claimType", this.claimType);
+    try {
+      const response = await axios.post(
+        DEFAULT_IMAGE_API_SERVER + "/image",
+        formData,
+        { headers },
+      );
+      this.uploading = false;
+
+      this.close();
+      this.setImageCallback(response.data.url as string);
+    } catch (error) {
+      console.error("Error uploading the image", error);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was an error saving the picture.",
+        },
+        5000,
+      );
+      this.uploading = false;
+      this.blob = undefined;
+    }
+  }
+
+  swapMirrorClass() {
+    this.mirror = !this.mirror;
+    if (this.mirror) {
+      (this.$refs.cameraContainer as HTMLElement).classList.add("mirror-video");
+    } else {
+      (this.$refs.cameraContainer as HTMLElement).classList.remove(
+        "mirror-video",
+      );
+    }
+  }
+}
+</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: 700px;
+}
+
+.mirror-video {
+  transform: scaleX(-1);
+  -webkit-transform: scaleX(-1); /* For Safari */
+  -moz-transform: scaleX(-1); /* For Firefox */
+  -ms-transform: scaleX(-1); /* For IE */
+  -o-transform: scaleX(-1); /* For Opera */
+}
+</style>

src/components/ProjectIcon.vue

@@ -0,0 +1,50 @@
+<template>
+  <a
+    v-if="linkToFull && imageUrl"
+    :href="imageUrl"
+    target="_blank"
+    class="h-full w-full object-contain"
+  >
+    <div v-html="generateIdenticon()" class="h-full w-full object-contain" />
+  </a>
+  <div
+    v-else
+    v-html="generateIdenticon()"
+    class="h-full w-full object-contain"
+  />
+</template>
+<script lang="ts">
+import { toSvg } from "jdenticon";
+import { Vue, Component, Prop } from "vue-facing-decorator";
+
+const BLANK_CONFIG = {
+  lightness: {
+    color: [1.0, 1.0],
+    grayscale: [1.0, 1.0],
+  },
+  saturation: {
+    color: 0.0,
+    grayscale: 0.0,
+  },
+  backColor: "#0000",
+};
+
+@Component
+export default class ProjectIcon extends Vue {
+  @Prop entityId = "";
+  @Prop iconSize = 0;
+  @Prop imageUrl = "";
+  @Prop linkToFull = false;
+
+  generateIdenticon() {
+    if (this.imageUrl) {
+      return `<img src="${this.imageUrl}" class="w-full h-full object-contain" />`;
+    } else {
+      const config = this.entityId ? undefined : BLANK_CONFIG;
+      const svgString = toSvg(this.entityId, this.iconSize, config);
+      return svgString;
+    }
+  }
+}
+</script>
+<style scoped></style>

src/components/QuickNav.vue

@@ -1,7 +1,7 @@
 <template>
   <!-- QUICK NAV -->
   <nav id="QuickNav" class="fixed bottom-0 left-0 right-0 bg-slate-200 z-50">
-    <ul class="flex text-2xl p-2 gap-2">
+    <ul class="flex text-2xl p-2 gap-2 max-w-3xl mx-auto">
       <!-- Home Feed -->
       <li
         :class="{
@@ -12,7 +12,7 @@
         }"
       >
         <router-link :to="{ name: 'home' }" class="block text-center py-3 px-1">
-          <fa icon="house-chimney" class="fa-fw"></fa>
+          <fa icon="house-chimney" class="fa-fw" />
         </router-link>
       </li>
       <!-- Search -->
@@ -28,7 +28,7 @@
           :to="{ name: 'discover' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="magnifying-glass" class="fa-fw"></fa>
+          <fa icon="magnifying-glass" class="fa-fw" />
         </router-link>
       </li>
       <!-- Projects -->
@@ -44,7 +44,7 @@
           :to="{ name: 'projects' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="folder-open" class="fa-fw"></fa>
+          <fa icon="hand" class="fa-fw" />
         </router-link>
       </li>
       <!-- Contacts -->
@@ -60,7 +60,7 @@
           :to="{ name: 'contacts' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="users" class="fa-fw"></fa>
+          <fa icon="users" class="fa-fw" />
         </router-link>
       </li>
       <!-- Profile -->
@@ -76,7 +76,7 @@
           :to="{ name: 'account' }"
           class="block text-center py-3 px-1"
         >
-          <fa icon="circle-user" class="fa-fw"></fa>
+          <fa icon="circle-user" class="fa-fw" />
         </router-link>
       </li>
     </ul>

src/components/TopMessage.vue

@@ -0,0 +1,52 @@
+<template>
+  <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 { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+
+@Component
+export default class TopMessage extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  @Prop selected = "";
+
+  message = "";
+
+  async mounted() {
+    try {
+      await db.open();
+
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+      if (
+        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.apiServer === AppString.PROD_ENDORSER_API_SERVER
+      ) {
+        const didPrefix = settings.activeDid?.slice(11, 15);
+        this.message =
+          "You're linked to the production server, user " + didPrefix;
+      }
+    } catch (err: unknown) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error Detecting Server",
+          text: JSON.stringify(err),
+        },
+        -1,
+      );
+    }
+  }
+}
+</script>

src/components/World/components/objects/landmarks.js

@@ -1,12 +1,11 @@
 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 { accountsDB, db } from "@/db";
+import { db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
+import { getHeaders } from "@/libs/endorserServer";
 
 const ANIMATION_DURATION_SECS = 10;
 const ENDORSER_ENTITY_PREFIX = "https://endorser.ch/entity/";
@@ -19,17 +18,7 @@ export async function loadLandmarks(vue, world, scene, loop) {
     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 headers = await getHeaders(activeDid);
 
     const url = apiServer + "/api/v2/report/claims?claimType=GiveAction";
     const resp = await axios.get(url, { headers: headers });

src/constants/app.ts

@@ -4,21 +4,41 @@
  * 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",
 
-  DEFAULT_ENDORSER_API_SERVER = TEST_ENDORSER_API_SERVER,
-
   PROD_PUSH_SERVER = "https://timesafari.app",
   TEST1_PUSH_SERVER = "https://test.timesafari.app",
   TEST2_PUSH_SERVER = "https://timesafari-pwa.anomalistlabs.com",
 
-  DEFAULT_PUSH_SERVER = TEST1_PUSH_SERVER,
+  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)",
 }
 
+export const DEFAULT_ENDORSER_API_SERVER =
+  import.meta.env.VITE_DEFAULT_ENDORSER_API_SERVER ||
+  AppString.TEST_ENDORSER_API_SERVER;
+
+export const DEFAULT_IMAGE_API_SERVER =
+  import.meta.env.VITE_DEFAULT_IMAGE_API_SERVER ||
+  AppString.TEST_IMAGE_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
@@ -27,5 +47,11 @@ export interface NotificationIface {
   group: string; // "alert" | "modal"
   type: string; // "toast" | "info" | "success" | "warning" | "danger"
   title: string;
-  text: string;
+  text?: string;
+  noText?: string;
+  onCancel?: (stopAsking: boolean) => Promise<void>;
+  onNo?: (stopAsking: boolean) => Promise<void>;
+  onYes?: () => Promise<void>;
+  promptToStopAsking?: boolean;
+  yesText?: string;
 }

src/db/index.ts

@@ -1,19 +1,23 @@
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
 import { Account, AccountsSchema } from "./tables/accounts";
-import { Contact, ContactsSchema } from "./tables/contacts";
+import { Contact, ContactSchema } from "./tables/contacts";
+import { Log, LogSchema } from "./tables/logs";
 import {
   MASTER_SETTINGS_KEY,
   Settings,
   SettingsSchema,
 } from "./tables/settings";
-import { AppString } from "@/constants/app";
+import { Temp, TempSchema } from "./tables/temp";
+import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
 
 // Define types for tables that hold sensitive and non-sensitive data
 type SensitiveTables = { accounts: Table<Account> };
 type NonsensitiveTables = {
   contacts: Table<Contact>;
+  logs: Table<Log>;
   settings: Table<Settings>;
+  temp: Table<Temp>;
 };
 
 // Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
@@ -23,10 +27,7 @@ export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
 
 // Initialize Dexie databases for sensitive and non-sensitive data
 export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
-const SensitiveSchemas = { ...AccountsSchema };
-
 export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
-const NonsensitiveSchemas = { ...ContactsSchema, ...SettingsSchema };
 
 // Manage the encryption key. If not present in localStorage, create and store it.
 const secret =
@@ -36,17 +37,23 @@ if (!localStorage.getItem("secret")) localStorage.setItem("secret", secret);
 // Apply encryption to the sensitive database using the secret key
 encrypted(accountsDB, { secretKey: secret });
 
-// Define the schema for our databases
-accountsDB.version(1).stores(SensitiveSchemas);
-db.version(1).stores(NonsensitiveSchemas);
+// Define the schemas for our databases
+// Only the tables with index modifications need listing. https://dexie.org/docs/Tutorial/Design#database-versioning
+accountsDB.version(1).stores(AccountsSchema);
+// v1 also had contacts & settings
+// v2 added Log
+db.version(2).stores({
+  ...ContactSchema,
+  ...LogSchema,
+  ...SettingsSchema,
+});
+// v3 added Temp
+db.version(3).stores(TempSchema);
 
 // Event handler to initialize the non-sensitive database with default settings
-db.on("populate", () => {
-  db.settings.add({
+db.on("populate", async () => {
+  await db.settings.add({
     id: MASTER_SETTINGS_KEY,
-    apiServer: AppString.DEFAULT_ENDORSER_API_SERVER,
-
-    // remember that things you add from now on aren't automatically in the DB for old users
-    webPushServer: AppString.DEFAULT_PUSH_SERVER,
+    apiServer: DEFAULT_ENDORSER_API_SERVER,
   });
 });

src/db/tables/accounts.ts

@@ -3,41 +3,46 @@
  */
 export type Account = {
   /**
-   * Auto-generated ID by Dexie.
+   * Auto-generated ID by Dexie
    */
   id?: number;
 
   /**
-   * The date the account was created.
+   * The date the account was created
    */
   dateCreated: string;
 
   /**
-   * The derivation path for the account.
+   * The derivation path for the account, if this is from a mnemonic
    */
-  derivationPath: string;
+  derivationPath?: string;
 
   /**
-   * Decentralized Identifier (DID) for the account.
+   * Decentralized Identifier (DID) for the account
    */
   did: string;
 
   /**
-   * Stringified JSON containing underlying key material.
-   * Based on the IIdentifier type from Veramo.
+   * Stringified JSON containing underlying key material, if generated from a mnemonic
+   * Based on the IIdentifier type from Veramo
    * @see {@link https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts}
    */
-  identity: string;
+  identity?: string;
 
   /**
-   * The public key in hexadecimal format.
+   * The mnemonic phrase for the account, if this is from a mnemonic
+   */
+  mnemonic?: string;
+
+  /**
+   * The Webauthn credential ID in hex, if this is from a passkey
+   */
+  passkeyCredIdHex?: string;
+
+  /**
+   * The public key in hexadecimal format
    */
   publicKeyHex: string;
-
-  /**
-   * The mnemonic passphrase for the account.
-   */
-  mnemonic: string;
 };
 
 /**

src/db/tables/contacts.ts

@@ -1,11 +1,13 @@
 export interface Contact {
   did: string;
   name?: string;
+  nextPubKeyHashB64?: string; // base64-encoded SHA256 hash of next public key
+  profileImageUrl?: string;
   publicKeyBase64?: string;
   seesMe?: boolean;
   registered?: boolean;
 }
 
-export const ContactsSchema = {
-  contacts: "&did, name, publicKeyBase64, registered, seesMe",
+export const ContactSchema = {
+  contacts: "&did, name", // no need to key by other things
 };

src/db/tables/logs.ts

@@ -0,0 +1,11 @@
+export interface Log {
+  date: string;
+  message: string;
+}
+
+export const LogSchema = {
+  // Currently keyed by "date" because A) today's log data is what we need so we append, and
+  // B) we don't want it to grow so we remove everything if this is the first entry today.
+  // See safari-notifications.js logMessage for the associated logic.
+  logs: "date", // definitely don't key by the potentially large message field
+};

src/db/tables/settings.ts

@@ -12,15 +12,24 @@ export type BoundingBox = {
  * Settings type encompasses user-specific configuration details.
  */
 export type Settings = {
-  id: number; // Only one entry using MASTER_SETTINGS_KEY
+  id: number; // Only one entry, keyed with MASTER_SETTINGS_KEY
+
   activeDid?: string; // Active Decentralized ID
   apiServer?: string; // API server URL
-  firstName?: string; // User's first name
-  lastName?: string; // User's last name
-  lastViewedClaimId?: string; // Last viewed claim ID
-  lastNotifiedClaimId?: string; // Last notified claim ID
+
+  filterFeedByNearby?: boolean; // filter by nearby
+  filterFeedByVisible?: boolean; // filter by visible users ie. anyone not hidden
+
+  firstName?: string; // user's full name
+  hideRegisterPromptOnNewContact?: boolean;
   isRegistered?: boolean;
-  webPushServer?: string; // Web Push server URL
+  lastName?: string; // deprecated - put all names in firstName
+  lastNotifiedClaimId?: string;
+  lastViewedClaimId?: string;
+  passkeyExpirationMinutes?: number; // passkey access token time-to-live in minutes
+  profileImageUrl?: string;
+  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
+  reminderOn?: boolean; // Toggle to enable or disable reminders
 
   // Array of named search boxes defined by bounding boxes
   searchBoxes?: Array<{
@@ -29,11 +38,18 @@ 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
-  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
-  reminderOn?: boolean; // Toggle to enable or disable reminders
+  warnIfProdServer?: boolean; // Warn if using a production server
+  warnIfTestServer?: boolean; // Warn if using a testing server
+  webPushServer?: string; // Web Push server URL
 };
 
+export function isAnyFeedFilterOn(settings: Settings): boolean {
+  return !!(settings?.filterFeedByNearby || settings?.filterFeedByVisible);
+}
+
 /**
  * Schema for the Settings table in the database.
  */
@@ -45,3 +61,5 @@ export const SettingsSchema = {
  * Constants.
  */
 export const MASTER_SETTINGS_KEY = 1;
+
+export const DEFAULT_PASSKEY_EXPIRATION_MINUTES = 15;

src/db/tables/temp.ts

@@ -0,0 +1,14 @@
+// for ephemeral uses, eg. passing a blob from the service worker to the main thread
+
+export type Temp = {
+  id: string;
+  blob?: Blob; // deprecated because webkit (Safari) does not support Blob
+  blobB64?: string; // base64-encoded blob
+};
+
+/**
+ * Schema for the Temp table in the database.
+ */
+export const TempSchema = {
+  temp: "id",
+};

src/libs/crypto/index.ts

@@ -3,14 +3,18 @@ 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 { ENDORSER_JWT_URL_LOCATION } from "@/libs/endorserServer";
+import {
+  createEndorserJwtForDid,
+  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'";
 
+export const LOCAL_KMS_NAME = "local";
+
 /**
  *
  *
@@ -31,7 +35,7 @@ export const newIdentifier = (
     keys: [
       {
         kid: publicHex,
-        kms: "local",
+        kms: LOCAL_KMS_NAME,
         meta: { derivationPath: derivationPath },
         privateKeyHex: privateHex,
         publicKeyHex: publicHex,
@@ -64,6 +68,10 @@ export const deriveAddress = (
   return [address, privateHex, publicHex, derivationPath];
 };
 
+export const generateRandomBytes = (numBytes: number): Uint8Array => {
+  return getRandomBytesSync(numBytes);
+};
+
 /**
  *
  *
@@ -77,81 +85,20 @@ export const generateSeed = (): string => {
 };
 
 /**
- * Retreive an access token
+ * Retrieve an access token, or "" if no DID is provided.
  *
- * @param {IIdentifier} identifier
  * @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(process.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}`,
-    );
+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 "";
   }
-  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:
@@ -169,7 +116,23 @@ export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
   }
 
   // JWT format: { header, payload, signature, data }
-  const jwt = didJwt.decodeJWT(jwtText);
+  const jwt = decodeEndorserJwt(jwtText);
 
   return jwt.payload;
 };
+
+export const nextDerivationPath = (origDerivPath: string) => {
+  let lastStr = origDerivPath.split("/").slice(-1)[0];
+  if (lastStr.endsWith("'")) {
+    lastStr = lastStr.slice(0, -1);
+  }
+  const lastNum = parseInt(lastStr, 10);
+  const newLastNum = lastNum + 1;
+  const newLastStr = newLastNum.toString() + (lastStr.endsWith("'") ? "'" : "");
+  const newDerivPath = origDerivPath
+    .split("/")
+    .slice(0, -1)
+    .concat([newLastStr])
+    .join("/");
+  return newDerivPath;
+};

src/libs/crypto/vc/didPeer.ts

@@ -0,0 +1,96 @@
+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

@@ -0,0 +1,112 @@
+/**
+ * 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/crypto/vc/passkeyDidPeer.ts

@@ -0,0 +1,539 @@
+import { Buffer } from "buffer/";
+import { JWTPayload } from "did-jwt";
+import { DIDResolutionResult } from "did-resolver";
+import { sha256 } from "ethereum-cryptography/sha256.js";
+import {
+  startAuthentication,
+  startRegistration,
+} from "@simplewebauthn/browser";
+import {
+  generateAuthenticationOptions,
+  generateRegistrationOptions,
+  verifyAuthenticationResponse,
+  verifyRegistrationResponse,
+} from "@simplewebauthn/server";
+import { VerifyAuthenticationResponseOpts } from "@simplewebauthn/server/esm/authentication/verifyAuthenticationResponse";
+import {
+  Base64URLString,
+  PublicKeyCredentialCreationOptionsJSON,
+  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";
+
+export interface JWK {
+  kty: string;
+  crv: string;
+  x: string;
+  y: string;
+}
+
+export async function registerCredential(passkeyName?: string) {
+  const options: PublicKeyCredentialCreationOptionsJSON =
+    await generateRegistrationOptions({
+      rpName: AppString.APP_NAME,
+      rpID: window.location.hostname,
+      userName: passkeyName || AppString.APP_NAME + " User",
+      // Don't prompt users for additional information about the authenticator
+      // (Recommended for smoother UX)
+      attestationType: "none",
+      authenticatorSelection: {
+        // Defaults
+        residentKey: "preferred",
+        userVerification: "preferred",
+        // Optional
+        authenticatorAttachment: "platform",
+      },
+    });
+  // someday, instead of simplwebauthn, we'll go direct: navigator.credentials.create with PublicKeyCredentialCreationOptions
+  // with pubKeyCredParams: { type: "public-key", alg: -7 }
+  const attResp = await startRegistration(options);
+  const verification = await verifyRegistrationResponse({
+    response: attResp,
+    expectedChallenge: options.challenge,
+    expectedOrigin: window.location.origin,
+    expectedRPID: window.location.hostname,
+  });
+
+  // references for parsing auth data and getting the public key
+  // https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/parseAuthenticatorData.ts#L11
+  // https://chatgpt.com/share/78a5c91d-099d-46dc-aa6d-fc0c916509fa
+  // https://chatgpt.com/share/3c13f061-6031-45bc-a2d7-3347c1e7a2d7
+
+  const credIdBase64Url = verification.registrationInfo?.credentialID as string;
+  if (attResp.rawId !== credIdBase64Url) {
+    console.log("Warning! The raw ID does not match the credential ID.");
+  }
+  const credIdHex = Buffer.from(
+    base64URLStringToArrayBuffer(credIdBase64Url),
+  ).toString("hex");
+  const { publicKeyJwk } = cborToKeys(
+    verification.registrationInfo?.credentialPublicKey as Uint8Array,
+  );
+
+  return {
+    authData: verification.registrationInfo?.attestationObject,
+    credIdHex: credIdHex,
+    publicKeyJwk: publicKeyJwk,
+    publicKeyBytes: verification.registrationInfo
+      ?.credentialPublicKey as Uint8Array,
+  };
+}
+
+export class PeerSetup {
+  public authenticatorData?: ArrayBuffer;
+  public challenge?: Uint8Array;
+  public clientDataJsonBase64Url?: Base64URLString;
+  public signature?: Base64URLString;
+
+  public async createJwtSimplewebauthn(
+    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,
+      iss: issuerDid,
+    };
+    this.challenge = new Uint8Array(Buffer.from(JSON.stringify(fullPayload)));
+    // const payloadHash: Uint8Array = sha256(this.challenge);
+    const options: PublicKeyCredentialRequestOptionsJSON =
+      await generateAuthenticationOptions({
+        challenge: this.challenge,
+        rpID: window.location.hostname,
+        allowCredentials: [{ id: credentialId }],
+      });
+    // console.log("simple authentication options", options);
+
+    const clientAuth = await startAuthentication(options);
+    // console.log("simple credential get", clientAuth);
+
+    const authenticatorDataBase64Url = clientAuth.response.authenticatorData;
+    this.authenticatorData = Buffer.from(
+      clientAuth.response.authenticatorData,
+      "base64",
+    ).buffer;
+    this.clientDataJsonBase64Url = clientAuth.response.clientDataJSON;
+    // console.log("simple authenticatorData for signing", this.authenticatorData);
+    this.signature = clientAuth.response.signature;
+
+    // Our custom type of JWANT means the signature is based on a concatenation of the two Webauthn properties
+    const header: JWTPayload = { typ: "JWANT", alg: "ES256" };
+    const headerBase64 = Buffer.from(JSON.stringify(header))
+      .toString("base64")
+      .replace(/\+/g, "-")
+      .replace(/\//g, "_")
+      .replace(/=+$/, "");
+
+    const dataInJwt = {
+      AuthenticationDataB64URL: authenticatorDataBase64Url,
+      ClientDataJSONB64URL: this.clientDataJsonBase64Url,
+      exp: expiryTime,
+      iat: issuedAt,
+      iss: issuerDid,
+    };
+    const dataInJwtString = JSON.stringify(dataInJwt);
+    const payloadBase64 = Buffer.from(dataInJwtString)
+      .toString("base64")
+      .replace(/\+/g, "-")
+      .replace(/\//g, "_")
+      .replace(/=+$/, "");
+
+    const signature = clientAuth.response.signature;
+
+    return headerBase64 + "." + payloadBase64 + "." + signature;
+  }
+
+  public async createJwtNavigator(
+    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,
+      iss: issuerDid,
+    };
+    const dataToSignString = JSON.stringify(fullPayload);
+    const dataToSignBuffer = Buffer.from(dataToSignString);
+    const credentialId = Buffer.from(credIdHex, "hex");
+
+    // console.log("lower credentialId", credentialId);
+    this.challenge = new Uint8Array(dataToSignBuffer);
+    const options = {
+      publicKey: {
+        allowCredentials: [
+          {
+            id: credentialId,
+            type: "public-key" as const,
+          },
+        ],
+        challenge: this.challenge.buffer,
+        rpID: window.location.hostname,
+        userVerification: "preferred" as const,
+      },
+    };
+
+    const credential = await navigator.credentials.get(options);
+    // console.log("nav credential get", credential);
+
+    this.authenticatorData = credential?.response.authenticatorData;
+    const authenticatorDataBase64Url = arrayBufferToBase64URLString(
+      this.authenticatorData as ArrayBuffer,
+    );
+
+    this.clientDataJsonBase64Url = arrayBufferToBase64URLString(
+      credential?.response.clientDataJSON,
+    );
+
+    // Our custom type of JWANT means the signature is based on a concatenation of the two Webauthn properties
+    const header: JWTPayload = { typ: "JWANT", alg: "ES256" };
+    const headerBase64 = Buffer.from(JSON.stringify(header))
+      .toString("base64")
+      .replace(/\+/g, "-")
+      .replace(/\//g, "_")
+      .replace(/=+$/, "");
+
+    const dataInJwt = {
+      AuthenticationDataB64URL: authenticatorDataBase64Url,
+      ClientDataJSONB64URL: this.clientDataJsonBase64Url,
+      exp: expiryTime,
+      iat: issuedAt,
+      iss: issuerDid,
+    };
+    const dataInJwtString = JSON.stringify(dataInJwt);
+    const payloadBase64 = Buffer.from(dataInJwtString)
+      .toString("base64")
+      .replace(/\+/g, "-")
+      .replace(/\//g, "_")
+      .replace(/=+$/, "");
+
+    const origSignature = Buffer.from(credential?.response.signature).toString(
+      "base64",
+    );
+    this.signature = origSignature
+      .replace(/\+/g, "-")
+      .replace(/\//g, "_")
+      .replace(/=+$/, "");
+
+    const jwt = headerBase64 + "." + payloadBase64 + "." + this.signature;
+    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) => {
+  //     // get signature from WebAuthn
+  //     const signature = await this.generateWebAuthnSignature(data);
+  //
+  //     // This converts from the browser ArrayBuffer to a Node.js Buffer, which is a requirement for the asn1 library.
+  //     const signatureBuffer = Buffer.from(signature);
+  //     console.log("lower signature inside signer", signature);
+  //     console.log("lower buffer signature inside signer", signatureBuffer);
+  //     console.log("lower base64 buffer signature inside signer", signatureBuffer.toString("base64"));
+  //     // Decode the DER-encoded signature to extract R and S values
+  //     const reader = new asn1.BerReader(signatureBuffer);
+  //     console.log("lower after reader");
+  //     reader.readSequence();
+  //     console.log("lower after read sequence");
+  //     const r = reader.readString(asn1.Ber.Integer, true);
+  //     console.log("lower after r");
+  //     const s = reader.readString(asn1.Ber.Integer, true);
+  //     console.log("lower after r & s");
+  //
+  //     // Ensure R and S are 32 bytes each
+  //     const rBuffer = Buffer.from(r);
+  //     const sBuffer = Buffer.from(s);
+  //     console.log("lower after rBuffer & sBuffer", rBuffer, sBuffer);
+  //     const rWithoutPrefix = rBuffer.length > 32 ? rBuffer.slice(1) : rBuffer;
+  //     const sWithoutPrefix = sBuffer.length > 32 ? sBuffer.slice(1) : sBuffer;
+  //     const rPadded =
+  //       rWithoutPrefix.length < 32
+  //         ? Buffer.concat([Buffer.alloc(32 - rWithoutPrefix.length), rBuffer])
+  //         : rWithoutPrefix;
+  //     const sPadded =
+  //       rWithoutPrefix.length < 32
+  //         ? Buffer.concat([Buffer.alloc(32 - sWithoutPrefix.length), sBuffer])
+  //         : sWithoutPrefix;
+  //
+  //     // Concatenate R and S to form the 64-byte array (ECDSA signature format expected by JWT)
+  //     const combinedSignature = Buffer.concat([rPadded, sPadded]);
+  //     console.log(
+  //       "lower combinedSignature",
+  //       combinedSignature.length,
+  //       combinedSignature,
+  //     );
+  //
+  //     const combSig64 = combinedSignature.toString("base64");
+  //     console.log("lower combSig64", combSig64);
+  //     const combSig64Url = combSig64
+  //       .replace(/\+/g, "-")
+  //       .replace(/\//g, "_")
+  //       .replace(/=+$/, "");
+  //     console.log("lower combSig64Url", combSig64Url);
+  //     return combSig64Url;
+  //   };
+  // }
+}
+
+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
+// ... and this import:
+// import { p256 } from "@noble/curves/p256";
+export async function verifyJwtP256(
+  credIdHex: string,
+  issuerDid: string,
+  authenticatorData: ArrayBuffer,
+  challenge: Uint8Array,
+  clientDataJsonBase64Url: Base64URLString,
+  signature: Base64URLString,
+) {
+  const authDataFromBase = Buffer.from(authenticatorData);
+  const clientDataFromBase = Buffer.from(clientDataJsonBase64Url, "base64");
+  const sigBuffer = Buffer.from(signature, "base64");
+  const finalSigBuffer = unwrapEC2Signature(sigBuffer);
+  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
+
+  // Hash the client data
+  const hash = sha256(clientDataFromBase);
+
+  // Construct the preimage
+  const preimage = Buffer.concat([authDataFromBase, hash]);
+
+  const isValid = p256.verify(
+    finalSigBuffer,
+    new Uint8Array(preimage),
+    publicKeyBytes,
+  );
+  return isValid;
+}
+
+export async function verifyJwtSimplewebauthn(
+  credIdHex: string,
+  issuerDid: string,
+  authenticatorData: ArrayBuffer,
+  challenge: Uint8Array,
+  clientDataJsonBase64Url: Base64URLString,
+  signature: Base64URLString,
+) {
+  const authData = arrayToBase64Url(Buffer.from(authenticatorData));
+  const publicKeyBytes = peerDidToPublicKeyBytes(issuerDid);
+  const credId = arrayBufferToBase64URLString(
+    Buffer.from(credIdHex, "hex").buffer,
+  );
+  const authOpts: VerifyAuthenticationResponseOpts = {
+    authenticator: {
+      credentialID: credId,
+      credentialPublicKey: publicKeyBytes,
+      counter: 0,
+    },
+    expectedChallenge: arrayToBase64Url(challenge),
+    expectedOrigin: window.location.origin,
+    expectedRPID: window.location.hostname,
+    response: {
+      authenticatorAttachment: "platform",
+      clientExtensionResults: {},
+      id: credId,
+      rawId: credId,
+      response: {
+        authenticatorData: authData,
+        clientDataJSON: clientDataJsonBase64Url,
+        signature: signature,
+      },
+      type: "public-key",
+    },
+  };
+  const verification = await verifyAuthenticationResponse(authOpts);
+  return verification.verified;
+}
+
+// similar code is in endorser-ch util-crypto.ts verifyPeerSignature
+export async function verifyJwtWebCrypto(
+  credId: Base64URLString,
+  issuerDid: string,
+  authenticatorData: ArrayBuffer,
+  challenge: Uint8Array,
+  clientDataJsonBase64Url: Base64URLString,
+  signature: Base64URLString,
+) {
+  const authDataFromBase = Buffer.from(authenticatorData);
+  const clientDataFromBase = Buffer.from(clientDataJsonBase64Url, "base64");
+  const sigBuffer = Buffer.from(signature, "base64");
+  const finalSigBuffer = unwrapEC2Signature(sigBuffer);
+
+  // Hash the client data
+  const hash = sha256(clientDataFromBase);
+
+  // Construct the preimage
+  const preimage = Buffer.concat([authDataFromBase, hash]);
+  return verifyPeerSignature(preimage, issuerDid, finalSigBuffer);
+}
+
+// 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(
+      "This only verifies a peer DID, method 0, encoded base58btc.",
+    );
+  }
+  // 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",
+    ],
+    assertionMethod: [did + "#" + encnumbasis],
+    authentication: [did + "#" + encnumbasis],
+    capabilityDelegation: [did + "#" + encnumbasis],
+    capabilityInvocation: [did + "#" + encnumbasis],
+    id: did,
+    keyAgreement: undefined,
+    service: undefined,
+    verificationMethod: [
+      {
+        controller: did,
+        id: did + "#" + encnumbasis,
+        publicKeyMultibase: multibase,
+        type: "EcdsaSecp256k1VerificationKey2019",
+      },
+    ],
+  };
+  return {
+    didDocument,
+    didDocumentMetadata: {},
+    didResolutionMetadata: { contentType: "application/did+ld+json" },
+  };
+}
+
+// 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
+  const pem = `-----BEGIN PUBLIC KEY-----
+${pubKeyBuffer.toString("base64")}
+-----END PUBLIC KEY-----`;
+
+  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);
+  const str = atob(input + pad);
+  const bytes = new Uint8Array(str.length);
+  for (let i = 0; i < str.length; i++) {
+    bytes[i] = str.charCodeAt(i);
+  }
+  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) {
+  const bytes = new Uint8Array(buffer);
+  let str = "";
+  for (const charCode of bytes) {
+    str += String.fromCharCode(charCode);
+  }
+  const base64String = btoa(str);
+  return base64String.replace(/\+/g, "-").replace(/\//g, "_").replace(/=/g, "");
+}
+
+// from @simplewebauthn/browser
+function base64URLStringToArrayBuffer(base64URLString: string) {
+  const base64 = base64URLString.replace(/-/g, "+").replace(/_/g, "/");
+  const padLength = (4 - (base64.length % 4)) % 4;
+  const padded = base64.padEnd(base64.length + padLength, "=");
+  const binary = atob(padded);
+  const buffer = new ArrayBuffer(binary.length);
+  const bytes = new Uint8Array(buffer);
+  for (let i = 0; i < binary.length; i++) {
+    bytes[i] = binary.charCodeAt(i);
+  }
+  return buffer;
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+async function pemToCryptoKey(pem: string) {
+  const binaryDerString = atob(
+    pem
+      .split("\n")
+      .filter((x) => !x.includes("-----"))
+      .join(""),
+  );
+  const binaryDer = new Uint8Array(binaryDerString.length);
+  for (let i = 0; i < binaryDerString.length; i++) {
+    binaryDer[i] = binaryDerString.charCodeAt(i);
+  }
+  // console.log("binaryDer", binaryDer.buffer);
+  return await window.crypto.subtle.importKey(
+    "spki",
+    binaryDer.buffer,
+    {
+      name: "RSASSA-PKCS1-v1_5",
+      hash: "SHA-256",
+    },
+    true,
+    ["verify"],
+  );
+}

src/libs/crypto/vc/passkeyHelpers.ts

@@ -0,0 +1,105 @@
+// from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoCrypto/unwrapEC2Signature.ts
+import { AsnParser } from "@peculiar/asn1-schema";
+import { ECDSASigValue } from "@peculiar/asn1-ecc";
+
+/**
+ * In WebAuthn, EC2 signatures are wrapped in ASN.1 structure so we need to peel r and s apart.
+ *
+ * See https://www.w3.org/TR/webauthn-2/#sctn-signature-attestation-types
+ */
+export function unwrapEC2Signature(signature: Uint8Array): Uint8Array {
+  const parsedSignature = AsnParser.parse(signature, ECDSASigValue);
+  let rBytes = new Uint8Array(parsedSignature.r);
+  let sBytes = new Uint8Array(parsedSignature.s);
+
+  if (shouldRemoveLeadingZero(rBytes)) {
+    rBytes = rBytes.slice(1);
+  }
+
+  if (shouldRemoveLeadingZero(sBytes)) {
+    sBytes = sBytes.slice(1);
+  }
+
+  const finalSignature = isoUint8ArrayConcat([rBytes, sBytes]);
+
+  return finalSignature;
+}
+
+/**
+ * Determine if the DER-specific `00` byte at the start of an ECDSA signature byte sequence
+ * should be removed based on the following logic:
+ *
+ * "If the leading byte is 0x0, and the the high order bit on the second byte is not set to 0,
+ * then remove the leading 0x0 byte"
+ */
+function shouldRemoveLeadingZero(bytes: Uint8Array): boolean {
+  return bytes[0] === 0x0 && (bytes[1] & (1 << 7)) !== 0;
+}
+
+// from https://github.com/MasterKale/SimpleWebAuthn/blob/master/packages/server/src/helpers/iso/isoUint8Array.ts#L49
+/**
+ * Combine multiple Uint8Arrays into a single Uint8Array
+ */
+export function isoUint8ArrayConcat(arrays: Uint8Array[]): Uint8Array {
+  let pointer = 0;
+  const totalLength = arrays.reduce((prev, curr) => prev + curr.length, 0);
+
+  const toReturn = new Uint8Array(totalLength);
+
+  arrays.forEach((arr) => {
+    toReturn.set(arr, pointer);
+    pointer += arr.length;
+  });
+
+  return toReturn;
+}
+
+// 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 }> {
+  /**
+   * 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
+   * synchronous. For example, `generateRegistrationOptions()` and `generateAuthenticationOptions()`
+   * become synchronous if we make this synchronous (since nothing else in that method is async)
+   * which represents a breaking API change in this library's core API.
+   *
+   * 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());
+    },
+  );
+  return toResolve;
+}
+class MissingWebCrypto extends Error {
+  constructor() {
+    const message = "An instance of the Crypto API could not be located";
+    super(message);
+    this.name = "MissingWebCrypto";
+  }
+}
+// Make it possible to stub return values during testing
+const _getWebCryptoInternals = {
+  stubThisGlobalThisCrypto: () => globalThis.crypto,
+  // Make it possible to reset the `webCrypto` at the top of the file
+  setCachedCrypto: (newCrypto: { subtle: SubtleCrypto }) => {
+    webCrypto = newCrypto;
+  },
+};

src/libs/util.ts

@@ -1,5 +1,370 @@
 // many of these are also found in endorser-mobile utility.ts
 
+import axios, { AxiosResponse } from "axios";
+import { useClipboard } from "@vueuse/core";
+
+import { DEFAULT_PUSH_SERVER } from "@/constants/app";
+import { accountsDB, db } from "@/db/index";
+import { Account } from "@/db/tables/accounts";
+import {
+  DEFAULT_PASSKEY_EXPIRATION_MINUTES,
+  MASTER_SETTINGS_KEY,
+} from "@/db/tables/settings";
+import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
+import {
+  containsHiddenDid,
+  GenericCredWrapper,
+  GenericVerifiableCredential,
+  OfferVerifiableCredential,
+} from "@/libs/endorserServer";
+import * as serverUtil from "@/libs/endorserServer";
+import { registerCredential } from "@/libs/crypto/vc/passkeyDidPeer";
+
+import { Buffer } from "buffer";
+import { KeyMeta } from "@/libs/crypto/vc";
+import { createPeerDid } from "@/libs/crypto/vc/didPeer";
+
+export const PRIVACY_MESSAGE =
+  "The data you send will be visible to the world -- except: your IDs and the IDs of anyone you tag will stay private, only visible to them and others you explicitly allow.";
+export const SHARED_PHOTO_BASE64_KEY = "shared-photo-base64";
+
+/* eslint-disable prettier/prettier */
+export const UNIT_SHORT: Record<string, string> = {
+  "BTC": "BTC",
+  "BX": "BX",
+  "ETH": "ETH",
+  "HUR": "Hours",
+  "USD": "US $",
+};
+/* eslint-enable prettier/prettier */
+
+/* eslint-disable prettier/prettier */
+export const UNIT_LONG: Record<string, string> = {
+  "BTC": "Bitcoin",
+  "BX": "Buxbe",
+  "ETH": "Ethereum",
+  "HUR": "hours",
+  "USD": "dollars",
+};
+/* eslint-enable prettier/prettier */
+
+const UNIT_CODES: Record<string, Record<string, string>> = {
+  BTC: {
+    name: "Bitcoin",
+    faIcon: "bitcoin-sign",
+  },
+  HUR: {
+    name: "hours",
+    faIcon: "clock",
+  },
+  USD: {
+    name: "US Dollars",
+    faIcon: "dollar",
+  },
+};
+
+export function iconForUnitCode(unitCode: string) {
+  return UNIT_CODES[unitCode]?.faIcon || "question";
+}
+
+// from https://stackoverflow.com/a/175787/845494
+// ... though it appears even this isn't precisely right so keep doing "|| 0" or something in sensitive places
+//
+export function isNumeric(str: string): boolean {
+  // This ignore commentary is because typescript complains when you pass a string to isNaN.
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore
+  return !isNaN(str) && !isNaN(parseFloat(str));
+}
+
+export function numberOrZero(str: string): number {
+  return isNumeric(str) ? +str : 0;
+}
+
 export const isGlobalUri = (uri: string) => {
   return uri && uri.match(new RegExp(/^[A-Za-z][A-Za-z0-9+.-]+:/));
 };
+
+export const isGiveAction = (
+  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
+) => {
+  return veriClaim.claimType === "GiveAction";
+};
+
+export const doCopyTwoSecRedo = (text: string, fn: () => void) => {
+  fn();
+  useClipboard()
+    .copy(text)
+    .then(() => setTimeout(fn, 2000));
+};
+
+/**
+ * @returns true if the user can confirm the claim
+ * @param veriClaim is expected to have fields: claim, claimType, and issuer
+ */
+export const isGiveRecordTheUserCanConfirm = (
+  isRegistered: boolean,
+  veriClaim: GenericCredWrapper<GenericVerifiableCredential>,
+  activeDid: string,
+  confirmerIdList: string[] = [],
+) => {
+  return (
+    isRegistered &&
+    isGiveAction(veriClaim) &&
+    !confirmerIdList.includes(activeDid) &&
+    veriClaim.issuer !== activeDid &&
+    !containsHiddenDid(veriClaim.claim)
+  );
+};
+
+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) => {
+  let giver;
+  if (
+    veriClaim.claim.offeredBy?.identifier &&
+    !serverUtil.isHiddenDid(veriClaim.claim.offeredBy.identifier as string)
+  ) {
+    giver = veriClaim.claim.offeredBy.identifier;
+  } else if (veriClaim.issuer && !serverUtil.isHiddenDid(veriClaim.issuer)) {
+    giver = veriClaim.issuer;
+  }
+  return giver;
+};
+
+/**
+ * @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>)
+  );
+};
+
+// return object with paths and arrays of DIDs for any keys ending in "VisibleToDid"
+export function findAllVisibleToDids(
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  input: any,
+  humanReadable = false,
+): Record<string, Array<string>> {
+  if (Array.isArray(input)) {
+    const result: Record<string, Array<string>> = {};
+    for (let i = 0; i < input.length; i++) {
+      const inside = findAllVisibleToDids(input[i], humanReadable);
+      for (const key in inside) {
+        const pathKey = humanReadable
+          ? "#" + (i + 1) + " " + key
+          : "[" + i + "]" + key;
+        result[pathKey] = inside[key];
+      }
+    }
+    return result;
+  } else if (input instanceof Object) {
+    // regular map (non-array) object
+    const result: Record<string, Array<string>> = {};
+    for (const key in input) {
+      if (key.endsWith("VisibleToDids")) {
+        const newKey = key.slice(0, -"VisibleToDids".length);
+        const pathKey = humanReadable ? newKey : "." + newKey;
+        result[pathKey] = input[key];
+      } else {
+        const inside = findAllVisibleToDids(input[key], humanReadable);
+        for (const insideKey in inside) {
+          const pathKey = humanReadable
+            ? key + "'s " + insideKey
+            : "." + key + insideKey;
+          result[pathKey] = inside[insideKey];
+        }
+      }
+    }
+    return result;
+  } else {
+    return {};
+  }
+}
+
+/**
+ * Test findAllVisibleToDids
+ *
+
+ pkgx +deno.land sh
+
+ deno
+
+ import * as R from 'ramda';
+ //import { findAllVisibleToDids } from './src/libs/util'; // doesn't work because other dependencies fail so gotta copy-and-paste function
+
+ console.log(R.equals(findAllVisibleToDids(null), {}));
+ console.log(R.equals(findAllVisibleToDids(9), {}));
+ console.log(R.equals(findAllVisibleToDids([]), {}));
+ console.log(R.equals(findAllVisibleToDids({}), {}));
+ console.log(R.equals(findAllVisibleToDids({ issuer: "abc" }), {}));
+ console.log(R.equals(findAllVisibleToDids({ issuerVisibleToDids: ["abc"] }), { ".issuer": ["abc"] }));
+ console.log(R.equals(findAllVisibleToDids([{ issuerVisibleToDids: ["abc"] }]), { "[0].issuer": ["abc"] }));
+ console.log(R.equals(findAllVisibleToDids(["xyz", { fluff: { issuerVisibleToDids: ["abc"] } }]), { "[1].fluff.issuer": ["abc"] }));
+ console.log(R.equals(findAllVisibleToDids(["xyz", { fluff: { issuerVisibleToDids: ["abc"] }, stuff: [ { did: "HIDDEN", agentDidVisibleToDids: ["def", "ghi"] } ] }]), { "[1].fluff.issuer": ["abc"], "[1].stuff[0].agentDid": ["def", "ghi"] }));
+
+ *
+ **/
+
+export interface AccountKeyInfo extends Account, KeyMeta {}
+
+export const getAccount = async (
+  activeDid: string,
+): Promise<AccountKeyInfo | undefined> => {
+  await accountsDB.open();
+  const account = (await accountsDB.accounts
+    .where("did")
+    .equals(activeDid)
+    .first()) as Account;
+  return account;
+};
+
+/**
+ * Generates a new identity, saves it to the database, and sets it as the active identity.
+ * @return {Promise<string>} with the DID of the new identity
+ */
+export const generateSaveAndActivateIdentity = async (): Promise<string> => {
+  const mnemonic = generateSeed();
+  // address is 0x... ETH address, without "did:eth:"
+  const [address, privateHex, publicHex, derivationPath] =
+    deriveAddress(mnemonic);
+
+  const newId = newIdentifier(address, publicHex, privateHex, derivationPath);
+  const identity = JSON.stringify(newId);
+
+  await accountsDB.open();
+  await accountsDB.accounts.add({
+    dateCreated: new Date().toISOString(),
+    derivationPath: derivationPath,
+    did: newId.did,
+    identity: identity,
+    mnemonic: mnemonic,
+    publicKeyHex: newId.keys[0].publicKeyHex,
+  });
+
+  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 db.open();
+  await db.settings.update(MASTER_SETTINGS_KEY, {
+    activeDid: account.did,
+  });
+
+  return account;
+};
+
+export const getPasskeyExpirationSeconds = async (): Promise<number> => {
+  await db.open();
+  const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+  const passkeyExpirationSeconds =
+    (settings?.passkeyExpirationMinutes ?? DEFAULT_PASSKEY_EXPIRATION_MINUTES) *
+    60;
+  return passkeyExpirationSeconds;
+};
+
+export const sendTestThroughPushServer = async (
+  subscriptionJSON: PushSubscriptionJSON,
+  skipFilter: boolean,
+): Promise<AxiosResponse> => {
+  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;
+  }
+
+  // This is a special value that tells the service worker to send a direct notification to the device, skipping filters.
+  // This is shared with the service worker and should be a constant. Look for the same name in additional-scripts.js
+  // Use something other than "Daily Update" https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/3c0e196c11bc98060ec5934e99e7dbd591b5da4d/app.py#L213
+  const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
+
+  const newPayload = {
+    // eslint-disable-next-line prettier/prettier
+    message: `Test, where you will see this message ${ skipFilter ? "un" : "" }filtered.`,
+    title: skipFilter ? DIRECT_PUSH_TITLE : "Your Web Push",
+    ...subscriptionJSON,
+  };
+  console.log("Sending a test web push message:", newPayload);
+  const payloadStr = JSON.stringify(newPayload);
+  const response = await axios.post(
+    pushUrl + "/web-push/send-test",
+    payloadStr,
+    {
+      headers: {
+        "Content-Type": "application/json",
+      },
+    },
+  );
+
+  console.log("Got response from web push server:", response);
+  return response;
+};

src/main.ts

@@ -1,5 +1,5 @@
 import { createPinia } from "pinia";
-import { createApp } from "vue";
+import { App as VueApp, ComponentPublicInstance, createApp } from "vue";
 import App from "./App.vue";
 import "./registerServiceWorker";
 import router from "./router";
@@ -11,14 +11,22 @@ import "./assets/styles/tailwind.css";
 
 import { library } from "@fortawesome/fontawesome-svg-core";
 import {
+  faArrowDown,
   faArrowLeft,
   faArrowRight,
+  faArrowRotateBackward,
+  faArrowUpRightFromSquare,
+  faArrowUp,
   faBan,
   faBitcoinSign,
   faBurst,
   faCalendar,
+  faCamera,
+  faCheck,
+  faChevronDown,
   faChevronLeft,
   faChevronRight,
+  faChevronUp,
   faCircle,
   faCircleCheck,
   faCircleInfo,
@@ -29,21 +37,29 @@ import {
   faComment,
   faCopy,
   faDollar,
+  faEllipsis,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
   faFileLines,
   faFloppyDisk,
   faFolderOpen,
+  faForward,
   faGift,
   faGlobe,
+  faHammer,
   faHand,
+  faHandHoldingDollar,
+  faHandHoldingHeart,
   faHouseChimney,
+  faImagePortrait,
+  faLeftRight,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
   faMessage,
+  faMinus,
   faPen,
   faPersonCircleCheck,
   faPersonCircleQuestion,
@@ -53,8 +69,10 @@ import {
   faRotate,
   faShareNodes,
   faSpinner,
+  faSquare,
   faSquareCaretDown,
   faSquareCaretUp,
+  faSquarePlus,
   faTrashCan,
   faTriangleExclamation,
   faUser,
@@ -63,14 +81,22 @@ import {
 } from "@fortawesome/free-solid-svg-icons";
 
 library.add(
+  faArrowDown,
   faArrowLeft,
   faArrowRight,
+  faArrowRotateBackward,
+  faArrowUpRightFromSquare,
+  faArrowUp,
   faBan,
   faBitcoinSign,
   faBurst,
   faCalendar,
+  faCamera,
+  faCheck,
+  faChevronDown,
   faChevronLeft,
   faChevronRight,
+  faChevronUp,
   faCircle,
   faCircleCheck,
   faCircleInfo,
@@ -81,21 +107,29 @@ library.add(
   faComment,
   faCopy,
   faDollar,
+  faEllipsis,
   faEllipsisVertical,
   faEye,
   faEyeSlash,
   faFileLines,
   faFloppyDisk,
   faFolderOpen,
+  faForward,
   faGift,
   faGlobe,
+  faHammer,
   faHand,
+  faHandHoldingDollar,
+  faHandHoldingHeart,
   faHouseChimney,
+  faImagePortrait,
+  faLeftRight,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
   faMessage,
+  faMinus,
   faPen,
   faPersonCircleCheck,
   faPersonCircleQuestion,
@@ -105,8 +139,10 @@ library.add(
   faRotate,
   faShareNodes,
   faSpinner,
+  faSquare,
   faSquareCaretDown,
   faSquareCaretUp,
+  faSquarePlus,
   faTrashCan,
   faTriangleExclamation,
   faUser,
@@ -115,11 +151,40 @@ library.add(
 );
 
 import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome";
+import Camera from "simple-vue-camera";
 
-createApp(App)
+// Can trigger this with a 'throw' inside some top-level function, eg. on the HomeView
+function setupGlobalErrorHandler(app: VueApp) {
+  // @ts-expect-error 'cause we cannot see why config is not defined
+  app.config.errorHandler = (
+    err: Error,
+    instance: ComponentPublicInstance | null,
+    info: string,
+  ) => {
+    console.error(
+      "Ouch! Global Error Handler. Info:",
+      info,
+      "Error:",
+      err,
+      "Instance:",
+      instance,
+    );
+    // Want to show a nice notiwind notification but can't figure out how.
+    alert(
+      (err.message || "Something bad happened") +
+        " - Try reloading or restarting the app.",
+    );
+  };
+}
+
+const app = createApp(App)
   .component("fa", FontAwesomeIcon)
+  .component("camera", Camera)
   .use(createPinia())
   .use(VueAxios, axios)
   .use(router)
-  .use(Notifications)
-  .mount("#app");
+  .use(Notifications);
+
+setupGlobalErrorHandler(app);
+
+app.mount("#app");

src/registerServiceWorker.ts

@@ -2,8 +2,9 @@
 
 import { register } from "register-service-worker";
 
-if (process.env.NODE_ENV === "production") {
-  register("/additional-scripts.js", {
+// 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() {
       console.log(
         "App is being served from cache by a service worker.\n" +

src/router/index.ts

@@ -28,201 +28,195 @@ const enterOrStart = async (
 };
 
 const routes: Array<RouteRecordRaw> = [
-  {
-    path: "/",
-    name: "home",
-    component: () =>
-      import(/* webpackChunkName: "home" */ "../views/HomeView.vue"),
-  },
   {
     path: "/account",
     name: "account",
-    component: () =>
-      import(/* webpackChunkName: "account" */ "../views/AccountViewView.vue"),
-    beforeEnter: enterOrStart,
+    component: () => import("../views/AccountViewView.vue"),
   },
   {
     path: "/claim/:id?",
     name: "claim",
-    component: () =>
-      import(/* webpackChunkName: "claim" */ "../views/ClaimView.vue"),
+    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",
-    component: () =>
-      import(
-        /* webpackChunkName: "confirm-contact" */ "../views/ConfirmContactView.vue"
-      ),
+    component: () => import("../views/ConfirmContactView.vue"),
+  },
+  {
+    path: "/confirm-gift/:id?",
+    name: "confirm-gift",
+    component: () => import("@/views/ConfirmGiftView.vue"),
   },
   {
     path: "/contact-amounts",
     name: "contact-amounts",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-amounts" */ "../views/ContactAmountsView.vue"
-      ),
+    component: () => import("../views/ContactAmountsView.vue"),
   },
   {
-    path: "/contact-gives",
-    name: "contact-gives",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-gives" */ "../views/ContactGiftingView.vue"
-      ),
+    path: "/contact-gift",
+    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",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-qr" */ "../views/ContactQRScanShowView.vue"
-      ),
+    component: () => import("../views/ContactQRScanShowView.vue"),
   },
   {
     path: "/contacts",
     name: "contacts",
-    component: () =>
-      import(/* webpackChunkName: "contacts" */ "../views/ContactsView.vue"),
+    component: () => import("../views/ContactsView.vue"),
+  },
+  {
+    path: "/did/:did?",
+    name: "did",
+    component: () => import("../views/DIDView.vue"),
   },
   {
     path: "/discover",
     name: "discover",
-    component: () =>
-      import(/* webpackChunkName: "discover" */ "../views/DiscoverView.vue"),
+    component: () => import("../views/DiscoverView.vue"),
+  },
+  {
+    path: "/gifted-details",
+    name: "gifted-details",
+    component: () => import("@/views/GiftedDetailsView.vue"),
   },
   {
     path: "/help",
     name: "help",
-    component: () =>
-      import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
+    component: () => import("../views/HelpView.vue"),
   },
   {
     path: "/help-notifications",
     name: "help-notifications",
-    component: () =>
-      import(
-        /* webpackChunkName: "help-notifications" */ "../views/HelpNotificationsView.vue"
-      ),
+    component: () => import("../views/HelpNotificationsView.vue"),
+  },
+  {
+    path: "/help-onboarding",
+    name: "help-onboarding",
+    component: () => import("../views/HelpOnboardingView.vue"),
+  },
+  {
+    path: "/",
+    name: "home",
+    component: () => import("../views/HomeView.vue"),
   },
   {
     path: "/identity-switcher",
     name: "identity-switcher",
-    component: () =>
-      import(
-        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
-      ),
+    component: () => import("../views/IdentitySwitcherView.vue"),
   },
   {
     path: "/import-account",
     name: "import-account",
-    component: () =>
-      import(
-        /* webpackChunkName: "import-account" */ "../views/ImportAccountView.vue"
-      ),
+    component: () => import("../views/ImportAccountView.vue"),
   },
   {
     path: "/import-derive",
     name: "import-derive",
-    component: () =>
-      import(
-        /* webpackChunkName: "import-derive" */ "../views/ImportDerivedAccountView.vue"
-      ),
+    component: () => import("../views/ImportDerivedAccountView.vue"),
   },
   {
     path: "/new-edit-account",
     name: "new-edit-account",
-    component: () =>
-      import(
-        /* webpackChunkName: "new-edit-account" */ "../views/NewEditAccountView.vue"
-      ),
-  },
-  {
-    path: "/new-edit-commitment",
-    name: "new-edit-commitment",
-    component: () =>
-      import(
-        /* webpackChunkName: "new-edit-commitment" */ "../views/NewEditCommitmentView.vue"
-      ),
+    component: () => import("../views/NewEditAccountView.vue"),
   },
   {
     path: "/new-edit-project",
     name: "new-edit-project",
-    component: () =>
-      import(
-        /* webpackChunkName: "new-edit-project" */ "../views/NewEditProjectView.vue"
-      ),
+    component: () => import("../views/NewEditProjectView.vue"),
   },
   {
     path: "/new-identifier",
     name: "new-identifier",
-    component: () =>
-      import(
-        /* webpackChunkName: "new-identifier" */ "../views/NewIdentifierView.vue"
-      ),
+    component: () => import("../views/NewIdentifierView.vue"),
+  },
+  {
+    path: "/offer-details/:id?",
+    name: "offer-details",
+    component: () => import("../views/OfferDetailsView.vue"),
   },
   {
     path: "/project/:id?",
     name: "project",
-    component: () =>
-      import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
+    component: () => import("../views/ProjectViewView.vue"),
   },
   {
     path: "/projects",
     name: "projects",
-    component: () =>
-      import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
+    component: () => import("../views/ProjectsView.vue"),
     beforeEnter: enterOrStart,
   },
+  {
+    path: "/quick-action-bvc",
+    name: "quick-action-bvc",
+    component: () => import("../views/QuickActionBvcView.vue"),
+  },
+  {
+    path: "/quick-action-bvc-begin",
+    name: "quick-action-bvc-begin",
+    component: () => import("../views/QuickActionBvcBeginView.vue"),
+  },
+  {
+    path: "/quick-action-bvc-end",
+    name: "quick-action-bvc-end",
+    component: () => import("../views/QuickActionBvcEndView.vue"),
+  },
   {
     path: "/scan-contact",
     name: "scan-contact",
-    component: () =>
-      import(
-        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
-      ),
+    component: () => import("../views/ContactScanView.vue"),
   },
   {
     path: "/search-area",
     name: "search-area",
-    component: () =>
-      import(
-        /* webpackChunkName: "search-area" */ "../views/SearchAreaView.vue"
-      ),
+    component: () => import("../views/SearchAreaView.vue"),
   },
   {
     path: "/seed-backup",
     name: "seed-backup",
-    component: () =>
-      import(
-        /* webpackChunkName: "seed-backup" */ "../views/SeedBackupView.vue"
-      ),
+    component: () => import("../views/SeedBackupView.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",
-    component: () =>
-      import(/* webpackChunkName: "start" */ "../views/StartView.vue"),
+    component: () => import("../views/StartView.vue"),
   },
   {
     path: "/statistics",
     name: "statistics",
-    component: () =>
-      import(
-        /* webpackChunkName: "statistics" */ "../views/StatisticsView.vue"
-      ),
+    component: () => import("../views/StatisticsView.vue"),
   },
   {
     path: "/test",
     name: "test",
-    component: () =>
-      import(/* webpackChunkName: "test" */ "../views/TestView.vue"),
+    component: () => import("../views/TestView.vue"),
   },
 ];
 
 /** @type {*} */
 const router = createRouter({
-  history: createWebHistory(process.env.BASE_URL),
+  history: createWebHistory(import.meta.env.BASE_URL),
   routes,
 });
 

src/test/index.ts

@@ -6,6 +6,9 @@ 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";

src/views/ClaimAddRawView.vue

@@ -0,0 +1,99 @@
+<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 { db } from "@/db/index";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import * as serverUtil from "@/libs/endorserServer";
+import QuickNav from "@/components/QuickNav.vue";
+
+@Component({
+  components: { QuickNav },
+})
+export default class ClaimAddRawView extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  accountIdentityStr: string = "null";
+  activeDid = "";
+  apiServer = "";
+  claimStr = "";
+
+  async mounted() {
+    await db.open();
+    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    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/ConfirmContactView.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24">
+  <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">
@@ -30,17 +30,19 @@
     </div>
 
     <div class="mt-8">
-      <input
-        type="submit"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        value="Add Contact"
-      />
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
+      <div class="grid grid-cols-1 sm:grid-cols-2 gap-2">
+        <input
+          type="submit"
+          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"
+          value="Add Contact"
+        />
+        <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-1.5 py-2 rounded-md"
+        >
+          Cancel
+        </button>
+      </div>
     </div>
   </section>
 </template>

src/views/ConfirmGiftView.vue

@@ -0,0 +1,862 @@
+<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>
+        <span
+          v-if="
+            libsUtil.isGiveRecordTheUserCanConfirm(
+              isRegistered,
+              veriClaim,
+              activeDid,
+              confirmerIdList,
+            )
+          "
+        >
+          Do you agree?
+        </span>
+        <span v-else> Details </span>
+      </h1>
+    </div>
+
+    <div v-if="giveDetails && !isLoading">
+      <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,
+            )
+          "
+          @click="confirmConfirmClaim()"
+        >
+          Confirm
+          <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
+        </button>
+        <button
+          v-else
+          @click="notifyWhyCannotConfirm()"
+          class="col-span-1 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"
+        >
+          Confirm
+          <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"
+        >
+          Record a Similar One
+        </a>
+      </div>
+
+      <!-- Details -->
+      <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mt-4">
+        <div class="block flex gap-4 overflow-hidden">
+          <div class="overflow-hidden">
+            <div class="text-sm">
+              <div>
+                <fa icon="arrow-down" class="fa-fw text-slate-400" />
+                {{ giverName }}
+              </div>
+              <div class="ml-6">gave</div>
+              <div v-if="giveDetails.amount">
+                <fa icon="hand-holding-dollar" class="fa-fw text-slate-400" />
+                {{ displayAmount(giveDetails.unit, giveDetails.amount) }}
+              </div>
+              <div v-if="giveDetails.description">
+                <fa icon="message" class="fa-fw text-slate-400" />
+                {{ giveDetails.amount ? "and:" : "" }}
+                {{ giveDetails.description }}
+              </div>
+              <div class="ml-6">to</div>
+              <div>
+                <fa icon="arrow-up" class="fa-fw text-slate-400" />
+                {{ recipientName }}
+              </div>
+              <div>
+                <fa icon="calendar" class="fa-fw text-slate-400" />
+                on
+                {{ giveDetails.issuedAt.substring(0, 10) }}
+              </div>
+
+              <!-- Fullfills Links -->
+
+              <!-- fullfills links for a give -->
+              <div class="mt-2" v-if="giveDetails?.fulfillsPlanHandleId">
+                <router-link
+                  :to="
+                    '/project/' +
+                    encodeURIComponent(giveDetails?.fulfillsPlanHandleId)
+                  "
+                  class="text-blue-500 mt-2 cursor-pointer"
+                  target="_blank"
+                >
+                  This fulfills a bigger plan
+                  <fa icon="arrow-up-right-from-square" class="fa-fw" />
+                </router-link>
+              </div>
+              <!-- if there's another, it's probably fulfilling an offer, too -->
+              <div
+                v-if="
+                  giveDetails?.fulfillsType &&
+                  giveDetails?.fulfillsType !== 'PlanAction' &&
+                  giveDetails?.fulfillsHandleId
+                "
+              >
+                <!-- router-link to /claim/ only changes URL path -->
+                <router-link
+                  :to="
+                    '/claim/' +
+                    encodeURIComponent(giveDetails?.fulfillsHandleId)
+                  "
+                  class="text-blue-500 mt-2 cursor-pointer"
+                  target="_blank"
+                >
+                  This fulfills
+                  {{
+                    capitalizeAndInsertSpacesBeforeCapsWithAPrefix(
+                      giveDetails.fulfillsType,
+                    )
+                  }}
+                  <fa icon="arrow-up-right-from-square" class="fa-fw" />
+                </router-link>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="mt-2">
+        <fa icon="comment" class="text-slate-400" />
+        {{ issuerName }} posted that.
+      </div>
+
+      <div v-if="libsUtil.isGiveAction(veriClaim)" class="mt-4">
+        <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">
+          One person has confirmed this.
+        </span>
+        <span v-else>
+          {{ totalConfirmers() }} people have confirmed this.
+        </span>
+
+        <div v-if="totalConfirmers() > 0">
+          <div
+            v-if="
+              confirmerIdList.length === 0 && confsVisibleToIdList.length === 0
+            "
+          >
+            Nobody that you know confirmed this claim, nor do they have any
+            confirmers in their network.
+          </div>
+
+          <div
+            v-if="
+              confirmerIdList.length === 0 && confsVisibleToIdList.length > 0
+            "
+          >
+            <!-- Only show if this person has links to confirmers (below). -->
+            Nobody that you know has issued or confirmed this claim.
+          </div>
+          <div v-if="confirmerIdList.length > 0">
+            The following people have issued or confirmed this claim.
+            <ul class="ml-4">
+              <li
+                v-for="confirmerId in confirmerIdList"
+                :key="confirmerId"
+                class="list-disc ml-4"
+              >
+                <div class="flex gap-4">
+                  <div class="grow overflow-hidden">
+                    <div class="text-sm">
+                      {{ didInfo(confirmerId) }}
+                      <span v-if="!serverUtil.isEmptyOrHiddenDid(confirmerId)">
+                        <button
+                          @click="
+                            copyToClipboard(
+                              'The DID of ' + confirmerId,
+                              confirmerId,
+                            )
+                          "
+                        >
+                          <fa icon="copy" class="text-slate-400 fa-fw" />
+                        </button>
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+
+          <!--
+           Never need to show this message:
+           "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.
+           -->
+
+          <!-- Now show anyone linked to confirmers. -->
+          <div v-if="confsVisibleToIdList.length > 0">
+            The following people can connect you with people who have issued or
+            confirmed this claim.
+            <ul class="ml-4">
+              <li
+                v-for="confsVisibleTo in confsVisibleToIdList"
+                :key="confsVisibleTo"
+                class="list-disc ml-4"
+              >
+                <div class="flex gap-4">
+                  <div class="grow overflow-hidden">
+                    <div class="text-sm">
+                      {{ didInfo(confsVisibleTo) }}
+                      <span
+                        v-if="!serverUtil.isEmptyOrHiddenDid(confsVisibleTo)"
+                      >
+                        <button
+                          @click="
+                            copyToClipboard(
+                              'The DID of ' + confsVisibleTo,
+                              confsVisibleTo,
+                            )
+                          "
+                        >
+                          <fa icon="copy" class="text-slate-400 fa-fw" />
+                        </button>
+                      </span>
+                    </div>
+                  </div>
+                </div>
+              </li>
+            </ul>
+          </div>
+        </div>
+
+        <!-- explain if user cannot confirm -->
+        <!-- Note that these conditions are mirrored in userCanConfirm(). -->
+        <div v-if="confirmerIdList.includes(activeDid)">
+          You have confirmed this claim.
+        </div>
+        <div v-else-if="giveDetails.agentDid == activeDid">
+          You cannot confirm this because you issued this claim, so you already
+          count as confirming it.
+        </div>
+        <div v-else-if="serverUtil.containsHiddenDid(veriClaim.claim)">
+          You cannot confirm this because it contains hidden identifiers.
+        </div>
+      </div>
+
+      <h2
+        class="font-bold uppercase text-xl text-blue-500 mt-8 mb-2 cursor-pointer"
+        @click="showDetails = !showDetails"
+      >
+        {{ serverUtil.containsHiddenDid(veriClaim) ? "Visible " : "" }}Details
+        <span v-if="!showDetails"><fa icon="chevron-down" /></span>
+        <span v-else><fa icon="chevron-up" /></span>
+      </h2>
+      <div v-if="showDetails">
+        <div
+          v-if="
+            serverUtil.containsHiddenDid(veriClaim) &&
+            R.isEmpty(veriClaimDidsVisible)
+          "
+          class="mb-2"
+        >
+          Some of the details are not visible to you; they show as "HIDDEN".
+          They are not visible to any of your direct contacts, either.
+          <span v-if="canShare">
+            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="onClickShareClaim()" class="text-blue-500"
+              >click to send them this info</a
+            >
+            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('Location', windowLocation.href)"
+              class="text-blue-500"
+              >share this page with them</a
+            >
+            and see if they are willing to make an introduction.
+          </span>
+        </div>
+
+        <div v-if="!R.isEmpty(veriClaimDidsVisible)">
+          Some of the details are not visible to you but they are visible to
+          some of your contacts.
+          <span v-if="canShare">
+            If you'd like an introduction,
+            <a @click="onClickShareClaim()" class="text-blue-500"
+              >click to share the information with them and ask if they'll tell
+              you more about the participants.</a
+            >
+          </span>
+          <span v-else>
+            If you'd like an introduction,
+            <a
+              @click="copyToClipboard('Location', windowLocation.href)"
+              class="text-blue-500"
+              >share this page with them and ask if they'll tell you more about
+              about the participants.</a
+            >
+          </span>
+
+          <div
+            v-for="(visibleDidPath, index) of Object.keys(veriClaimDidsVisible)"
+            :key="index"
+            class="list-disc p-4"
+          >
+            <div class="text-sm">
+              <fa icon="minus" class="fa-fw" />
+              The {{ visibleDidPath }} is visible to:
+            </div>
+            <div class="ml-12 p-1">
+              <ul>
+                <li
+                  v-for="(visDid, idx2) of veriClaimDidsVisible[visibleDidPath]"
+                  :key="idx2"
+                  class="list-disc"
+                >
+                  <div class="text-sm mt-2">
+                    <span>
+                      {{ didInfo(visDid) }}
+                      <span v-if="!serverUtil.isEmptyOrHiddenDid(visDid)">
+                        <button
+                          @click="
+                            copyToClipboard('The DID of ' + visDid, visDid)
+                          "
+                        >
+                          <fa icon="copy" class="text-slate-400 fa-fw" />
+                        </button>
+                      </span>
+                      <span v-if="veriClaim.publicUrls?.[visDid]"
+                        >, found at
+                        <fa icon="globe" class="fa-fw text-slate-400" />
+                        <a
+                          :href="veriClaim.publicUrls?.[visDid]"
+                          class="text-blue-500"
+                          >{{
+                            veriClaim.publicUrls[visDid].substring(
+                              veriClaim.publicUrls[visDid].indexOf("//") + 2,
+                            )
+                          }}
+                        </a>
+                      </span>
+                    </span>
+                  </div>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <!-- Keep the dump contents directly between > and < to avoid weird spacing. -->
+        <pre
+          class="text-sm overflow-x-scroll px-4 py-3 bg-slate-100 rounded-md"
+          >{{ veriClaimDump }}</pre
+        >
+      </div>
+    </div>
+    <div v-else-if="!isLoading">This does not have details to confirm.</div>
+
+    <div class="mt-4" v-if="!isLoading">
+      <a
+        @click="showClaimPage(veriClaim.id)"
+        class="text-blue-500 cursor-pointer"
+      >
+        <fa icon="file-lines" class="pl-2" />
+        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 * as yaml from "js-yaml";
+import * as R from "ramda";
+import { Component, Vue } from "vue-facing-decorator";
+import { useClipboard } from "@vueuse/core";
+import { Router } from "vue-router";
+
+import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
+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 * as serverUtil from "@/libs/endorserServer";
+import { displayAmount } from "@/libs/endorserServer";
+import * as libsUtil from "@/libs/util";
+import { isGiveAction } from "@/libs/util";
+
+@Component({
+  methods: { displayAmount },
+  components: { QuickNav },
+})
+export default class ClaimView extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
+
+  activeDid = "";
+  allMyDids: Array<string> = [];
+  allContacts: Array<Contact> = [];
+  apiServer = "";
+
+  canShare = false;
+  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 = 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;
+  urlForNewGive = "";
+  veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
+  veriClaimDump = "";
+  veriClaimDidsVisible = {};
+  windowLocation = window.location;
+
+  R = R;
+  yaml = yaml;
+  libsUtil = libsUtil;
+  serverUtil = serverUtil;
+
+  resetThisValues() {
+    this.confirmerIdList = [];
+    this.confsVisibleErrorMessage = "";
+    this.confsVisibleToIdList = [];
+    this.giveDetails = null;
+    this.isRegistered = false;
+    this.numConfsNotVisible = 0;
+    this.urlForNewGive = "";
+    this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
+    this.veriClaimDump = "";
+  }
+
+  async mounted() {
+    this.isLoading = true;
+    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 pathParam = window.location.pathname.substring(
+      "/confirm-gift/".length,
+    );
+    let claimId;
+    if (pathParam) {
+      claimId = decodeURIComponent(pathParam);
+      await this.loadClaim(claimId, this.activeDid);
+    } else {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "No claim ID was provided.",
+        },
+        3000,
+      );
+    }
+
+    // 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
+  // (and capitalize initial letter, just in case)
+  capitalizeAndInsertSpacesBeforeCaps(text: string) {
+    return !text
+      ? ""
+      : text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
+  }
+
+  capitalizeAndInsertSpacesBeforeCapsWithAPrefix(text: string) {
+    const word = this.capitalizeAndInsertSpacesBeforeCaps(text);
+    if (word) {
+      // if the word starts with a vowel, use "an" instead of "a"
+      const firstLetter = word[0].toLowerCase();
+      const vowels = ["a", "e", "i", "o", "u"];
+      const particle = vowels.includes(firstLetter) ? "an" : "a";
+      return particle + " " + word;
+    } else {
+      return "";
+    }
+  }
+
+  totalConfirmers() {
+    return (
+      this.numConfsNotVisible +
+      this.confirmerIdList.length +
+      this.confsVisibleToIdList.length
+    );
+  }
+
+  // Isn't there a better way to make this available to the template?
+  didInfo(did: string | undefined) {
+    return serverUtil.didInfo(
+      did,
+      this.activeDid,
+      this.allMyDids,
+      this.allContacts,
+    );
+  }
+
+  async loadClaim(claimId: string, userDid: string) {
+    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 resp = await this.axios.get(url, { headers });
+      // resp.data is:
+      // - a Jwt from https://api.endorser.ch/api-docs/
+      // - with a Give from https://endorser.ch/doc/html/transactions.html#id3
+      if (resp.status === 200) {
+        this.veriClaim = resp.data;
+        this.veriClaimDump = yaml.dump(this.veriClaim);
+        this.veriClaimDidsVisible = libsUtil.findAllVisibleToDids(
+          this.veriClaim,
+          true,
+        );
+      } else {
+        // actually, axios typically throws an error so we never get here
+        console.error("Error getting claim:", resp);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "There was a problem retrieving that claim.",
+          },
+          3000,
+        );
+        return;
+      }
+
+      // retrieve more details on Give, Offer, or Plan
+      if (this.veriClaim.claimType !== "GiveAction") {
+        // no need to go further... this page is for gifts
+        return;
+      }
+
+      this.issuerName = this.didInfo(this.veriClaim.issuer);
+
+      // use give record when possible since it may include edits
+      const giveUrl =
+        this.apiServer +
+        "/api/v2/report/gives?handleId=" +
+        encodeURIComponent(this.veriClaim.handleId as string);
+      const giveHeaders = await serverUtil.getHeaders(userDid);
+      const giveResp = await this.axios.get(giveUrl, {
+        headers: giveHeaders,
+      });
+      // giveResp.data is a Give from https://api.endorser.ch/api-docs/
+      if (giveResp.status === 200) {
+        this.giveDetails = giveResp.data.data[0];
+      } else {
+        console.error("Error getting detailed give info:", giveResp);
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "Something went wrong retrieving gift data.",
+          },
+          3000,
+        );
+      }
+
+      this.urlForNewGive = "/gifted-details?";
+      if (this.giveDetails.amount) {
+        this.urlForNewGive +=
+          "&amountInput=" + encodeURIComponent(String(this.giveDetails.amount));
+      }
+      if (this.giveDetails.unit) {
+        this.urlForNewGive +=
+          "&unitCode=" + encodeURIComponent(this.giveDetails.unit);
+      }
+      if (this.giveDetails.description) {
+        this.urlForNewGive +=
+          "&description=" + encodeURIComponent(this.giveDetails.description);
+      }
+      this.giverName = this.didInfo(this.giveDetails.agentDid);
+      if (this.giveDetails.agentDid) {
+        this.urlForNewGive +=
+          "&giverDid=" +
+          encodeURIComponent(this.giveDetails.agentDid) +
+          "&giverName=" +
+          encodeURIComponent(this.giverName);
+      }
+      this.recipientName = this.didInfo(this.giveDetails.recipientDid);
+      if (this.giveDetails.recipientDid) {
+        this.urlForNewGive +=
+          "&recipientDid=" +
+          encodeURIComponent(this.giveDetails.recipientDid) +
+          "&recipientName=" +
+          encodeURIComponent(this.recipientName);
+      }
+      if (this.giveDetails.fullClaim.image) {
+        this.urlForNewGive +=
+          "&image=" + encodeURIComponent(this.giveDetails.fullClaim.image);
+      }
+      if (
+        this.giveDetails.type == "Offer" &&
+        this.giveDetails.fulfillsHandleId
+      ) {
+        this.urlForNewGive +=
+          "&offerId=" + encodeURIComponent(this.giveDetails.fulfillsHandleId);
+      }
+      if (this.giveDetails.fulfillsPlanHandleId) {
+        this.urlForNewGive +=
+          "&projectId=" +
+          encodeURIComponent(this.giveDetails.fulfillsPlanHandleId);
+      }
+
+      // retrieve the list of confirmers
+      const confirmUrl =
+        this.apiServer +
+        "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
+        encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
+      const confirmHeaders = await serverUtil.getHeaders(userDid);
+      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.giveDetails.agentDid,
+          resultList2,
+        );
+        this.confirmerIdList = resultList3;
+        this.numConfsNotVisible = resultList1.length - resultList2.length;
+        if (resultList3.length === resultList2.length) {
+          // the issuer was not in the "visible" list so they must be hidden
+          // so subtract them from the non-visible confirmers count
+          this.numConfsNotVisible = this.numConfsNotVisible - 1;
+        }
+        this.confsVisibleToIdList =
+          response.data.result.resultVisibleToDids || [];
+      } else {
+        this.confsVisibleErrorMessage =
+          "Had problems retrieving confirmations.";
+      }
+    } catch (error: unknown) {
+      const serverError = error as AxiosError;
+      console.error("Error retrieving claim:", serverError);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong retrieving claim data.",
+        },
+        3000,
+      );
+    }
+  }
+
+  confirmConfirmClaim() {
+    this.$notify(
+      {
+        group: "modal",
+        type: "confirm",
+        title: "Confirm",
+        text: "Do you personally confirm that this is true?",
+        onYes: async () => {
+          await this.confirmClaim();
+        },
+      },
+      -1,
+    );
+  }
+
+  // similar code is found in ProjectViewView
+  async confirmClaim() {
+    // similar logic is found in endorser-mobile
+    const goodClaim = serverUtil.removeSchemaContext(
+      serverUtil.removeVisibleToDids(
+        serverUtil.addLastClaimOrHandleAsIdIfMissing(
+          this.veriClaim.claim,
+          this.veriClaim.id,
+          this.veriClaim.handleId,
+        ),
+      ),
+    );
+    const confirmationClaim: serverUtil.GenericVerifiableCredential = {
+      "@context": "https://schema.org",
+      "@type": "AgreeAction",
+      object: goodClaim,
+    };
+    const result = await serverUtil.createAndSubmitClaim(
+      confirmationClaim,
+      this.activeDid,
+      this.apiServer,
+      this.axios,
+    );
+    if (result.type === "success") {
+      this.$notify(
+        {
+          group: "alert",
+          type: "success",
+          title: "Success",
+          text: "Confirmation submitted.",
+        },
+        3000,
+      );
+    } else {
+      console.error("Got error submitting the confirmation:", result);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "There was a problem submitting the confirmation. See logs for more info.",
+        },
+        5000,
+      );
+    }
+  }
+
+  showClaimPage(claimId: string) {
+    const route = {
+      path: "/claim/" + encodeURIComponent(claimId),
+    };
+    (this.$router as Router).push(route).then(async () => {
+      this.resetThisValues();
+      await this.loadClaim(claimId, this.activeDid);
+    });
+  }
+
+  copyToClipboard(name: string, text: string) {
+    useClipboard()
+      .copy(text)
+      .then(() => {
+        this.$notify(
+          {
+            group: "alert",
+            type: "toast",
+            title: "Copied",
+            text: (name || "That") + " was copied to the clipboard.",
+          },
+          2000,
+        );
+      });
+  }
+
+  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)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "info",
+          title: "Not A Give",
+          text: "This is not a giving action to confirm.",
+        },
+        3000,
+      );
+    } else if (this.confirmerIdList.includes(this.activeDid)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "info",
+          title: "Already Confirmed",
+          text: "You have already confirmed this claim.",
+        },
+        3000,
+      );
+    } else if (this.giveDetails.agentDid == this.activeDid) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "info",
+          title: "Cannot Confirm",
+          text: "You cannot confirm this because you issued this claim.",
+        },
+        3000,
+      );
+    } else if (serverUtil.containsHiddenDid(this.giveDetails.fullClaim)) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "info",
+          title: "Cannot Confirm",
+          text: "You cannot confirm this because it contains hidden identifiers.",
+        },
+        3000,
+      );
+    } else {
+      this.$notify(
+        {
+          group: "alert",
+          type: "info",
+          title: "Cannot Confirm",
+          text: "You cannot confirm this claim.",
+        },
+        3000,
+      );
+    }
+  }
+
+  onClickShareClaim() {
+    window.navigator.share({
+      title: "Help Connect Me",
+      text: "I'm trying to find the full details of this claim. Can you help me?",
+      url: this.windowLocation.href,
+    });
+  }
+}
+</script>

src/views/ContactAmountsView.vue

@@ -1,6 +1,6 @@
 <template>
   <QuickNav selected="Contacts"></QuickNav>
-  <section id="Content" class="p-6 pb-24">
+  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <h1
@@ -16,7 +16,7 @@
       </h1>
 
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
-        Given with {{ contact?.name }}
+        Transferred with {{ contact?.name }}
       </h1>
     </div>
 
@@ -25,6 +25,13 @@
       <span class="justify-around">(Only 50 most recent)</span>
       <span />
     </div>
+    <div class="flex justify-around">
+      <span />
+      <span class="justify-around">
+        (This does not include claims by them if they're not visible to you.)
+      </span>
+      <span />
+    </div>
 
     <!-- Results List -->
     <table
@@ -48,9 +55,9 @@
             {{ 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">
-                {{ record.amount }} {{ record.unit }}
+                {{ displayAmount(record.unit, record.amount) }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
                   <fa icon="circle-check" class="text-green-600 fa-fw" />
                 </span>
@@ -64,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>
@@ -72,9 +79,9 @@
             </span>
           </td>
           <td class="p-1">
-            <span v-if="record.agentDid != contact.did">
+            <span v-if="record.agentDid != contact?.did">
               <div class="font-bold">
-                {{ record.amount }} {{ record.unit }}
+                {{ displayAmount(record.unit, record.amount) }}
                 <span v-if="record.amountConfirmed" title="Confirmed">
                   <fa icon="circle-check" class="text-green-600 fa-fw" />
                 </span>
@@ -98,86 +105,59 @@
 </template>
 
 <script lang="ts">
+import { AxiosError, AxiosRequestHeaders } from "axios";
 import * as R from "ramda";
-
 import { Component, Vue } from "vue-facing-decorator";
+import { Router } from "vue-router";
+
+import QuickNav from "@/components/QuickNav.vue";
+import { NotificationIface } from "@/constants/app";
 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,
-  GiveServerRecord,
+  createEndorserJwtVcFromClaim,
+  displayAmount,
+  getHeaders,
+  GiveSummaryRecord,
   GiveVerifiableCredential,
   SCHEMA_ORG_CONTEXT,
 } from "@/libs/endorserServer";
-import * as didJwt from "did-jwt";
-import { AxiosError } from "axios";
-import QuickNav from "@/components/QuickNav.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
 
 @Component({ components: { QuickNav } })
-export default class ContactsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+export default class ContactAmountssView extends Vue {
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";
   contact: Contact | null = null;
-  giveRecords: Array<GiveServerRecord> = [];
+  giveRecords: Array<GiveSummaryRecord> = [];
   numAccounts = 0;
 
+  displayAmount = displayAmount;
+
   async beforeCreate() {
     await accountsDB.open();
     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 identity 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 {
       await db.open();
-      const contactDid = this.$route.query.contactDid as string;
+      const contactDid = (this.$route as Router).query["contactDid"] as string;
       this.contact = (await db.contacts.get(contactDid)) || null;
 
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      this.activeDid = settings?.activeDid || "";
-      this.apiServer = settings?.apiServer || "";
+      this.activeDid = (settings?.activeDid as string) || "";
+      this.apiServer = (settings?.apiServer as string) || "";
 
       if (this.activeDid && this.contact) {
         this.loadGives(this.activeDid, this.contact);
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
+      console.error("Error retrieving settings or gives.", err);
       this.$notify(
         {
           group: "alert",
@@ -185,7 +165,7 @@ export default class ContactsView extends Vue {
           title: "Error",
           text:
             err.userMessage ||
-            "There was an error retrieving the latest sweet, sweet action.",
+            "There was an error retrieving your settings or contacts or gives.",
         },
         -1,
       );
@@ -194,15 +174,14 @@ export default class ContactsView extends Vue {
 
   async loadGives(activeDid: string, contact: Contact) {
     try {
-      const identity = await this.getIdentity(this.activeDid);
-      let result: Array<GiveServerRecord> = [];
+      let result: Array<GiveSummaryRecord> = [];
       const url =
         this.apiServer +
         "/api/v2/report/gives?agentDid=" +
-        encodeURIComponent(identity.did) +
+        encodeURIComponent(this.activeDid) +
         "&recipientDid=" +
         encodeURIComponent(contact.did);
-      const headers = await this.getHeaders(identity);
+      const headers = await getHeaders(activeDid);
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
         result = resp.data.data;
@@ -228,8 +207,8 @@ export default class ContactsView extends Vue {
         "/api/v2/report/gives?agentDid=" +
         encodeURIComponent(contact.did) +
         "&recipientDid=" +
-        encodeURIComponent(identity.did);
-      const headers2 = await this.getHeaders(identity);
+        encodeURIComponent(this.activeDid);
+      const headers2 = await getHeaders(activeDid);
       const resp2 = await this.axios.get(url2, { headers: headers2 });
       if (resp2.status === 200) {
         result = R.concat(result, resp2.data.data);
@@ -250,7 +229,7 @@ export default class ContactsView extends Vue {
         );
       }
 
-      const sortedResult: Array<GiveServerRecord> = R.sort(
+      const sortedResult: Array<GiveSummaryRecord> = R.sort(
         (a, b) =>
           new Date(b.issuedAt).getTime() - new Date(a.issuedAt).getTime(),
         result,
@@ -269,7 +248,7 @@ export default class ContactsView extends Vue {
     }
   }
 
-  async confirm(record: GiveServerRecord) {
+  async confirm(record: GiveSummaryRecord) {
     // Make claim
     // I use clone here because otherwise it gets a Proxy object.
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -284,66 +263,44 @@ export default class ContactsView extends Vue {
       object: origClaim,
     };
 
-    // Make a payload for the claim
-    const vcPayload = {
-      vc: {
-        "@context": ["https://www.w3.org/2018/credentials/v1"],
-        type: ["VerifiableCredential"],
-        credentialSubject: vcClaim,
-      },
-    };
+    const vcJwt: string = await createEndorserJwtVcFromClaim(
+      this.activeDid,
+      vcClaim,
+    );
 
-    // 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,
-      });
+    // 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;
 
-      // 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;
-        }
-      } 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,
-        );
+    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());
+        }
+      } 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,
+      );
     }
   }
 

src/views/ContactGiftingView.vue

@@ -1,7 +1,7 @@
 <template>
   <QuickNav selected="Home"></QuickNav>
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24">
+  <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">
@@ -20,19 +20,19 @@
     <ul class="border-t border-slate-300">
       <li class="border-b border-slate-300 py-3">
         <h2 class="text-base flex gap-4 items-center">
-          <span class="grow italic text-slate-500"
-            ><EntityIcon
-              :entityId="null"
-              :iconSize="32"
+          <span class="grow">
+            <img
+              src="../assets/blank-square.svg"
+              width="32"
               class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-            ></EntityIcon>
-            Anonymous
+            />
+            Unnamed/Unknown
           </span>
           <span class="text-right">
             <button
               type="button"
               @click="openDialog()"
-              class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
+              class="block w-full text-center text-sm 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-3 py-1.5 rounded-md"
             >
               <fa icon="gift" class="fa-fw"></fa>
             </button>
@@ -45,19 +45,19 @@
         class="border-b border-slate-300 py-3"
       >
         <h2 class="text-base flex gap-4 items-center">
-          <span class="grow font-semibold"
-            ><EntityIcon
-              :entityId="contact.did"
+          <span class="grow font-semibold">
+            <EntityIcon
+              :contact="contact"
               :iconSize="32"
               class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-            ></EntityIcon>
+            />
             {{ contact.name || "(no name)" }}
           </span>
           <span class="text-right">
             <button
               type="button"
               @click="openDialog(contact)"
-              class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
+              class="block w-full text-center text-sm 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-3 py-1.5 rounded-md"
             >
               <fa icon="gift" class="fa-fw"></fa>
             </button>
@@ -66,75 +66,32 @@
       </li>
     </ul>
 
-    <GiftedDialog
-      ref="customDialog"
-      message="Received from"
-      showGivenToUser="true"
-    />
+    <GiftedDialog ref="customDialog" :projectId="projectId" />
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
+
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import { db, accountsDB } from "@/db/index";
-import { Account, AccountsSchema } from "@/db/tables/accounts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import { GiverInputInfo } from "@/libs/endorserServer";
-import { Contact } from "@/db/tables/contacts";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { NotificationIface } from "@/constants/app";
+import { db } from "@/db/index";
+import { Contact } from "@/db/tables/contacts";
+import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { GiverReceiverInputInfo } from "@/libs/endorserServer";
 
 @Component({
   components: { GiftedDialog, QuickNav, EntityIcon },
 })
 export default class ContactGiftingView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
+  $notify!: (notification: NotificationIface, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
-  accounts: typeof AccountsSchema;
-  numAccounts = 0;
-
-  async beforeCreate() {
-    accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
-  }
-
-  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 identity available.",
-      );
-    }
-    return identity;
-  }
-
-  public async getHeaders(identity: IIdentifier) {
-    const token = await accessToken(identity);
-    const headers = {
-      "Content-Type": "application/json",
-      Authorization: "Bearer " + token,
-    };
-    return headers;
-  }
+  projectId = localStorage.getItem("projectId") || "";
 
   async created() {
     try {
@@ -142,9 +99,19 @@ export default class ContactGiftingView extends Vue {
       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();
+
+      // .orderBy("name") wouldn't retrieve any entries with a blank name
+      // .toCollection.sortBy("name") didn't sort in an order I understood
+      const baseContacts = await db.contacts.toArray();
+      this.allContacts = baseContacts.sort((a, b) =>
+        (a.name || "").localeCompare(b.name || ""),
+      );
+
+      localStorage.removeItem("projectId");
+
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
+      console.error("Error retrieving settings & contacts:", err);
       this.$notify(
         {
           group: "alert",
@@ -152,15 +119,23 @@ export default class ContactGiftingView extends Vue {
           title: "Error",
           text:
             err.message ||
-            "There was an error retrieving the latest sweet, sweet action.",
+            "There was an error retrieving your settings or contacts.",
         },
         -1,
       );
     }
   }
 
-  openDialog(giver: GiverInputInfo) {
-    (this.$refs.customDialog as GiftedDialog).open(giver);
+  openDialog(giver?: GiverReceiverInputInfo) {
+    const recipient = this.projectId
+      ? undefined
+      : { did: this.activeDid, name: "you" };
+    (this.$refs.customDialog as GiftedDialog).open(
+      giver,
+      recipient,
+      undefined,
+      "Given by " + (giver?.name || "someone not named"),
+    );
   }
 }
 </script>

src/views/ContactImportView.vue

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