Merge branch 'master' into sw-cleanup

.gitignore

@@ -2,8 +2,6 @@
 node_modules
 /dist
 signature.bin
-# generated during `npm run build`
-sw_scripts-combined.js
 *.pem
 verified.txt
 myenv

CHANGELOG.md

@@ -5,143 +5,11 @@ All notable changes to this project will be documented in this file.
 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]
-### Changed in DB
-- ?
 
-
-## [0.2.14] - 2024.02.14
-### 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
-
+- Web push notifications
 
 ## [0.1.3] - 2023.11.08 - 910f57ec7d2e50803ae3d04f4b927e0f5219fbde
 ### Added

CONTRIBUTING.md

@@ -1,6 +0,0 @@
-# Contributing
-
-Welcome! We are happy to have your help with this project.
-
-Note that all contributions will be under our
-[license, modeled after SQLite](https://github.com/trentlarson/endorser-ch/blob/master/LICENSE).

README.md

@@ -1,14 +1,6 @@
 # TimeSafari.app - Crowd-Funder for Time - PWA
 
-[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.
-
-## 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
+## Project setup
 
 We have pkgx.dev set up in package.json, so you can use `dev` to set up the dev environment.
 
@@ -28,25 +20,18 @@ npm run lint
 
 ### Compiles and minifies for production
 
-* If there are DB changes: before updating the test server, open browser(s) with current version to test DB migrations.
+If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
 
-* `npx prettier --write ./sw_scripts/`
+```
+npm run build
+```
 
-* Update the project.task.yaml & CHANGELOG.md & the version in package.json, run `npm install`, and commit.
+```
+npx prettier --write ./sw_scripts/
+```
+to make sure the service worker scripts are in proper form
 
-* [Tag wth the new version.](https://gitea.anomalistdesign.com/trent_larson/crowd-funder-for-time-pwa/releases)
-
-... though maybe you do that after testing and release, since that isn't used in the build (and you often increment a lot during testing).
-
-* If production: change src/constants/app.ts DEFAULT_*_SERVER to be "PROD" and package.json to remove "_Test". Also record what version is on production.
-
-* `npm run build`
-
-* Get on the server and back up the time-safari folder.
-
-* `rsync -azvu -e "ssh -i ~/.ssh/..." dist ubuntutest@test.timesafari.app:time-safari`
-
-* Revert src/constants/app.ts and package.json (if that was prod), edit package.json to increment version & add "-beta", `npm install`, and commit. Tag if you didn't before. Also record what version is on production.
+... then copy the contents of the `sw_scripts` folder to the `dist` folder - except additional_scripts.js.
 
 
 
@@ -55,10 +40,17 @@ npm run lint
 ### Register new user on test server
 
 On the test server, User #0 has rights to register others, so you can start
-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).)
+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.
 
 ### Create multiple identifiers
 
@@ -70,71 +62,51 @@ Under the "Your Identity" screen, click "Advanced", click "Switch Identity / No
 
 ### Web-push
 
-For your own web-push tests, change the push server URL in Advanced settings on the account page, and install Time Safari & push server on the same domain.
+For your own web-push tests, change the 'vapid' URL in App.vue, and install apps on the same domain.
 
 ### Icons
 
 To add an icon, add to main.ts and reference with `fa` element and `icon` attribute with the hyphenated name.
 
-### Manual walk-through test
+### Manual walk-through
 
-- If there were any DB changes, check that you're on the old version and reload the page and ensure you can still act.
-- Use a mobile user as well as a desktop user.
-- Backup seed & data & get a CSV dump from Endorser Mobile.
-- 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.
+- 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.
   - On the discovery page, check that they can see projects, and set a search area to see projects nearby.
-  - On the contacts page, check that they can add User #0 even without their own ID.
-- As User #0 in another browser on the test API, add a give & a project.
-  - `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
+- 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.
-- Switch back to the generated identifier.
+- Generate an ID.
+  - On the home page, check that it now prompts them to get registered.
   - On the account page, check that they see messages on limits.
-- 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.
+- 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.
 - Walk through the functions on each page.
-- 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.
-- Switch to "no identifier" to see that things look OK without any ID.
+
+
+
+## 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.
 
 ### 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" 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.)
+* Clear cache for localhost.
+* 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).
 
-(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.
 
 
 
@@ -147,18 +119,12 @@ 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](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
+* [Many tools & libraries]() 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/)

package-lock.json

@@ -1,23 +1,19 @@
 {
-  "name": "TimeSafari_Test",
-  "version": "0.2.15-beta",
+  "name": "crowd-funder-for-time-pwa",
+  "version": "0.1.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "TimeSafari_Test",
-      "version": "0.2.15-beta",
+      "name": "crowd-funder-for-time-pwa",
+      "version": "0.1.4",
       "dependencies": {
-        "@dicebear/collection": "^5.3.5",
-        "@dicebear/core": "^5.3.5",
         "@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",
         "@pvermeer/dexie-encrypted-addon": "^3.0.0",
         "@tweenjs/tween.js": "^21.0.0",
-        "@types/js-yaml": "^4.0.9",
-        "@types/luxon": "^3.4.2",
         "@veramo/core": "^5.4.1",
         "@veramo/credential-w3c": "^5.4.1",
         "@veramo/data-store": "^5.4.1",
@@ -37,13 +33,11 @@
         "ethereum-cryptography": "^2.1.2",
         "ethereumjs-util": "^7.1.5",
         "ethr-did-resolver": "^8.1.2",
-        "git-describe": "^4.1.1",
         "jdenticon": "^3.2.0",
         "js-generate-password": "^0.1.9",
-        "js-yaml": "^4.1.0",
         "localstorage-slim": "^2.5.0",
-        "luxon": "^3.4.4",
-        "merkletreejs": "^0.3.11",
+        "luxon": "^3.4.3",
+        "merkletreejs": "^0.3.10",
         "moment": "^2.29.4",
         "notiwind": "^2.0.2",
         "papaparse": "^5.4.1",
@@ -55,8 +49,6 @@
         "reflect-metadata": "^0.1.13",
         "register-service-worker": "^1.7.2",
         "three": "^0.156.1",
-        "ua-parser-js": "^1.0.37",
-        "util": "^0.12.5",
         "vue": "^3.3.4",
         "vue-axios": "^3.5.2",
         "vue-facing-decorator": "^3.0.2",
@@ -68,7 +60,6 @@
         "@types/leaflet": "^1.9.4",
         "@types/ramda": "^0.29.3",
         "@types/three": "^0.155.1",
-        "@types/ua-parser-js": "^0.7.39",
         "@typescript-eslint/eslint-plugin": "^6.6.0",
         "@typescript-eslint/parser": "^6.6.0",
         "@vue-leaflet/vue-leaflet": "^0.10.1",
@@ -81,13 +72,13 @@
         "@vue/cli-service": "~5.0.8",
         "@vue/eslint-config-typescript": "^11.0.3",
         "autoprefixer": "^10.4.15",
-        "eslint": "^8.53.0",
+        "eslint": "^8.48.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-prettier": "^5.0.0",
         "eslint-plugin-vue": "^9.17.0",
         "leaflet": "^1.9.4",
         "postcss": "^8.4.29",
-        "prettier": "^3.1.0",
+        "prettier": "^3.0.3",
         "tailwindcss": "^3.3.3",
         "typescript": "~5.2.2"
       }
@@ -2426,358 +2417,6 @@
         "node": ">=8.9"
       }
     },
-    "node_modules/@dicebear/adventurer": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/adventurer/-/adventurer-5.3.5.tgz",
-      "integrity": "sha512-nbW5xOQ6Y/Ca4gD5bjMUCAsvRR8QswmWIGHEEq+dGOWsKMWI1xiS/ANUlaPjkEl78DeKfPFaBPUdsZCTnQHjvA==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/adventurer-neutral": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/adventurer-neutral/-/adventurer-neutral-5.3.5.tgz",
-      "integrity": "sha512-IRui1HtGNSw2THVSrArZGHKBeg9sE+QDax4VmJpFyKGxUEqbjnb0GizvNQEeKYt4uu9OGFYXqQm8uAzx+uMk8w==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/avataaars": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/avataaars/-/avataaars-5.3.5.tgz",
-      "integrity": "sha512-z9pEauaqRJGbABghFJAuhy4NSS9tHuNpmVdvSarVMn0b6fKxSxqpH6Om2lENXwEPze1EoOdvm5jPnDk3/EAFYA==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/avataaars-neutral": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/avataaars-neutral/-/avataaars-neutral-5.3.5.tgz",
-      "integrity": "sha512-AiFhb0GwR1ouDX3ooIDufnSRkjckmqiUSmmGR3sa63qNyzrhgNZDRY9l5eixXn00eOW3FW7cRu8L72+dTBXeVA==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/big-ears": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/big-ears/-/big-ears-5.3.5.tgz",
-      "integrity": "sha512-2qy6M8pToQdzDzgVXN+9g70y4QioMZRF0qM5p1a5UiSwMZl8p1sI6rTM8WYKWVsrMTaZkeLiDCvq0N84YhLmug==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/big-ears-neutral": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/big-ears-neutral/-/big-ears-neutral-5.3.5.tgz",
-      "integrity": "sha512-9xqno7IzMDGVfv8zaH0s4vcRSH//LIW6Vaee9TiJzqb7xo2fUaSJcnZdwh4HQ72sJzPfxb9wwhqRZJRyczU1KA==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/big-smile": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/big-smile/-/big-smile-5.3.5.tgz",
-      "integrity": "sha512-fXO50cB1WjCKRpv9cKhFroxwy8HzuUaM8iB2lzPYuOG3MJ838GnYGC26REXdmTgu0Xo9AGSQLh4AlpmXYzOgRg==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/bottts": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/bottts/-/bottts-5.3.5.tgz",
-      "integrity": "sha512-rk6kmCy4AGMIJ4FuA90PvQoOlejAoYqmXyCJRDfiVuzWBZZ36bMqwY/MHGNjXncsC0EMiPPqPFSKRNUXEy+X2A==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/bottts-neutral": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/bottts-neutral/-/bottts-neutral-5.3.5.tgz",
-      "integrity": "sha512-yichPU4ijqkYEsD6O9TMnmE2iOJ401/HAclpeixBFktEIEF7khUZ3Pmg08qMKPDGZMX5Syl9jm4KDAT9gDp9eg==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/collection": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/collection/-/collection-5.3.5.tgz",
-      "integrity": "sha512-zWZjvBRaAY6smU5ynqpeFFufyGCnrAIwND1v/SjW1tyDzRY4DZ34opxibQYqL4bODPFsiTsFb8M7Jejkg324Yg==",
-      "dependencies": {
-        "@dicebear/adventurer": "5.3.5",
-        "@dicebear/adventurer-neutral": "5.3.5",
-        "@dicebear/avataaars": "5.3.5",
-        "@dicebear/avataaars-neutral": "5.3.5",
-        "@dicebear/big-ears": "5.3.5",
-        "@dicebear/big-ears-neutral": "5.3.5",
-        "@dicebear/big-smile": "5.3.5",
-        "@dicebear/bottts": "5.3.5",
-        "@dicebear/bottts-neutral": "5.3.5",
-        "@dicebear/croodles": "5.3.5",
-        "@dicebear/croodles-neutral": "5.3.5",
-        "@dicebear/fun-emoji": "5.3.5",
-        "@dicebear/icons": "5.3.5",
-        "@dicebear/identicon": "5.3.5",
-        "@dicebear/initials": "5.3.5",
-        "@dicebear/lorelei": "5.3.5",
-        "@dicebear/lorelei-neutral": "5.3.5",
-        "@dicebear/micah": "5.3.5",
-        "@dicebear/miniavs": "5.3.5",
-        "@dicebear/open-peeps": "5.3.5",
-        "@dicebear/personas": "5.3.5",
-        "@dicebear/pixel-art": "5.3.5",
-        "@dicebear/pixel-art-neutral": "5.3.5",
-        "@dicebear/shapes": "5.3.5",
-        "@dicebear/thumbs": "5.3.5"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/converter": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/converter/-/converter-5.3.5.tgz",
-      "integrity": "sha512-o/HEBQ4Jr8wTqpGYeQ7T9tmQjOiwVsi6PFwxIW8+99WL1RYfWNFZdrqtDs0CdfRt+C5xcD1lVVOp7AfNfZYWnA==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.7",
-        "tmp-promise": "^3.0.3"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@resvg/resvg-js": "^2.0.0",
-        "exiftool-vendored": "^16 || ^17 || ^18 || ^19 || ^20 || ^21",
-        "sharp": "^0.32.6"
-      },
-      "peerDependenciesMeta": {
-        "@resvg/resvg-js": {
-          "optional": true
-        },
-        "exiftool-vendored": {
-          "optional": true
-        },
-        "sharp": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@dicebear/core": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/core/-/core-5.3.5.tgz",
-      "integrity": "sha512-kQPH3LGFUwqkfetUvfNZyY8l7RgomESPTkVjxpQS0n2i6KzjFe7fpDGedVAkZwGOqOHSSaq5doENCTV1uDSC8Q==",
-      "dependencies": {
-        "@dicebear/converter": "5.3.5"
-      },
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      }
-    },
-    "node_modules/@dicebear/croodles": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/croodles/-/croodles-5.3.5.tgz",
-      "integrity": "sha512-TywdSL8ztt9rdIypMFDdBVEVHzaKL4044PPQtkrOH/elWkOrP+tvoccxGSouembRHeOHqCYXTafwItf6UMD6+Q==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/croodles-neutral": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/croodles-neutral/-/croodles-neutral-5.3.5.tgz",
-      "integrity": "sha512-l2Pw6k5UVajUZJOCy/0VTTUIhJcF+JVVwTy0XTKki3VCEeObhT8TAL67uRPFUZe6Xc8rC+DBBRXolglW4HrQ+g==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/fun-emoji": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/fun-emoji/-/fun-emoji-5.3.5.tgz",
-      "integrity": "sha512-20hVdZPWAT+Bw/SJeeApMuhd5N8wNkeMMdd2jZaQG9/cd4F4NtWfXZcGRNoiz76SvrgTr1fFxi13mKu6osNPZA==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/icons": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/icons/-/icons-5.3.5.tgz",
-      "integrity": "sha512-tFHQOnnWzQSsSeNro2Ld3Mo7a+ngl03nY4YWwbpg/sn48L7n1YdDkFRrQofl9Wv8jqCsqEOv+SL9y81e7eDBBg==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/identicon": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/identicon/-/identicon-5.3.5.tgz",
-      "integrity": "sha512-MMSwOsKVp9Y72P7Sv1Wr3cj05nmlHnCFLiWgxVmXBHWzbx2qIb5WjAeACoU6d6XF1NJo1M4ICJ9VP+V8vq+tOg==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/initials": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/initials/-/initials-5.3.5.tgz",
-      "integrity": "sha512-SJv1pAzhQy15CzJqafxGtEbhxhWtE2/ai3udpHFYVBGZk3l3By7iau1AyDdB0GjZkg8XyE98ThH+3625OBKzpQ==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/lorelei": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/lorelei/-/lorelei-5.3.5.tgz",
-      "integrity": "sha512-wApyFlSrA7FIcHC9MSFEumtCKFhXXWLnmDmNUW7gSmrUkleNDmbZxImBKIXCyl7KIN7Ckos13oPB4lag5r5DeA==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/lorelei-neutral": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/lorelei-neutral/-/lorelei-neutral-5.3.5.tgz",
-      "integrity": "sha512-IE8RhLBVWSGEswm57ciAZ5YKcwo4rm3KIjdXevEiyYEm6BTPA2dzSB1JDGsqXGTpBe6kt9GRd5CibuBfD96p0w==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/micah": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/micah/-/micah-5.3.5.tgz",
-      "integrity": "sha512-cfEyFYrAPcmsZs2UoGuy9cEuwRgBBjV8TBxB+RQ/nS0ENeQ5pZ4qsgWQbFJUqtHfm2CAvMkkuQ2DfLo29SmPjg==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/miniavs": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/miniavs/-/miniavs-5.3.5.tgz",
-      "integrity": "sha512-Uj8YSA0RY1jxJ0Ki6Yq4ERUeIsuFazKQbqfpAZLJBiUELq7WnASyaPqDjmAz5l2+dbVhpHSsQIzkLeejT6a/0Q==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/open-peeps": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/open-peeps/-/open-peeps-5.3.5.tgz",
-      "integrity": "sha512-Od/c2hjK+VJWb4PXS9G3ln50Kjl30o8Ns3+mhkoEgsKf82Dbiyp2JtKzZoizZxAqcPK93R+qrjDYumq22S9f4w==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/personas": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/personas/-/personas-5.3.5.tgz",
-      "integrity": "sha512-auLmS+y3Bhok+SkwLCDgTF0lglDaiNv6BrQpYS0/jvUMXRmFlqmOiA+dESP5Qa1jzdjrl+D9fxlRoS24qasIyg==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/pixel-art": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/pixel-art/-/pixel-art-5.3.5.tgz",
-      "integrity": "sha512-9i8przKdtzipYa4Bf2dHYgPIogcHEhctAKxi6BBOzcZKbzXjYc6An3E2E1JLNcDeGGbAE4XKt8INvMOYCHxv9A==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/pixel-art-neutral": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/pixel-art-neutral/-/pixel-art-neutral-5.3.5.tgz",
-      "integrity": "sha512-aBtEaJeEa/YOy5aTTXmH2S/9Q8bcjIWEsXNN0MMoksISJyfrqcZj1Nm1/NeSvXvNWkTWj0kVFi2TOMr804Hj3Q==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/shapes": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/shapes/-/shapes-5.3.5.tgz",
-      "integrity": "sha512-aGN+p0D1Xuwg+OwoTHAqLMYLIZRZe0YpcIH8FwfgEFK/4Yo+NqqAebmnRwh3yHejCknURteq853YhDhIbvJMaw==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
-    "node_modules/@dicebear/thumbs": {
-      "version": "5.3.5",
-      "resolved": "https://registry.npmjs.org/@dicebear/thumbs/-/thumbs-5.3.5.tgz",
-      "integrity": "sha512-uSsTOCZKiUWYpQG/jNTYTtF/h1vzPFrvtq2gUbhec4mKgdCMCsOnk0JMYUKte03Oly/a2XrtJjPL7/TlxqCXXA==",
-      "engines": {
-        "node": "^14.13.1 || >=16.0.0"
-      },
-      "peerDependencies": {
-        "@dicebear/core": "^5.0.0"
-      }
-    },
     "node_modules/@digitalbazaar/bitstring": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@digitalbazaar/bitstring/-/bitstring-3.1.0.tgz",
@@ -3182,9 +2821,9 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-      "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.2.tgz",
+      "integrity": "sha512-+wvgpDsrB1YqAMdEUCcnTlpfVBH7Vqn6A/NT3D8WVXFIaKMlErPIZT3oCIAVCOtarRpMtelZLqJeU3t7WY6X6g==",
       "dev": true,
       "dependencies": {
         "ajv": "^6.12.4",
@@ -3232,9 +2871,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz",
-      "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
+      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -5859,12 +5498,12 @@
       }
     },
     "node_modules/@humanwhocodes/config-array": {
-      "version": "0.11.13",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz",
-      "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==",
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.11.tgz",
+      "integrity": "sha512-N2brEuAadi0CcdeMXUkhbZB84eskAc8MEX1By6qEchoVywSgXPIjou4rYsl0V3Hj0ZnuGycGCjdNgockbzeWNA==",
       "dev": true,
       "dependencies": {
-        "@humanwhocodes/object-schema": "^2.0.1",
+        "@humanwhocodes/object-schema": "^1.2.1",
         "debug": "^4.1.1",
         "minimatch": "^3.0.5"
       },
@@ -5886,9 +5525,9 @@
       }
     },
     "node_modules/@humanwhocodes/object-schema": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz",
-      "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==",
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz",
+      "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==",
       "dev": true
     },
     "node_modules/@jest/create-cache-key-function": {
@@ -9152,15 +8791,11 @@
         "@types/istanbul-lib-report": "*"
       }
     },
-    "node_modules/@types/js-yaml": {
-      "version": "4.0.9",
-      "resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
-      "integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg=="
-    },
     "node_modules/@types/json-schema": {
       "version": "7.0.13",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.13.tgz",
-      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ=="
+      "integrity": "sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==",
+      "dev": true
     },
     "node_modules/@types/leaflet": {
       "version": "1.9.6",
@@ -9171,11 +8806,6 @@
         "@types/geojson": "*"
       }
     },
-    "node_modules/@types/luxon": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
-      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA=="
-    },
     "node_modules/@types/mime": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.3.tgz",
@@ -9189,11 +8819,11 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "20.10.4",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.10.4.tgz",
-      "integrity": "sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==",
+      "version": "20.8.6",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.8.6.tgz",
+      "integrity": "sha512-eWO4K2Ji70QzKUqRy6oyJWUeB7+g2cRagT3T/nxYibYcT4y2BDL8lqolRXjTHmkZCdJfIPaY73KbJAZmcryxTQ==",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~5.25.1"
       }
     },
     "node_modules/@types/normalize-package-data": {
@@ -9263,7 +8893,8 @@
     "node_modules/@types/semver": {
       "version": "7.5.3",
       "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.3.tgz",
-      "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw=="
+      "integrity": "sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==",
+      "dev": true
     },
     "node_modules/@types/send": {
       "version": "0.17.2",
@@ -9343,12 +8974,6 @@
       "integrity": "sha512-IDaobHimLQhjwsQ/NMwRVfa/yL7L/wriQPMhw1ZJall0KX6E1oxk29XMDeilW5qTIg5aoiqf5Udy8U/51aNoQQ==",
       "dev": true
     },
-    "node_modules/@types/ua-parser-js": {
-      "version": "0.7.39",
-      "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz",
-      "integrity": "sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==",
-      "dev": true
-    },
     "node_modules/@types/web-bluetooth": {
       "version": "0.0.18",
       "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.18.tgz",
@@ -9581,12 +9206,6 @@
         "url": "https://opencollective.com/typescript-eslint"
       }
     },
-    "node_modules/@ungap/structured-clone": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz",
-      "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==",
-      "dev": true
-    },
     "node_modules/@unimodules/core": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/@unimodules/core/-/core-7.1.2.tgz",
@@ -10812,9 +10431,9 @@
     },
     "node_modules/@vue/vue-loader-v15": {
       "name": "vue-loader",
-      "version": "15.11.1",
-      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
-      "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
+      "version": "15.10.2",
+      "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.10.2.tgz",
+      "integrity": "sha512-ndeSe/8KQc/nlA7TJ+OBhv2qalmj1s+uBs7yHDRFaAXscFTApBzY9F1jES3bautmgWjDlDct0fw8rPuySDLwxw==",
       "dev": true,
       "dependencies": {
         "@vue/component-compiler-utils": "^3.1.0",
@@ -11435,7 +11054,8 @@
     "node_modules/argparse": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
-      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
+      "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
+      "devOptional": true
     },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.0",
@@ -11625,6 +11245,7 @@
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.5.tgz",
       "integrity": "sha512-DMD0KiN46eipeziST1LPP/STfDU0sufISXmjSgvVsoU2tqxctQeASejWcfNtxYKqETM1UxQ8sp2OrSBWpHY6sw==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -11633,11 +11254,11 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.6.5",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.5.tgz",
-      "integrity": "sha512-Ii012v05KEVuUoFWmMW/UQv9aRIc3ZwkWDcM+h5Il8izZCtRVpDUfwpoFf7eOtajT3QiGR4yDUx7lPqHJULgbg==",
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.5.1.tgz",
+      "integrity": "sha512-Q28iYCWzNHjAm+yEAot5QaAMxhMghWLFVf7rRdwhUI+c2jix2DUXjAHXVi+s1ibs3mjPO/cCgbA++3BjD0vP/A==",
       "dependencies": {
-        "follow-redirects": "^1.15.4",
+        "follow-redirects": "^1.15.0",
         "form-data": "^4.0.0",
         "proxy-from-env": "^1.1.0"
       }
@@ -12184,6 +11805,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "devOptional": true,
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -12441,6 +12063,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
       "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+      "devOptional": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "get-intrinsic": "^1.0.2"
@@ -13015,7 +12638,8 @@
     "node_modules/concat-map": {
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "devOptional": true
     },
     "node_modules/connect": {
       "version": "3.7.0",
@@ -13311,9 +12935,9 @@
       }
     },
     "node_modules/crypto-js": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-4.2.0.tgz",
-      "integrity": "sha512-KALDyEYgpY+Rlob/iriUtjV6d5Eq+Y191A5g4UqLAi8CyGP9N1+FdVbkc1SxKc2r4YAYqG8JzO2KGL+AizD70Q=="
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/crypto-js/-/crypto-js-3.3.0.tgz",
+      "integrity": "sha512-DIT51nX0dCfKltpRiXV+/TVZq+Qq2NgF4644+K7Ttnla7zEzqc+kjJyiB96BHNyUTBxyjzRcZYpUdZa+QAqi6Q=="
     },
     "node_modules/crypto-ld": {
       "version": "7.0.0",
@@ -14596,19 +14220,18 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.55.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz",
-      "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
+      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
-        "@eslint/eslintrc": "^2.1.4",
-        "@eslint/js": "8.55.0",
-        "@humanwhocodes/config-array": "^0.11.13",
+        "@eslint/eslintrc": "^2.1.2",
+        "@eslint/js": "8.51.0",
+        "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
-        "@ungap/structured-clone": "^1.2.0",
         "ajv": "^6.12.4",
         "chalk": "^4.0.0",
         "cross-spawn": "^7.0.2",
@@ -16239,9 +15862,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.15.4",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.4.tgz",
-      "integrity": "sha512-Cr4D/5wlrb0z9dgERpUL3LrmPKVDsETIJhaCMeDfuFYcqa5bldGV6wBsAN6X/vxlXQtFBMrXdXxdL8CbDTGniw==",
+      "version": "1.15.3",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz",
+      "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
       "funding": [
         {
           "type": "individual",
@@ -16268,6 +15891,7 @@
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.3.tgz",
       "integrity": "sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==",
+      "dev": true,
       "dependencies": {
         "is-callable": "^1.1.3"
       }
@@ -16527,6 +16151,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "devOptional": true,
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -16579,6 +16204,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.1.tgz",
       "integrity": "sha512-2DcsyfABl+gVHEfCOaTrWgyt+tb6MSEGmKq+kI5HwLbIYgjgmMcV8KQ41uaKz1xxUcn9tJtgFbQUEVcEbd0FYw==",
+      "devOptional": true,
       "dependencies": {
         "function-bind": "^1.1.1",
         "has": "^1.0.3",
@@ -16643,34 +16269,11 @@
         "node": ">=6"
       }
     },
-    "node_modules/git-describe": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/git-describe/-/git-describe-4.1.1.tgz",
-      "integrity": "sha512-JC8ganO5kO80G8+XE98TDDjnMXQN3Estk3qdJuG2EGRF/l6zuMTMcN+8OSfQZ5FWpqIRLB015anWX4aSRgnxAQ==",
-      "dependencies": {
-        "@types/semver": "^7.3.8",
-        "lodash": "^4.17.21"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      },
-      "optionalDependencies": {
-        "semver": "^5.6.0"
-      }
-    },
-    "node_modules/git-describe/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "optional": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/glob": {
       "version": "7.2.3",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
       "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "devOptional": true,
       "dependencies": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -16752,6 +16355,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz",
       "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==",
+      "dev": true,
       "dependencies": {
         "get-intrinsic": "^1.1.3"
       },
@@ -16822,6 +16426,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/has/-/has-1.0.4.tgz",
       "integrity": "sha512-qdSAmqLF6209RFj4VVItywPMbm3vWylknmB3nvNiUIs72xAimcM8nVYxYr7ncvZq5qzk9MKIZR8ijqD/1QuYjQ==",
+      "devOptional": true,
       "engines": {
         "node": ">= 0.4.0"
       }
@@ -16860,6 +16465,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.1.tgz",
       "integrity": "sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==",
+      "devOptional": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -16871,6 +16477,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
       "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+      "devOptional": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -16882,6 +16489,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
       "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
+      "dev": true,
       "dependencies": {
         "has-symbols": "^1.0.2"
       },
@@ -17473,21 +17081,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-      "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-      "dependencies": {
-        "call-bind": "^1.0.2",
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-array-buffer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.2.tgz",
@@ -17559,6 +17152,7 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -17663,20 +17257,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/is-generator-function": {
-      "version": "1.0.10",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz",
-      "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==",
-      "dependencies": {
-        "has-tostringtag": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-glob": {
       "version": "4.0.3",
       "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
@@ -17950,6 +17530,7 @@
       "version": "1.1.12",
       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.12.tgz",
       "integrity": "sha512-Z14TF2JNG8Lss5/HMqt0//T9JeHXttXy5pH/DBU4vi98ozO2btxzq9MwYDZYnKwU8nRsz/+GVFVRDq3DkVuSPg==",
+      "dev": true,
       "dependencies": {
         "which-typed-array": "^1.1.11"
       },
@@ -18980,6 +18561,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
+      "devOptional": true,
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -19731,7 +19313,8 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "devOptional": true
     },
     "node_modules/lodash.clonedeep": {
       "version": "4.5.0",
@@ -20257,9 +19840,9 @@
       }
     },
     "node_modules/luxon": {
-      "version": "3.4.4",
-      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.4.tgz",
-      "integrity": "sha512-zobTr7akeGHnv7eBOXcRgMeCP6+uyYsczwmeRCauvpvaAltgNyTbLH/+VaEAPUeWBT+1GuNmz4wC/6jtQzbbVA==",
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.4.3.tgz",
+      "integrity": "sha512-tFWBiv3h7z+T/tDaoxA8rqTxy1CHV6gHS//QdaH4pulbq/JuBSGgQspQQqcgnwdAx6pNI7cmvz5Sv/addzHmUg==",
       "engines": {
         "node": ">=12"
       }
@@ -20426,13 +20009,13 @@
       }
     },
     "node_modules/merkletreejs": {
-      "version": "0.3.11",
-      "resolved": "https://registry.npmjs.org/merkletreejs/-/merkletreejs-0.3.11.tgz",
-      "integrity": "sha512-LJKTl4iVNTndhL+3Uz/tfkjD0klIWsHlUzgtuNnNrsf7bAlXR30m+xYB7lHr5Z/l6e/yAIsr26Dabx6Buo4VGQ==",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/merkletreejs/-/merkletreejs-0.3.10.tgz",
+      "integrity": "sha512-lin42tKfRdkW+6iE5pjtQ9BnH+1Hk3sJ5Fn9hUUSjcXRcJbSISHgPCfYvMNEXiNqZPhz/TyRPEV30qgnujsQ7A==",
       "dependencies": {
         "bignumber.js": "^9.0.1",
         "buffer-reverse": "^1.0.1",
-        "crypto-js": "^4.2.0",
+        "crypto-js": "^3.1.9-1",
         "treeify": "^1.1.0",
         "web3-utils": "^1.3.4"
       },
@@ -21500,6 +21083,7 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "devOptional": true,
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -22541,6 +22125,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
       "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "devOptional": true,
       "engines": {
         "node": ">=0.10.0"
       }
@@ -23552,9 +23137,9 @@
       }
     },
     "node_modules/prettier": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.1.0.tgz",
-      "integrity": "sha512-TQLvXjq5IAibjh8EpBIkNKxO749UEWABoiIZehEPiY4GNpVdhaFKqSTu+QrlU6D2dPAfubRmtJTi4K4YkQ5eXw==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.0.3.tgz",
+      "integrity": "sha512-L/4pUDMxcNa8R/EthV08Zt42WBO4h1rarVtK0K+QJG0X187OLo7l699jWw0GKuwzkPQ//jMFA/8Xm6Fh3J/DAg==",
       "dev": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -24765,6 +24350,7 @@
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
       "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "devOptional": true,
       "dependencies": {
         "glob": "^7.1.3"
       },
@@ -26572,25 +26158,6 @@
         "node": ">=0.6.0"
       }
     },
-    "node_modules/tmp-promise": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/tmp-promise/-/tmp-promise-3.0.3.tgz",
-      "integrity": "sha512-RwM7MoPojPxsOBYnyd2hy0bxtIlVrihNs9pj5SUvY8Zz1sQcQG2tG1hSr8PDxfgEB8RNKDhqbIlroIarSNDNsQ==",
-      "dependencies": {
-        "tmp": "^0.2.0"
-      }
-    },
-    "node_modules/tmp-promise/node_modules/tmp": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz",
-      "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==",
-      "dependencies": {
-        "rimraf": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
     "node_modules/tmpl": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
@@ -27219,9 +26786,9 @@
       }
     },
     "node_modules/ua-parser-js": {
-      "version": "1.0.37",
-      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.37.tgz",
-      "integrity": "sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==",
+      "version": "1.0.36",
+      "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.36.tgz",
+      "integrity": "sha512-znuyCIXzl8ciS3+y3fHJI/2OhQIXbXw9MWC/o3qwyR+RGppjZHrM27CGFSKCJXi2Kctiz537iOu2KnXs1lMQhw==",
       "funding": [
         {
           "type": "opencollective",
@@ -27236,6 +26803,8 @@
           "url": "https://github.com/sponsors/faisalman"
         }
       ],
+      "optional": true,
+      "peer": true,
       "engines": {
         "node": "*"
       }
@@ -27301,9 +26870,9 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA=="
+      "version": "5.25.3",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.25.3.tgz",
+      "integrity": "sha512-Ga1jfYwRn7+cP9v8auvEXN1rX3sWqlayd4HP7OKk4mZWylEmu3KzXDUGrQUN6Ol7qo1gPvB2e5gX6udnyEPgdA=="
     },
     "node_modules/unicode-canonical-property-names-ecmascript": {
       "version": "2.0.0",
@@ -27486,18 +27055,6 @@
       "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
       "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="
     },
-    "node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -28409,6 +27966,7 @@
       "version": "1.1.11",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.11.tgz",
       "integrity": "sha512-qe9UWWpkeG5yzZ0tNYxDmd7vo58HDBc39mZ0xWWpolAGADdFOzkfamWLDxkOWcvHQKVmdTyQdLD4NOfjLWTKew==",
+      "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.5",
         "call-bind": "^1.0.2",

package.json

@@ -1,6 +1,6 @@
 {
-  "name": "TimeSafari_Test",
-  "version": "0.2.15-beta",
+  "name": "crowd-funder-for-time-pwa",
+  "version": "0.1.4",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
@@ -8,16 +8,12 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@dicebear/collection": "^5.3.5",
-    "@dicebear/core": "^5.3.5",
     "@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",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
     "@tweenjs/tween.js": "^21.0.0",
-    "@types/js-yaml": "^4.0.9",
-    "@types/luxon": "^3.4.2",
     "@veramo/core": "^5.4.1",
     "@veramo/credential-w3c": "^5.4.1",
     "@veramo/data-store": "^5.4.1",
@@ -37,13 +33,11 @@
     "ethereum-cryptography": "^2.1.2",
     "ethereumjs-util": "^7.1.5",
     "ethr-did-resolver": "^8.1.2",
-    "git-describe": "^4.1.1",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
-    "js-yaml": "^4.1.0",
     "localstorage-slim": "^2.5.0",
-    "luxon": "^3.4.4",
-    "merkletreejs": "^0.3.11",
+    "luxon": "^3.4.3",
+    "merkletreejs": "^0.3.10",
     "moment": "^2.29.4",
     "notiwind": "^2.0.2",
     "papaparse": "^5.4.1",
@@ -55,8 +49,6 @@
     "reflect-metadata": "^0.1.13",
     "register-service-worker": "^1.7.2",
     "three": "^0.156.1",
-    "ua-parser-js": "^1.0.37",
-    "util": "^0.12.5",
     "vue": "^3.3.4",
     "vue-axios": "^3.5.2",
     "vue-facing-decorator": "^3.0.2",
@@ -68,7 +60,6 @@
     "@types/leaflet": "^1.9.4",
     "@types/ramda": "^0.29.3",
     "@types/three": "^0.155.1",
-    "@types/ua-parser-js": "^0.7.39",
     "@typescript-eslint/eslint-plugin": "^6.6.0",
     "@typescript-eslint/parser": "^6.6.0",
     "@vue-leaflet/vue-leaflet": "^0.10.1",

project.task.yaml

@@ -1,107 +1,59 @@
 
-tasks :
+tasks:
 
-- .2 fix give dialog from "more contacts" off home page to allow giving to this user
-- .2 fix bottom of project selection map, where the icons are hidden but a tap goes to the icon's page
-- .5 stop from seeing an error on the first page when browser doesn't support service workers (which I've seen on iPhone; visible in Firefox private window)
-- .2 don't show a warning on a totally new project when the authorized agent is set
-- .2 anchor hash into BTC
-- .2 list the "show more" contacts alphabetically
+- 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
 
-- 32 image on give :
-    - Show a camera to take a picture
-    - Scale the image to a reasonable size
-    - Upload to a public readable place
-    - check the rate limits
-    - use CID (hash?)
-    - put the image URL in the claim
-    - Rates - images erased?
-    - image not associated with JWT ULID since that's assigned later
+- .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
 
-- 24 compelling UI for credential presentations
-  - discover who in my network has activity on a project
+- .5 Add infinite scroll to gifts on the home page
 
-- 24 compelling UI for statistics (eg. World?)
-
-- 01 in the feed, group by project or contact or topic or time/$ (via BC)
-- 01 separate not-on-platform vs totally anonymous; terminology "unidentified"?
-- .2 add links between projects
-- 24 make the contact browsing on the front page something that invites more action
-
-- .5 change server plan & project endpoints to use jwtId as identifier rather than rowid
-- 16 edit offers & gives, or revoke allowing re-creation
-- .1 When available in the server, give message for 'nonAmountGiven' on offers on ProjectsView page.
-- .1 Add help instructions for "Encryption key has changed" error. (It is a problem if localStorage is cleared, but the contacts & settings remain and they have to restore their seeds.)
-- .1 show better error when user with no ID goes to the "My Project" page
-- 01 in front page prompt for ideas for gratitude :
-  - randomize (not show in order)
-  - checkboxes - show non-person-oriented messages, show only contacts, show only projects
-
-- 08 allow user to add a time when they want their daily notification
-
-- .5 prompt for the name directly when they visit the QR scan page
-- 01 mark a project as inactive
-- 01 add share button for sending a message to confirmers when we can't see the claim (like the "visible" links)
-- .5 add TimeSafari as a shareable app https://developer.mozilla.org/en-US/docs/Web/Manifest/share_target
-- .5 choose a project's alternative agent ("authorized representative") via a contact chooser (not just copy-paste a DID)
-- .5 find out why clicking quickly back-and-forth onto the "my project" page often shows error "You need an identifier to load your projects." (easier to reproduce on desktop?)
-- .5 bug - it didn't show the "fulfills offer" on the claim detail page for a give that had one - https://test.timesafari.app/claim/01HMFWRPA3PD6Q9EYFKX3MC41J
-- 01 replace all "confirm" prompts with nicer modal
-- .1 hide project-create button on project page if not registered
-- .1 hide offer & give buttons on project list page if not registered
-- .1 add cursor-pointer on the icons for giving on the project page, and on the list of projects on the discover page
-- .2 record when InfiniteScroll hits the end of the list and don't trigger any more loads
-
-- bug - turning notifications on from the help screen did not stay, though account screen toggle did stay (From Jason on iPhone.)
-- refactor - supply the projectId to the OfferDialog just like we do with the GiftedDialog offerId (in the "open" method, maybe as well as an attribute)
-- the confirm button on each give on the ProjectViewView page doesn't have all the context of the ClaimView page, so it can show sometimes inappropriately; consider consolidation
-- make the "give" on contact screen work like other give (allowing donation vs current blank)
-- .2 on ClaimView, the "ask someone" should refer to "visible" IDs, or to confirmations only if confirmations are visible
-- message "send them to this page" on ClaimView should be a link (for installed app)
-- When we update a version, desktop browser users have seen nothing happen after clicking on the contact page QR and on the account page "Help"; errors show in the console. Reload fixed it. If this happens on mobile, ask the user to reload.
-
-- 01 show my VCs - most interesting, or via search
-- 04 allow user to download & prove chains of VCs, mine + ones I can see about me from others
-
-- show feed of offers, new projects, etc -- maybe limited to my search area
-
-- revenue to support server operation
-
-- copy button for seed
 - .5 If notifications are not enabled, add message to front page with link/button to enable
-- make server endpoint for full English description of limits
-- create a help-desk document & add screenshots
 
-- .1 update "offer" units to have same functionality as "give" units
-- 01 on home page, prompt for install check in addition to "supports notifications" check (since they won't get notified if Chrome is closed)
-- 01 on Mac (& Windows?) desktop, add a help blurb so that they can find it again (since it doesn't show in Application list)
-- bug (that is hard to reproduce) - got error adding on Firefox user #0 as contact for themselves
-- bug (that is hard to reproduce) - in Chrome, install app then delete app and try from Chrome browser and see log errors "Uncaught TypeError: self.appendDailyLog is not a function"
-- bug (that is hard to reproduce) - on the second 'give' recorded on prod it showed me as the agent
-- 04 remove 'rowid' references (that are sqlite-specific); may involve server
-- 04 look at other examples for better onboarding UI, eg friend.tech
-- .5 Add inactive flag / end date, start date to project
+- show VC details... somehow:
+  - .5 make a VC details page, or link to endorser.ch (including confirmations)
+  - 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.
+  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)
-- warn if they're using the web (android only?)
-  https://developer.mozilla.org/en-US/docs/Web/API/Navigator/getInstalledRelatedApps
-  https://web.dev/articles/get-installed-related-apps
-- .5 fix the "onboarding help" list of instructions so that it always formats right (currently doesn't show numbers aligned on Google Pixel 6a, iPhone 11 Pro, iPhone 12 mini)
-- .5 make the "onboarding help" it so that it doesn't cover the QR icon on the contacts page
-- .5 fix masked icon (because some of the top-right of the binoculars is cut off)
-
 - 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
@@ -117,10 +69,6 @@ tasks :
 - 24 Move to Vite
 - 32 accept images for projects
 - 32 accept images for contacts
-- import project interactions from GitHub/GitLab and manage signing
-
-- show total time offered to & fulfilled to a project
-- show total time offered by & fulfilled by a contact
 
 - linking between projects or plans :
   - show total time given to & from a project
@@ -128,6 +76,7 @@ tasks :
     - 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
 
@@ -139,26 +88,27 @@ tasks :
   - badge for amount given/offered to your project
   - set a goal of given/offers
 
-- automated tests, eg. pup-test or cypress
+- automated tests, eg. cypress
 
 - Notifications (wake on the phone, push notifications)
-  - 02 change push server so that the web-push/subscribe call sets up a thread for the 10-seconds-later push notification, but returns immediately to the callee
-  - pull instead of push, maybe via scheduled runs
-  - have a notification pop-up on Mac screen
 
-- 16 Connect with phone contacts - this may be a whole different app, because we want a quick link A) to the same phone contact and B) from the phone contact app
+- 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.
 
-- allow some gives even if they aren't registered - maybe someday as a gift to the world, but we really want this to be built via personal connections -- and that allows spam
-- .1 When Chrome shows compatibility https://developer.mozilla.org/en-US/docs/Web/API/Web_Share_API#api.navigator.canshare
-  then change the canShare check in this app to check the real canShare() method.
-
-log :
+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

src/App.vue

@@ -156,17 +156,11 @@
               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 v-if="serviceWorkerReady" class="text-lg mb-4">
+                <p class="text-lg mb-4">
                   Would you like to <b>turn on</b> notifications for this app?
                 </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
-                  v-if="serviceWorkerReady"
                   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);
@@ -175,13 +169,20 @@
                 >
                   Turn on Notifications
                 </button>
-
-                <button
-                  @click="close(notification.id)"
-                  class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
-                >
-                  Maybe Later
-                </button>
+                <div class="grid grid-cols-2 gap-2">
+                  <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"
+                  >
+                    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
+                  </button>
+                </div>
               </div>
             </div>
           </div>
@@ -237,10 +238,6 @@
                 </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
@@ -288,23 +285,28 @@ interface VapidResponse {
   };
 }
 
-import { DEFAULT_PUSH_SERVER, NotificationIface } from "@/constants/app";
+import { AppString } from "@/constants/app";
 import { db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { sendTestThroughPushServer } from "@/libs/util";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component
 export default class App extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   b64 = "";
-  serviceWorkerReady = false;
 
   async mounted() {
     try {
       await db.open();
       const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      let pushUrl = DEFAULT_PUSH_SERVER;
+      let pushUrl: string = AppString.DEFAULT_PUSH_SERVER;
       if (settings?.webPushServer) {
         pushUrl = settings.webPushServer;
       }
@@ -330,25 +332,17 @@ export default class App extends Vue {
         );
       }
     } 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: "Got an error setting notifications.",
-          },
-          -1,
-        );
-      }
+      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(
@@ -376,7 +370,6 @@ 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.");
     }
@@ -417,17 +410,14 @@ export default class App extends Vue {
   private requestNotificationPermission(): Promise<NotificationPermission> {
     return Notification.requestPermission().then((permission) => {
       if (permission !== "granted") {
-        alert(
-          "Allow this app permission to make notifications for personal reminders." +
-            " You can adjust them at any time in your settings.",
-        );
+        alert("We need notification permission to provide certain features.");
         throw new Error("We weren't granted permission.");
       }
       return permission;
     });
   }
 
-  public async turnOnNotifications() {
+  async turnOnNotifications() {
     return this.askPermission()
       .then((permission) => {
         console.log("Permission granted:", permission);
@@ -436,62 +426,36 @@ 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(async (subscription) => {
+          .then((subscription) => {
             if (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,
-              );
-              this.sendSubscriptionToServer(subscription);
-              return subscription;
+              return this.sendSubscriptionToServer(subscription);
             } else {
               throw new Error("Subscription object is not available.");
             }
           })
-          .then(async (subscription) => {
-            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,
-            );
+          .then(() => {
+            console.log("Subscription data sent to server.");
           })
           .catch((error) => {
             console.error(
               "Subscription or server communication failed:",
               error,
             );
-            alert(
-              "Subscription or server communication failed. Try again in a while.",
-            );
+            alert( "Subscription or server communication failed. Try again in a while." );
           });
       })
       .catch((error) => {
-        console.error(
-          "An error occurred setting notification permissions:",
-          error,
-        );
-        alert("Some error occurred setting notification permissions.");
+        console.error("An error occurred:", error);
+        alert( "Some error occurred." + error );	
       });
   }
 
+
   private urlBase64ToUint8Array(base64String: string): Uint8Array {
     const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
     const base64 = (base64String + padding)
@@ -535,7 +499,11 @@ export default class App extends Vue {
           resolve();
         })
         .catch((error) => {
-          console.error("Push subscription failed:", error, options);
+          console.error(
+            "Subscription or server communication failed:",
+            error,
+            options,
+          );
 
           // Inform the user about the issue
           alert(
@@ -551,7 +519,7 @@ export default class App extends Vue {
   private sendSubscriptionToServer(
     subscription: PushSubscription,
   ): Promise<void> {
-    console.log("About to send subscription...", subscription);
+    console.log(subscription);
     return fetch("/web-push/subscribe", {
       method: "POST",
       headers: {
@@ -566,49 +534,12 @@ export default class App extends Vue {
     });
   }
 
-  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;
-      });
+  never(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") +
-        ".",
-    );
+  maybeLater(ID: string) {
+    alert(ID);
   }
 }
 </script>

src/assets/blank-square.svg

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

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

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

@@ -1,24 +0,0 @@
-<?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/components/EntityIcon.vue

@@ -1,23 +1,30 @@
 <template>
-  <div v-html="generateIcon()" class="w-fit"></div>
+  <div v-html="generateIdenticon()" 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",
+};
 
 @Component
 export default class EntityIcon extends Vue {
   @Prop entityId = "";
   @Prop iconSize = 0;
 
-  generateIcon() {
-    const options: StyleOptions<object> = {
-      seed: this.entityId || "",
-      size: this.iconSize,
-    };
-    const avatar = createAvatar(avataaars, options);
-    const svgString = avatar.toString();
+  generateIdenticon() {
+    const config = this.entityId ? undefined : BLANK_CONFIG;
+    const svgString = toSvg(this.entityId, this.iconSize, config);
     return svgString;
   }
 }

src/components/GiftedDialog.vue

@@ -12,22 +12,19 @@
       />
       <div class="flex flex-row">
         <span
-          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()"
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 w-1/3 text-center px-2 py-2"
+          >Hours</span
         >
-          {{ libsUtil.UNIT_SHORT[unitCode] }}
-        </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="number"
+          type="text"
           class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
-          v-model="amountInput"
+          v-model="hours"
         />
         <div
           class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
@@ -36,15 +33,9 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="mt-2 text-right">
-        <span v-if="showGivenToUser" class="mr-16">
-          <input type="checkbox" class="mr-2" v-model="givenToUser" />
-          <label class="text-sm">Given to you</label>
-        </span>
-        <span>
-          <input type="checkbox" class="mr-2" v-model="isTrade" />
-          <label class="text-sm">Trade (not a gift)</label>
-        </span>
+      <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>
       <p class="text-center mb-2 mt-6 italic">
         Sign & Send to publish to the world
@@ -67,83 +58,64 @@
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
-
-import { NotificationIface } from "@/constants/app";
-import {
-  createAndSubmitGive,
-  didInfo,
-  GiverInputInfo,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
+import { createAndSubmitGive, GiverInputInfo } from "@/libs/endorserServer";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Contact } from "@/db/tables/contacts";
+import { Account } from "@/db/tables/accounts";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component
 export default class GiftedDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, 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
   description = "";
   givenToUser = false;
-  isTrade = false;
-  offerId = "";
-  unitCode = "HUR";
+  hours = "0";
   visible = false;
 
-  libsUtil = libsUtil;
-
-  async open(giver?: GiverInputInfo, offerId?: string) {
-    this.description = "";
-    this.giver = giver || {};
-    // if we show "given to user" selection, default checkbox to true
-    this.givenToUser = this.showGivenToUser;
-    this.amountInput = "0";
-    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.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.error("Error retrieving settings from database:", err);
+      console.log("Error retrieving settings from database:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
+          text:
+            err.message ||
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -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.hours = "0";
 
     this.visible = true;
   }
@@ -153,21 +125,12 @@ export default class GiftedDialog extends Vue {
     this.visible = false;
   }
 
-  changeUnitCode() {
-    const units = Object.keys(this.libsUtil.UNIT_SHORT);
-    const index = units.indexOf(this.unitCode);
-    this.unitCode = units[(index + 1) % units.length];
-  }
-
   increment() {
-    this.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+    this.hours = `${(parseFloat(this.hours) || 0) + 1}`;
   }
 
   decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
+    this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
   }
 
   cancel() {
@@ -179,8 +142,7 @@ export default class GiftedDialog extends Vue {
     this.description = "";
     this.giver = undefined;
     this.givenToUser = this.showGivenToUser;
-    this.amountInput = "0";
-    this.unitCode = "HUR";
+    this.hours = "0";
   }
 
   async confirm() {
@@ -196,27 +158,40 @@ 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) || null,
+      this.giver?.did as string | undefined,
       this.description,
-      parseFloat(this.amountInput),
-      this.unitCode,
+      parseFloat(this.hours),
     ).then(() => {
       this.eraseValues();
     });
   }
 
+  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 description may be an empty string
-   * @param amountInput may be 0
-   * @param unitCode may be omitted, defaults to "HUR"
+   * @param hours may be 0
    */
   public async recordGive(
-    giverDid: string | null,
-    description: string,
-    amountInput: number,
-    unitCode: string = "HUR",
+    giverDid?: string,
+    description?: string,
+    hours?: number,
   ) {
     if (!this.activeDid) {
       this.$notify(
@@ -224,20 +199,20 @@ export default class GiftedDialog extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "You must select an identifier before you can record a give.",
+          text: "You must select an identity before you can record a give.",
         },
         -1,
       );
       return;
     }
 
-    if (!description && !amountInput) {
+    if (!description && !hours) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: `You must enter a description or some number of ${this.libsUtil.UNIT_LONG[unitCode]}.`,
+          text: "You must enter a description or some number of hours.",
         },
         -1,
       );
@@ -245,7 +220,7 @@ export default class GiftedDialog extends Vue {
     }
 
     try {
-      const identity = await libsUtil.getIdentity(this.activeDid);
+      const identity = await this.getIdentity(this.activeDid);
       const result = await createAndSubmitGive(
         this.axios,
         this.apiServer,
@@ -253,11 +228,8 @@ export default class GiftedDialog extends Vue {
         giverDid,
         this.givenToUser ? this.activeDid : undefined,
         description,
-        amountInput,
-        unitCode,
+        hours,
         this.projectId,
-        this.offerId,
-        this.isTrade,
       );
 
       if (
@@ -265,7 +237,7 @@ export default class GiftedDialog extends Vue {
         this.isGiveCreationError(result.response)
       ) {
         const errorMessage = this.getGiveCreationErrorMessage(result);
-        console.error("Error with give creation result:", result);
+        console.log("Error with give creation result:", result);
         this.$notify(
           {
             group: "alert",
@@ -281,14 +253,14 @@ export default class GiftedDialog extends Vue {
             group: "alert",
             type: "success",
             title: "Success",
-            text: `That ${this.isTrade ? "trade" : "gift"} was recorded.`,
+            text: "That gift was recorded.",
           },
           7000,
         );
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      console.error("Error with give recordation caught:", error);
+      console.log("Error with give recordation caught:", error);
       const message =
         error.userMessage ||
         error.response?.data?.error?.message ||

src/components/GiftedPrompts.vue

@@ -1,234 +0,0 @@
-<template>
-  <div v-if="visible" class="dialog-overlay">
-    <div class="dialog">
-      <h1 class="text-xl font-bold text-center mb-4">Here's one:</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-slate-500 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-slate-500 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/OfferDialog.vue

@@ -8,24 +8,22 @@
         placeholder="Description, prerequisites, terms, etc."
         v-model="description"
       />
-      <div class="flex flex-row mt-2">
+      <div class="flex flex-row mb-6">
         <span
-          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()"
+          class="rounded-l border border-r-0 border-slate-400 bg-slate-200 text-center px-2 py-2"
         >
-          {{ libsUtil.UNIT_SHORT[amountUnitCode] }}
+          Hours
         </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="number"
+          type="text"
           class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
-          v-model="amountInput"
+          v-model="hours"
         />
         <div
           class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
@@ -34,7 +32,7 @@
           <fa icon="chevron-right" />
         </div>
       </div>
-      <div class="flex flex-row mt-2">
+      <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"
         >
@@ -47,9 +45,7 @@
           v-model="expirationDateInput"
         />
       </div>
-      <p class="text-center mt-6 mb-2 italic">
-        Sign & Send to publish to the world
-      </p>
+      <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"
@@ -68,16 +64,21 @@
 
 <script lang="ts">
 import { Vue, Component, Prop } from "vue-facing-decorator";
-
-import { NotificationIface } from "@/constants/app";
 import { createAndSubmitOffer } from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import { db } from "@/db/index";
+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;
+}
 
 @Component
 export default class OfferDialog extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   @Prop message = "";
   @Prop projectId = "";
@@ -85,15 +86,12 @@ export default class OfferDialog extends Vue {
   activeDid = "";
   apiServer = "";
 
-  amountInput = "0";
-  amountUnitCode = "HUR";
   description = "";
   expirationDateInput = "";
+  hours = "0";
   visible = false;
 
-  libsUtil = libsUtil;
-
-  async open() {
+  async created() {
     try {
       await db.open();
       const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
@@ -101,52 +99,41 @@ export default class OfferDialog extends Vue {
       this.activeDid = settings?.activeDid || "";
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.error("Error retrieving settings from database:", err);
+      console.log("Error retrieving settings from database:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: err.message || "There was an error retrieving your settings.",
+          text:
+            err.message ||
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -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.amountInput = `${(parseFloat(this.amountInput) || 0) + 1}`;
+    this.hours = `${(parseFloat(this.hours) || 0) + 1}`;
   }
 
   decrement() {
-    this.amountInput = `${Math.max(
-      0,
-      (parseFloat(this.amountInput) || 1) - 1,
-    )}`;
+    this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
   }
 
   cancel() {
     this.close();
-    this.eraseValues();
-  }
-
-  eraseValues() {
     this.description = "";
-    this.amountInput = "0";
-    this.amountUnitCode = "HUR";
+    this.hours = "0";
   }
 
   async confirm() {
@@ -163,25 +150,38 @@ 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.amountInput),
-      this.amountUnitCode,
+      parseFloat(this.hours),
       this.expirationDateInput,
     ).then(() => {
       this.description = "";
-      this.amountInput = "0";
+      this.hours = "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,
-    amount: number,
-    unitCode: string = "HUR",
+    description?: string,
+    hours?: number,
     expirationDateInput?: string,
   ) {
     if (!this.activeDid) {
@@ -190,20 +190,20 @@ export default class OfferDialog extends Vue {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: "You must select an identifier before you can record an offer.",
+          text: "You must select an identity before you can record an offer.",
         },
         -1,
       );
       return;
     }
 
-    if (!description && !amount) {
+    if (!description && !hours) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Error",
-          text: `You must enter a description or some number of ${this.libsUtil.UNIT_LONG[unitCode]}.`,
+          text: "You must enter a description or some number of hours.",
         },
         -1,
       );
@@ -211,14 +211,13 @@ export default class OfferDialog extends Vue {
     }
 
     try {
-      const identity = await libsUtil.getIdentity(this.activeDid);
+      const identity = await this.getIdentity(this.activeDid);
       const result = await createAndSubmitOffer(
         this.axios,
         this.apiServer,
         identity,
         description,
-        amount,
-        unitCode,
+        hours,
         expirationDateInput,
         this.projectId,
       );
@@ -228,7 +227,7 @@ export default class OfferDialog extends Vue {
         this.isOfferCreationError(result.response)
       ) {
         const errorMessage = this.getOfferCreationErrorMessage(result);
-        console.error("Error with offer creation result:", result);
+        console.log("Error with offer creation result:", result);
         this.$notify(
           {
             group: "alert",
@@ -251,7 +250,7 @@ export default class OfferDialog extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      console.error("Error with offer recordation caught:", error);
+      console.log("Error with offer recordation caught:", error);
       const message =
         error.userMessage ||
         error.response?.data?.error?.message ||

src/components/ProjectIcon.vue

@@ -1,32 +0,0 @@
-<template>
-  <div v-html="generateIdenticon()" class="w-fit"></div>
-</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;
-
-  generateIdenticon() {
-    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 max-w-3xl mx-auto">
+    <ul class="flex text-2xl p-2 gap-2">
       <!-- Home Feed -->
       <li
         :class="{

src/components/TopMessage.vue

@@ -1,52 +0,0 @@
-<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/constants/app.ts

@@ -4,22 +4,21 @@
  * See also ../libs/veramo/setup.ts
  */
 export enum AppString {
+  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",
 
-  NO_CONTACT_NAME = "(no name)",
+  DEFAULT_PUSH_SERVER = TEST1_PUSH_SERVER,
 }
 
-export const DEFAULT_ENDORSER_API_SERVER = AppString.TEST_ENDORSER_API_SERVER;
-
-export const DEFAULT_PUSH_SERVER =
-  window.location.protocol + "//" + window.location.host;
-
 /**
  * The possible values for "group" and "type" are in App.vue.
  * From the notiwind package

src/db/index.ts

@@ -1,20 +1,18 @@
 import BaseDexie, { Table } from "dexie";
 import { encrypted, Encryption } from "@pvermeer/dexie-encrypted-addon";
 import { Account, AccountsSchema } from "./tables/accounts";
-import { Contact, ContactSchema } from "./tables/contacts";
-import { Log, LogSchema } from "./tables/logs";
+import { Contact, ContactsSchema } from "./tables/contacts";
 import {
   MASTER_SETTINGS_KEY,
   Settings,
   SettingsSchema,
 } from "./tables/settings";
-import { DEFAULT_ENDORSER_API_SERVER } from "@/constants/app";
+import { AppString } 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>;
 };
 
@@ -28,11 +26,7 @@ export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
 const SensitiveSchemas = { ...AccountsSchema };
 
 export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
-const NonsensitiveSchemas = {
-  ...ContactSchema,
-  ...LogSchema,
-  ...SettingsSchema,
-};
+const NonsensitiveSchemas = { ...ContactsSchema, ...SettingsSchema };
 
 // Manage the encryption key. If not present in localStorage, create and store it.
 const secret =
@@ -44,14 +38,15 @@ encrypted(accountsDB, { secretKey: secret });
 
 // Define the schema for our databases
 accountsDB.version(1).stores(SensitiveSchemas);
-// v1 was contacts & settings
-// v2 added logs
-db.version(2).stores(NonsensitiveSchemas);
+db.version(1).stores(NonsensitiveSchemas);
 
 // Event handler to initialize the non-sensitive database with default settings
 db.on("populate", () => {
   db.settings.add({
     id: MASTER_SETTINGS_KEY,
-    apiServer: DEFAULT_ENDORSER_API_SERVER,
+    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,
   });
 });

src/db/tables/contacts.ts

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

src/db/tables/logs.ts

@@ -1,11 +0,0 @@
-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,17 +12,15 @@ export type BoundingBox = {
  * Settings type encompasses user-specific configuration details.
  */
 export type Settings = {
-  id: number; // Only one entry, keyed with MASTER_SETTINGS_KEY
-
+  id: number; // Only one entry using MASTER_SETTINGS_KEY
   activeDid?: string; // Active Decentralized ID
   apiServer?: string; // API server URL
   firstName?: string; // User's first name
-  isRegistered?: boolean;
-  lastName?: string; // deprecated - put all names in firstName
-  lastNotifiedClaimId?: string; // Last notified claim ID
+  lastName?: string; // User's last name
   lastViewedClaimId?: string; // Last viewed claim ID
-  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
-  reminderOn?: boolean; // Toggle to enable or disable reminders
+  lastNotifiedClaimId?: string; // Last notified claim ID
+  isRegistered?: boolean;
+  webPushServer?: string; // Web Push server URL
 
   // Array of named search boxes defined by bounding boxes
   searchBoxes?: Array<{
@@ -31,11 +29,9 @@ export type Settings = {
   }>;
 
   showContactGivesInline?: boolean; // Display contact inline or not
-  showShortcutBvc?: boolean; // Show shortcut for BVC actions
   vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
-  warnIfProdServer?: boolean; // Warn if using a production server
-  warnIfTestServer?: boolean; // Warn if using a testing server
-  webPushServer?: string; // Web Push server URL
+  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
+  reminderOn?: boolean; // Toggle to enable or disable reminders
 };
 
 /**

src/libs/crypto/index.ts

@@ -173,19 +173,3 @@ export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
 
   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/endorserServer.ts

@@ -8,21 +8,17 @@ import { Contact } from "@/db/tables/contacts";
 export const SCHEMA_ORG_CONTEXT = "https://schema.org";
 // the object in RegisterAction claims
 export const SERVICE_ID = "endorser.ch";
-// the header line for contacts exported via Endorser Mobile
-export const CONTACT_CSV_HEADER = "name,did,pubKeyBase64,seesMe,registered";
 // the prefix for the contact URL
 export const CONTACT_URL_PREFIX = "https://endorser.ch";
 // the suffix for the contact URL
 export const ENDORSER_JWT_URL_LOCATION = "/contact?jwt=";
-// the prefix for handle IDs, the permanent ID for claims on Endorser
-export const ENDORSER_CH_HANDLE_PREFIX = "https://endorser.ch/entity/";
 
 export interface AgreeVerifiableCredential {
   "@context": string;
   "@type": string;
   // "any" because arbitrary objects can be subject of agreement
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  object: Record<string, any>;
+  object: Record<any, any>;
 }
 
 export interface GiverInputInfo {
@@ -34,8 +30,7 @@ export interface GiverOutputInfo {
   action: string;
   giver?: GiverInputInfo;
   description?: string;
-  amount?: number;
-  unitCode?: string;
+  hours?: number;
 }
 
 export interface ClaimResult {
@@ -43,29 +38,14 @@ export interface ClaimResult {
   error: { code: string; message: string };
 }
 
-export interface GenericVerifiableCredential {
+export interface GenericClaim {
   "@context": string;
   "@type": string;
-  [key: string]: any; // eslint-disable-line @typescript-eslint/no-explicit-any
-}
-
-export interface GenericServerRecord extends GenericVerifiableCredential {
-  handleId?: string;
-  id: string;
   issuedAt: string;
-  issuer: string;
+  // "any" because arbitrary objects can be subject of agreement
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  claim: Record<string, any>;
-  claimType?: string;
+  claim: Record<any, any>;
 }
-export const BLANK_GENERIC_SERVER_RECORD: GenericServerRecord = {
-  "@context": SCHEMA_ORG_CONTEXT,
-  "@type": "",
-  claim: {},
-  id: "",
-  issuedAt: "",
-  issuer: "",
-};
 
 export interface GiveServerRecord {
   agentDid: string;
@@ -73,10 +53,8 @@ export interface GiveServerRecord {
   amountConfirmed: number;
   description: string;
   fullClaim: GiveVerifiableCredential;
-  fulfillsPlanHandleId: string;
   handleId: string;
   issuedAt: string;
-  jwtId: string;
   recipientDid: string;
   unit: string;
 }
@@ -84,13 +62,6 @@ export interface GiveServerRecord {
 export interface OfferServerRecord {
   amount: number;
   amountGiven: number;
-  amountGivenConfirmed: number;
-  fullClaim: OfferVerifiableCredential;
-  fulfillsPlanHandleId: string;
-  handleId: string;
-  jwtId: string;
-  nonAmountGivenConfirmed: number;
-  objectDescription: string;
   offeredByDid: string;
   recipientDid: string;
   requirementsMet: boolean;
@@ -98,19 +69,6 @@ export interface OfferServerRecord {
   validThrough: string;
 }
 
-export interface PlanServerRecord {
-  agentDid?: string; // optional, if the issuer wants someone else to manage as well
-  description: string;
-  endTime?: string;
-  fulfillsPlanHandleId: string;
-  issuerDid: string;
-  handleId: string;
-  locLat?: number;
-  locLon?: number;
-  startTime?: string;
-  url?: string;
-}
-
 // Note that previous VCs may have additional fields.
 // https://endorser.ch/doc/html/transactions.html#id4
 export interface GiveVerifiableCredential {
@@ -118,7 +76,7 @@ export interface GiveVerifiableCredential {
   "@type": "GiveAction";
   agent?: { identifier: string };
   description?: string;
-  fulfills?: { "@type": string; identifier?: string; lastClaimId?: string }[];
+  fulfills?: { "@type": string; identifier?: string; lastClaimId?: string };
   identifier?: string;
   object?: { amountOfThisGood: number; unitCode: string };
   recipient?: { identifier: string };
@@ -145,64 +103,23 @@ export interface PlanVerifiableCredential {
   "@context": "https://schema.org";
   "@type": "PlanAction";
   name: string;
-  agent?: { identifier: string };
-  description?: string;
+  description: string;
   identifier?: string;
-  lastClaimId?: string;
   location?: {
     geo: { "@type": "GeoCoordinates"; latitude: number; longitude: number };
   };
 }
 
-/**
- * Represents data about a project
- *
- * @deprecated
- * We should use PlanServerRecord instead.
- **/
-export interface PlanData {
-  /**
-   * Name of the project
-   **/
-  name: string;
-  /**
-   * Description of the project
-   **/
+export interface PlanServerRecord {
+  agentDid?: string; // optional, if the issuer wants someone else to manage as well
   description: string;
-  /**
-   * URL referencing information about the project
-   **/
-  handleId: string;
-  /**
-   * The DID of the issuer
-   */
-  issuerDid: string;
-  /**
-   * The Identier of the project -- different from jwtId, needs to be fixed
-   **/
-  rowid?: string;
-}
-
-export interface RateLimits {
-  doneClaimsThisWeek: string;
-  doneRegistrationsThisMonth: string;
-  maxClaimsPerWeek: string;
-  maxRegistrationsPerMonth: string;
-  nextMonthBeginDateTime: string;
-  nextWeekBeginDateTime: string;
-}
-
-export interface VerifiableCredential {
-  "@context": string;
-  "@type": string;
-  name: string;
-  description: string;
-  identifier?: string;
-}
-
-export interface WorldProperties {
-  startTime?: string;
   endTime?: string;
+  issuerDid: string;
+  handleId: string;
+  locLat?: number;
+  locLon?: number;
+  startTime?: string;
+  url?: string;
 }
 
 export interface RegisterVerifiableCredential {
@@ -213,7 +130,42 @@ export interface RegisterVerifiableCredential {
   participant: { identifier: string };
 }
 
-// now for some of the error & other wrapper types
+export interface InternalError {
+  error: string; // for system logging
+  userMessage?: string; // for user display
+}
+
+// This is used to check for hidden info.
+// See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
+const HIDDEN_DID = "did:none:HIDDEN";
+
+export function isHiddenDid(did: string) {
+  return did === HIDDEN_DID;
+}
+
+/**
+ always returns text, maybe UNNAMED_VISIBLE or UNKNOWN_ENTITY
+
+ Similar logic is found in endorser-mobile.
+ **/
+export function didInfo(
+  did: string,
+  activeDid: string,
+  allMyDids: string[],
+  contacts: Contact[],
+): string {
+  if (!did) return "Someone Anonymous";
+
+  const myId = R.find(R.equals(did), allMyDids);
+  if (myId) return `You${myId !== activeDid ? " (Alt ID)" : ""}`;
+
+  const contact = R.find((c) => c.did === did, contacts);
+  return contact
+    ? contact.name || "Contact With No Name"
+    : isHiddenDid(did)
+      ? "Someone Not In Network"
+      : "Someone Not In Contacts";
+}
 
 export interface ResultWithType {
   type: string;
@@ -224,216 +176,31 @@ export interface SuccessResult extends ResultWithType {
   response: AxiosResponse<ClaimResult>;
 }
 
-export interface ErrorResponse {
-  error?: {
-    message?: string;
-  };
-}
-
-export interface InternalError {
-  error: string; // for system logging
-  userMessage?: string; // for user display
-}
-
-export interface ErrorResult extends ResultWithType {
+export interface ErrorResult {
   type: "error";
   error: InternalError;
 }
 
 export type CreateAndSubmitClaimResult = SuccessResult | ErrorResult;
 
-// This is used to check for hidden info.
-// See https://github.com/trentlarson/endorser-ch/blob/0cb626f803028e7d9c67f095858a9fc8542e3dbd/server/api/services/util.js#L6
-const HIDDEN_DID = "did:none:HIDDEN";
-
-export function isDid(did: string) {
-  return did.startsWith("did:");
-}
-
-export function isHiddenDid(did: string) {
-  return did === HIDDEN_DID;
-}
-
-export function isEmptyOrHiddenDid(did?: string) {
-  return !did || did === HIDDEN_DID; // catching empty string as well
-}
-
-/**
- * @return true for any nested string where func(input) === true
- *
- * Similar logic is found in endorser-mobile.
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function testRecursivelyOnStrings(func: (arg0: any) => boolean, input: any) {
-  if (Object.prototype.toString.call(input) === "[object String]") {
-    return func(input);
-  } else if (input instanceof Object) {
-    if (!Array.isArray(input)) {
-      // it's an object
-      for (const key in input) {
-        if (testRecursivelyOnStrings(func, input[key])) {
-          return true;
-        }
-      }
-    } else {
-      // it's an array
-      for (const value of input) {
-        if (testRecursivelyOnStrings(func, value)) {
-          return true;
-        }
-      }
-    }
-    return false;
-  } else {
-    return false;
-  }
-}
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function containsHiddenDid(obj: any) {
-  return testRecursivelyOnStrings(isHiddenDid, obj);
-}
-
-export function stripEndorserPrefix(claimId: string) {
-  if (claimId && claimId.startsWith(ENDORSER_CH_HANDLE_PREFIX)) {
-    return claimId.substring(ENDORSER_CH_HANDLE_PREFIX.length);
-  } else {
-    return claimId;
-  }
-}
-
-// similar logic is found in endorser-mobile
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function removeSchemaContext(obj: any) {
-  return obj["@context"] === SCHEMA_ORG_CONTEXT
-    ? R.omit(["@context"], obj)
-    : obj;
-}
-
-// similar logic is found in endorser-mobile
-export function addLastClaimOrHandleAsIdIfMissing(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  obj: any,
-  lastClaimId?: string,
-  handleId?: string,
-) {
-  if (!obj.identifier && lastClaimId) {
-    const result = R.clone(obj);
-    result.lastClaimId = lastClaimId;
-    return result;
-  } else if (!obj.identifier && handleId) {
-    const result = R.clone(obj);
-    result.identifier = handleId;
-    return result;
-  } else {
-    return obj;
-  }
-}
-
-// return clone of object without any nested *VisibleToDids keys
-// similar code is also contained in endorser-mobile
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function removeVisibleToDids(input: any): any {
-  if (input instanceof Object) {
-    if (!Array.isArray(input)) {
-      // it's an object
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      const result: Record<string, any> = {};
-      for (const key in input) {
-        if (!key.endsWith("VisibleToDids")) {
-          result[key] = removeVisibleToDids(R.clone(input[key]));
-        }
-      }
-      return result;
-    } else {
-      // it's an array
-      return R.map(removeVisibleToDids, input);
-    }
-  } else {
-    return input;
-  }
-}
-
-export function contactForDid(
-  did: string | undefined,
-  contacts: Contact[],
-): Contact | undefined {
-  return isEmptyOrHiddenDid(did)
-    ? undefined
-    : R.find((c) => c.did === did, contacts);
-}
-
-/**
- *
- * Similar logic is found in endorser-mobile.
- *
- * @param did
- * @param activeDid
- * @param contact
- * @param allMyDids
- * @return { known: boolean, displayName: string } where known is true if the display name is some easily-recogizable name, false if it's a generic name like "Someone Anonymous"
- */
-export function didInfoForContact(
-  did: string | undefined,
-  activeDid: string | undefined,
-  contact?: Contact,
-  allMyDids: string[] = [],
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-): { known: boolean; displayName: string } {
-  if (!did) return { displayName: "Someone Anonymous", known: false };
-  if (contact) {
-    return {
-      displayName: contact.name || "Contact With No Name",
-      known: !!contact.name,
-    };
-  } else if (did === activeDid) {
-    return { displayName: "You", known: true };
-  } else {
-    const myId = R.find(R.equals(did), allMyDids);
-    return myId
-      ? { displayName: "You (Alt ID)", known: true }
-      : isHiddenDid(did)
-        ? { displayName: "Someone Outside Your Network", known: false }
-        : { displayName: "Someone Outside Contacts", known: false };
-  }
-}
-
-/**
- always returns text, maybe something like "unnamed" or "unknown"
-
- Now that we're using more informational didInfoForContact under the covers, we might want to consolidate.
- **/
-export function didInfo(
-  did: string | undefined,
-  activeDid: string | undefined,
-  allMyDids: string[],
-  contacts: Contact[],
-): string {
-  const contact = contactForDid(did, contacts);
-  return didInfoForContact(did, activeDid, contact, allMyDids).displayName;
-}
-
 /**
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
  * @param identity
  * @param fromDid may be null
  * @param toDid
- * @param description may be null; should have this or amount
- * @param amount may be null; should have this or description
+ * @param description may be null; should have this or hours
+ * @param hours may be null; should have this or description
  */
 export async function createAndSubmitGive(
   axios: Axios,
   apiServer: string,
   identity: IIdentifier,
-  fromDid?: string | null,
+  fromDid?: string,
   toDid?: string,
   description?: string,
-  amount?: number,
-  unitCode?: string,
+  hours?: number,
   fulfillsProjectHandleId?: string,
-  fulfillsOfferHandleId?: string,
-  isTrade: boolean = false,
 ): Promise<CreateAndSubmitClaimResult> {
   const vcClaim: GiveVerifiableCredential = {
     "@context": "https://schema.org",
@@ -441,27 +208,13 @@ export async function createAndSubmitGive(
     recipient: toDid ? { identifier: toDid } : undefined,
     agent: fromDid ? { identifier: fromDid } : undefined,
     description: description || undefined,
-    object: amount
-      ? { amountOfThisGood: amount, unitCode: unitCode || "HUR" }
+    object: hours ? { amountOfThisGood: hours, unitCode: "HUR" } : undefined,
+    fulfills: fulfillsProjectHandleId
+      ? { "@type": "PlanAction", identifier: fulfillsProjectHandleId }
       : undefined,
-    fulfills: [{ "@type": isTrade ? "TradeAction" : "DonateAction" }],
   };
-  if (fulfillsProjectHandleId) {
-    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
-    vcClaim.fulfills.push({
-      "@type": "PlanAction",
-      identifier: fulfillsProjectHandleId,
-    });
-  }
-  if (fulfillsOfferHandleId) {
-    vcClaim.fulfills = vcClaim.fulfills || []; // weird that it won't typecheck without this
-    vcClaim.fulfills.push({
-      "@type": "Offer",
-      identifier: fulfillsOfferHandleId,
-    });
-  }
   return createAndSubmitClaim(
-    vcClaim as GenericServerRecord,
+    vcClaim as GenericClaim,
     identity,
     apiServer,
     axios,
@@ -472,8 +225,8 @@ export async function createAndSubmitGive(
  * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
  *
  * @param identity
- * @param description may be null; should have this or amount
- * @param amount may be null; should have this or description
+ * @param description may be null; should have this or hours
+ * @param hours may be null; should have this or description
  * @param expirationDate ISO 8601 date string YYYY-MM-DD (may be null)
  * @param fulfillsProjectHandleId ID of project to which this contributes (may be null)
  */
@@ -482,8 +235,7 @@ export async function createAndSubmitOffer(
   apiServer: string,
   identity: IIdentifier,
   description?: string,
-  amount?: number,
-  unitCode?: string,
+  hours?: number,
   expirationDate?: string,
   fulfillsProjectHandleId?: string,
 ): Promise<CreateAndSubmitClaimResult> {
@@ -493,10 +245,10 @@ export async function createAndSubmitOffer(
     offeredBy: { identifier: identity.did },
     validThrough: expirationDate || undefined,
   };
-  if (amount) {
+  if (hours) {
     vcClaim.includesObject = {
-      amountOfThisGood: amount,
-      unitCode: unitCode || "HUR",
+      amountOfThisGood: hours,
+      unitCode: "HUR",
     };
   }
   if (description) {
@@ -510,37 +262,15 @@ export async function createAndSubmitOffer(
     };
   }
   return createAndSubmitClaim(
-    vcClaim as GenericServerRecord,
+    vcClaim as GenericClaim,
     identity,
     apiServer,
     axios,
   );
 }
 
-// similar logic is found in endorser-mobile
-export const createAndSubmitConfirmation = async (
-  identifier: IIdentifier,
-  claim: GenericVerifiableCredential,
-  lastClaimId: string, // used to set the lastClaimId
-  handleId: string | undefined,
-  apiServer: string,
-  axios: Axios,
-) => {
-  const goodClaim = removeSchemaContext(
-    removeVisibleToDids(
-      addLastClaimOrHandleAsIdIfMissing(claim, lastClaimId, handleId),
-    ),
-  );
-  const confirmationClaim: GenericVerifiableCredential = {
-    "@context": "https://schema.org",
-    "@type": "AgreeAction",
-    object: goodClaim,
-  };
-  return createAndSubmitClaim(confirmationClaim, identifier, apiServer, axios);
-};
-
 export async function createAndSubmitClaim(
-  vcClaim: GenericVerifiableCredential,
+  vcClaim: GenericClaim,
   identity: IIdentifier,
   apiServer: string,
   axios: Axios,
@@ -588,214 +318,76 @@ export async function createAndSubmitClaim(
     return { type: "success", response };
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
   } catch (error: any) {
-    console.error("Error creating claim:", error);
+    console.log("Error creating claim:", error);
     const errorMessage: string =
-      error.response?.data?.error?.message ||
-      error.message ||
-      "Got some error submitting the claim. Check your permissions, network, and error logs.";
+      error.response?.data?.error?.message || error.message || "Unknown error";
 
     return {
       type: "error",
       error: {
         error: errorMessage,
+        userMessage: "Failed to create and submit the claim.",
       },
     };
   }
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isAccept = (claim: Record<string, any>) => {
-  return (
-    claim &&
-    claim["@context"] === SCHEMA_ORG_CONTEXT &&
-    claim["@type"] === "AcceptAction"
-  );
-};
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export const isOffer = (claim: Record<string, any>) => {
-  return (
-    claim &&
-    claim["@context"] === SCHEMA_ORG_CONTEXT &&
-    claim["@type"] === "Offer"
-  );
-};
-
-export function currencyShortWordForCode(unitCode: string, single: boolean) {
-  return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
+// from https://stackoverflow.com/a/175787/845494
+//
+export function isNumeric(str: string): boolean {
+  return !isNaN(+str);
 }
 
-export function displayAmount(code: string, amt: number) {
-  return "" + amt + " " + currencyShortWordForCode(code, amt === 1);
+export function numberOrZero(str: string): number {
+  return isNumeric(str) ? +str : 0;
 }
 
-// insert a space before any capital letters except the initial letter
-// (and capitalize initial letter, just in case)
-export const capitalizeAndInsertSpacesBeforeCaps = (text: string) => {
-  return !text
-    ? ""
-    : text[0].toUpperCase() + text.substr(1).replace(/([A-Z])/g, " $1");
-};
-
-/**
- return readable summary of claim, or something generic
-
- similar code is also contained in endorser-mobile
- **/
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const claimSummary = (claim: Record<string, any>) => {
-  if (!claim) {
-    // to differentiate from "something" above
-    return "something";
-  }
-  if (claim.claim) {
-    // probably a Verified Credential
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    claim = claim.claim as Record<string, any>;
-  }
-  if (Array.isArray(claim)) {
-    if (claim.length === 1) {
-      claim = claim[0];
-    } else {
-      return "multiple claims";
-    }
-  }
-  const type = claim["@type"];
-  if (!type) {
-    return "a claim";
-  } else {
-    let typeExpl = capitalizeAndInsertSpacesBeforeCaps(type);
-    if (typeExpl === "Person") {
-      typeExpl += " claim";
-    }
-    return "a " + typeExpl;
-  }
-};
-
-/**
- return readable description of claim if possible, as a past-tense action
-
- identifiers is a list of objects with a 'did' field, each representing the user
- contacts is a list of objects with a 'did' field for others and a 'name' field for their name
-
- similar code is also contained in endorser-mobile
- **/
-export const claimSpecialDescription = (
-  record: GenericServerRecord,
-  activeDid: string,
-  identifiers: Array<string>,
-  contacts: Array<Contact>,
-) => {
-  let claim = record.claim;
-  if (claim.claim) {
-    // it's probably a Verified Credential
-    claim = claim.claim;
-  }
-
-  const issuer = didInfo(record.issuer, activeDid, identifiers, contacts);
-  const type = claim["@type"] || "UnknownType";
-
-  if (type === "AgreeAction") {
-    return issuer + " agreed with " + claimSummary(claim.object);
-  } else if (isAccept(claim)) {
-    return issuer + " accepted " + claimSummary(claim.object);
-  } else if (type === "GiveAction") {
-    // agent.did is for legacy data, before March 2023
-    const giver = claim.agent?.identifier || claim.agent?.did;
-    const giverInfo = didInfo(giver, activeDid, identifiers, contacts);
-    let gaveAmount = claim.object?.amountOfThisGood
-      ? displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
-      : "";
-    if (claim.description) {
-      if (gaveAmount) {
-        gaveAmount = gaveAmount + ", and also: ";
-      }
-      gaveAmount = gaveAmount + claim.description;
-    }
-    if (!gaveAmount) {
-      gaveAmount = "something not described";
-    }
-    // recipient.did is for legacy data, before March 2023
-    const gaveRecipientId = claim.recipient?.identifier || claim.recipient?.did;
-    const gaveRecipientInfo = gaveRecipientId
-      ? " to " + didInfo(gaveRecipientId, activeDid, identifiers, contacts)
-      : "";
-    return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
-  } else if (type === "JoinAction") {
-    // agent.did is for legacy data, before March 2023
-    const agent = claim.agent?.identifier || claim.agent?.did;
-    const contactInfo = didInfo(agent, activeDid, identifiers, contacts);
-
-    let eventOrganizer =
-      claim.event && claim.event.organizer && claim.event.organizer.name;
-    eventOrganizer = eventOrganizer || "";
-    let eventName = claim.event && claim.event.name;
-    eventName = eventName ? " " + eventName : "";
-    let fullEvent = eventOrganizer + eventName;
-    fullEvent = fullEvent ? " attended the " + fullEvent : "";
-
-    let eventDate = claim.event && claim.event.startTime;
-    eventDate = eventDate ? " at " + eventDate : "";
-    return contactInfo + fullEvent + eventDate;
-  } else if (isOffer(claim)) {
-    const offerer = claim.offeredBy?.identifier;
-    const contactInfo = didInfo(offerer, activeDid, identifiers, contacts);
-    let offering = "";
-    if (claim.includesObject) {
-      offering +=
-        " " +
-        displayAmount(
-          claim.includesObject.unitCode,
-          claim.includesObject.amountOfThisGood,
-        );
-    }
-    if (claim.itemOffered?.description) {
-      offering += ", saying: " + claim.itemOffered?.description;
-    }
-    // recipient.did is for legacy data, before March 2023
-    const offerRecipientId =
-      claim.recipient?.identifier || claim.recipient?.did;
-    const offerRecipientInfo = offerRecipientId
-      ? " to " + didInfo(offerRecipientId, activeDid, identifiers, contacts)
-      : "";
-    return contactInfo + " offered" + offering + offerRecipientInfo;
-  } else if (type === "PlanAction") {
-    const claimer = claim.agent?.identifier || record.issuer;
-    const claimerInfo = didInfo(claimer, activeDid, identifiers, contacts);
-    return claimerInfo + " announced a project: " + claim.name;
-  } else if (type === "Tenure") {
-    // party.did is for legacy data, before March 2023
-    const claimer = claim.party?.identifier || claim.party?.did;
-    const contactInfo = didInfo(claimer, activeDid, identifiers, contacts);
-    const polygon = claim.spatialUnit?.geo?.polygon || "";
-    return (
-      contactInfo +
-      " possesses [" +
-      polygon.substring(0, polygon.indexOf(" ")) +
-      "...]"
-    );
-  } else {
-    return issuer + " declared " + claimSummary(claim as GenericServerRecord);
-  }
-};
-
-export const BVC_MEETUPS_PROJECT_CLAIM_ID =
-  //"https://endorser.ch/entity/01GXYPFF7FA03NXKPYY142PY4H";
-  "https://endorser.ch/entity/01HNTZYJJXTGT0EZS3VEJGX7AK";
-
-export const bvcMeetingJoinClaim = (did: string, startTime: string) => {
-  return {
-    "@context": SCHEMA_ORG_CONTEXT,
-    "@type": "JoinAction",
-    agent: {
-      identifier: did,
-    },
-    event: {
-      organizer: {
-        name: "Bountiful Voluntaryist Community",
-      },
-      name: "Saturday Morning Meeting",
-      startTime: startTime,
-    },
+export interface ErrorResponse {
+  error?: {
+    message?: string;
   };
-};
+}
+
+export interface RateLimits {
+  doneClaimsThisWeek: string;
+  doneRegistrationsThisMonth: string;
+  maxClaimsPerWeek: string;
+  maxRegistrationsPerMonth: string;
+  nextMonthBeginDateTime: string;
+  nextWeekBeginDateTime: string;
+}
+
+/**
+ * Represents data about a project
+ **/
+export interface ProjectData {
+  /**
+   * Name of the project
+   **/
+  name: string;
+  /**
+   * Description of the project
+   **/
+  description: string;
+  /**
+   * URL referencing information about the project
+   **/
+  handleId: string;
+  /**
+   * The Identier of the project
+   **/
+  rowid: string;
+}
+
+export interface VerifiableCredential {
+  "@context": string;
+  "@type": string;
+  name: string;
+  description: string;
+  identifier?: string;
+}
+
+export interface WorldProperties {
+  startTime?: string;
+  endTime?: string;
+}

src/libs/util.ts

@@ -1,294 +1,3 @@
-// many of these are also found in endorser-mobile utility.ts
-
-import axios, { AxiosResponse } from "axios";
-import { IIdentifier } from "@veramo/core";
-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 { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
-import { GenericServerRecord, containsHiddenDid } from "@/libs/endorserServer";
-import * as serverUtil from "@/libs/endorserServer";
-
-// eslint-disable-next-line @typescript-eslint/no-var-requires
-const Buffer = require("buffer/").Buffer;
-
-// If you edit this, check that the numbers still line up on the side in the alert (on mobile, too),
-// and make sure they can take all actions while the notification shows.
-export const ONBOARD_MESSAGE =
-  "1) Read through all their yellow prompts. 2) Add them to your Contacts by scanning with the QR icon that is by the input box. 3) Click the person icon to register them. 4) Show them your QR so they'll scan you. 5) Have them enable notifications.";
-
-/* eslint-disable prettier/prettier */
-export const UNIT_SHORT: Record<string, string> = {
-  "BTC": "BTC",
-  "ETH": "ETH",
-  "HUR": "Hours",
-  "USD": "US $",
-};
-/* eslint-enable prettier/prettier */
-
-/* eslint-disable prettier/prettier */
-export const UNIT_LONG: Record<string, string> = {
-  "BTC": "Bitcoin",
-  "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
-//
-export function isNumeric(str: string): boolean {
-  return !isNaN(+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 giveIsConfirmable = (veriClaim: GenericServerRecord) => {
-  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 = (
-  veriClaim: GenericServerRecord,
-  activeDid: string,
-  confirmerIdList: string[] = [],
-) => {
-  return (
-    giveIsConfirmable(veriClaim) &&
-    !confirmerIdList.includes(activeDid) &&
-    veriClaim.issuer !== activeDid &&
-    !containsHiddenDid(veriClaim.claim)
-  );
-};
-
-/**
- * @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: GenericServerRecord,
-) => 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: GenericServerRecord) => {
-  return !!(veriClaim.claimType === "Offer" && offerGiverDid(veriClaim));
-};
-
-// 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 const getIdentity = async (activeDid: string): Promise<IIdentifier> => {
-  await accountsDB.open();
-  const account = (await accountsDB.accounts
-    .where("did")
-    .equals(activeDid)
-    .first()) as Account;
-  const identity = JSON.parse(account?.identity || "null");
-
-  if (!identity) {
-    throw new Error(
-      `Attempted to load Offer records for DID ${activeDid} but no identifier was found`,
-    );
-  }
-  return identity;
-};
-
-/**
- * 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 sendTestThroughPushServer = async (
-  subscription: PushSubscription,
-  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 auth = Buffer.from(subscription.getKey("auth"));
-  const authB64 = auth
-    .toString("base64")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=+$/, "");
-  const p256dh = Buffer.from(subscription.getKey("p256dh"));
-  const p256dhB64 = p256dh
-    .toString("base64")
-    .replace(/\+/g, "-")
-    .replace(/\//g, "_")
-    .replace(/=+$/, "");
-  const newPayload = {
-    endpoint: subscription.endpoint,
-    keys: {
-      auth: authB64,
-      p256dh: p256dhB64,
-    },
-    message: `Test, where you will see this message ${
-      skipFilter ? "un" : ""
-    }filtered.`,
-    title: skipFilter ? DIRECT_PUSH_TITLE : "Your Web Push",
-  };
-  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

@@ -13,7 +13,6 @@ import { library } from "@fortawesome/fontawesome-svg-core";
 import {
   faArrowLeft,
   faArrowRight,
-  faArrowUpRightFromSquare,
   faBan,
   faBitcoinSign,
   faBurst,
@@ -36,19 +35,14 @@ import {
   faFileLines,
   faFloppyDisk,
   faFolderOpen,
-  faForward,
   faGift,
   faGlobe,
-  faHammer,
   faHand,
-  faHandHoldingHeart,
   faHouseChimney,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
-  faMessage,
-  faMinus,
   faPen,
   faPersonCircleCheck,
   faPersonCircleQuestion,
@@ -60,7 +54,6 @@ import {
   faSpinner,
   faSquareCaretDown,
   faSquareCaretUp,
-  faSquarePlus,
   faTrashCan,
   faTriangleExclamation,
   faUser,
@@ -71,7 +64,6 @@ import {
 library.add(
   faArrowLeft,
   faArrowRight,
-  faArrowUpRightFromSquare,
   faBan,
   faBitcoinSign,
   faBurst,
@@ -94,19 +86,14 @@ library.add(
   faFileLines,
   faFloppyDisk,
   faFolderOpen,
-  faForward,
   faGift,
   faGlobe,
-  faHammer,
   faHand,
-  faHandHoldingHeart,
   faHouseChimney,
   faLocationDot,
   faLongArrowAltLeft,
   faLongArrowAltRight,
   faMagnifyingGlass,
-  faMessage,
-  faMinus,
   faPen,
   faPersonCircleCheck,
   faPersonCircleQuestion,
@@ -118,7 +105,6 @@ library.add(
   faSpinner,
   faSquareCaretDown,
   faSquareCaretUp,
-  faSquarePlus,
   faTrashCan,
   faTriangleExclamation,
   faUser,

src/registerServiceWorker.ts

@@ -3,7 +3,7 @@
 import { register } from "register-service-worker";
 
 if (process.env.NODE_ENV === "production") {
-  register("/sw_scripts-combined.js", {
+  register("/additional-scripts.js", {
     ready() {
       console.log(
         "App is being served from cache by a service worker.\n" +

src/router/index.ts

@@ -28,17 +28,18 @@ 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"),
-  },
-  {
-    path: "/claim/:id?",
-    name: "claim",
-    component: () =>
-      import(/* webpackChunkName: "claim" */ "../views/ClaimView.vue"),
+    beforeEnter: enterOrStart,
   },
   {
     path: "/confirm-contact",
@@ -90,12 +91,6 @@ const routes: Array<RouteRecordRaw> = [
     component: () =>
       import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
   },
-  {
-    path: "/",
-    name: "home",
-    component: () =>
-      import(/* webpackChunkName: "home" */ "../views/HomeView.vue"),
-  },
   {
     path: "/help-notifications",
     name: "help-notifications",
@@ -136,6 +131,14 @@ const routes: Array<RouteRecordRaw> = [
         /* webpackChunkName: "new-edit-account" */ "../views/NewEditAccountView.vue"
       ),
   },
+  {
+    path: "/new-edit-commitment",
+    name: "new-edit-commitment",
+    component: () =>
+      import(
+        /* webpackChunkName: "new-edit-commitment" */ "../views/NewEditCommitmentView.vue"
+      ),
+  },
   {
     path: "/new-edit-project",
     name: "new-edit-project",
@@ -165,30 +168,6 @@ const routes: Array<RouteRecordRaw> = [
       import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
     beforeEnter: enterOrStart,
   },
-  {
-    path: "/quick-action-bvc",
-    name: "quick-action-bvc",
-    component: () =>
-      import(
-        /* webpackChunkName: "quick-action-bvc" */ "../views/QuickActionBvcView.vue"
-      ),
-  },
-  {
-    path: "/quick-action-bvc-begin",
-    name: "quick-action-bvc-begin",
-    component: () =>
-      import(
-        /* webpackChunkName: "quick-action-bvc-begin" */ "../views/QuickActionBvcBeginView.vue"
-      ),
-  },
-  {
-    path: "/quick-action-bvc-end",
-    name: "quick-action-bvc-end",
-    component: () =>
-      import(
-        /* webpackChunkName: "quick-action-bvc-end" */ "../views/QuickActionBvcEndView.vue"
-      ),
-  },
   {
     path: "/scan-contact",
     name: "scan-contact",

src/views/ClaimView.vue

@@ -1,813 +0,0 @@
-<template>
-  <QuickNav />
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
-    <!-- Breadcrumb -->
-    <div id="ViewBreadcrumb" class="mb-8">
-      <h1 class="text-lg text-center font-light relative px-7">
-        <!-- Back -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </button>
-        Verifiable Claim Details
-      </h1>
-    </div>
-
-    <!-- Details -->
-    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <div class="block flex gap-4 overflow-hidden">
-        <div class="overflow-hidden">
-          <h2 class="text-md font-bold">
-            {{ capitalizeAndInsertSpacesBeforeCaps(veriClaim.claimType) }}
-          </h2>
-          <div class="text-sm">
-            <div>
-              {{ veriClaim.id }}
-              <button
-                @click="
-                  libsUtil.doCopyTwoSecRedo(
-                    veriClaim.id as string,
-                    () => (showIdCopy = !showIdCopy),
-                  )
-                "
-                class="ml-2 mr-2"
-              >
-                <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-              </button>
-              <span v-show="showIdCopy">Copied ID</span>
-            </div>
-            <div>
-              <fa icon="message" class="fa-fw text-slate-400"></fa>
-              {{ veriClaim.claim?.description }}
-            </div>
-            <div>
-              <fa icon="user" class="fa-fw text-slate-400"></fa>
-              {{ veriClaim.issuer }}
-              <span v-if="!serverUtil.isEmptyOrHiddenDid(veriClaim.issuer)">
-                <button
-                  @click="
-                    libsUtil.doCopyTwoSecRedo(
-                      veriClaim.issuer as string,
-                      () => (showDidCopy = !showDidCopy),
-                    )
-                  "
-                  class="ml-2 mr-2"
-                >
-                  <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-                </button>
-                <span v-show="showDidCopy">Copied DID</span>
-              </span>
-            </div>
-            <div>
-              <fa icon="calendar" class="fa-fw text-slate-400"></fa>
-              {{ veriClaim.issuedAt?.replace(/T/, " ").replace(/Z/, " UTC") }}
-            </div>
-
-            <!-- Fullfills Links -->
-
-            <!-- fullfills links for a give -->
-            <div v-if="detailsForGive?.fulfillsPlanHandleId">
-              <router-link
-                :to="
-                  '/project/' +
-                  encodeURIComponent(detailsForGive?.fulfillsPlanHandleId)
-                "
-                class="text-blue-500 mt-2"
-              >
-                Fulfills a bigger plan...
-              </router-link>
-            </div>
-            <!-- if there's another, it's probably fulfilling an offer, too -->
-            <div
-              v-if="
-                detailsForGive?.fulfillsType &&
-                detailsForGive?.fulfillsType !== 'PlanAction' &&
-                detailsForGive?.fulfillsHandleId
-              "
-            >
-              <!-- router-link to /claim/ only changes URL path -->
-              <a
-                @click="
-                  showDifferentClaimPage(detailsForGive?.fulfillsHandleId)
-                "
-                class="text-blue-500 mt-4"
-              >
-                Fulfills
-                {{
-                  capitalizeAndInsertSpacesBeforeCaps(
-                    detailsForGive.fulfillsType,
-                  )
-                }}...
-              </a>
-            </div>
-
-            <!-- fullfills links for an offer -->
-            <div v-if="detailsForOffer?.fulfillsPlanHandleId">
-              <router-link
-                :to="
-                  '/project/' +
-                  encodeURIComponent(detailsForOffer?.fulfillsPlanHandleId)
-                "
-                class="text-blue-500 mt-4"
-              >
-                Offered to a bigger plan...
-              </router-link>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div class="columns-3">
-      <button
-        class="col-span-1 bg-blue-600 text-white px-4 py-2 rounded-md"
-        v-if="
-          libsUtil.isGiveRecordTheUserCanConfirm(
-            veriClaim,
-            activeDid,
-            confirmerIdList,
-          )
-        "
-        @click="confirmClaim()"
-      >
-        Confirm
-        <fa icon="circle-check" class="ml-2 text-white cursor-pointer" />
-      </button>
-
-      <button
-        v-if="libsUtil.canFulfillOffer(veriClaim)"
-        @click="openFulfillGiftDialog()"
-        class="col-span-1 block w-fit text-center text-md bg-blue-600 text-white px-1.5 py-2 rounded-md"
-      >
-        Affirm Delivery
-        <fa icon="hand-holding-heart" class="ml-2 text-white cursor-pointer" />
-      </button>
-    </div>
-    <GiftedDialog ref="customGiveDialog" message="Offer fulfilled by" />
-
-    <div v-if="libsUtil.giveIsConfirmable(veriClaim)">
-      <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="veriClaim.issuer == 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>
-
-    <div>
-      <h2 class="font-bold uppercase text-xl mt-8 mb-2">
-        {{ serverUtil.containsHiddenDid(veriClaim) ? "Visible " : "" }}Details
-      </h2>
-      <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)"
-            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)"
-            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"></fa>
-            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"></fa
-                      >&nbsp;<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>
-
-    <h2 class="font-bold uppercase text-xl mt-8 mb-2">Full Claim</h2>
-    <p class="mb-4">
-      The full claim includes the claim as it was originally issued, including
-      the signature (ie. the proof of issuance by that person).
-    </p>
-    <div v-if="!fullClaim">
-      <p v-if="fullClaimMessage" class="mb-4">
-        {{ fullClaimMessage }}
-      </p>
-      <button
-        v-else
-        class="block w-full text-center text-md uppercase bg-blue-600 text-white px-1.5 py-2 rounded-md mb-2"
-        @click="showFullClaim(veriClaim.id as string)"
-      >
-        Load Full Claim Details
-      </button>
-    </div>
-    <div v-else>
-      <pre>{{ fullClaimDump }}</pre>
-    </div>
-
-    <a
-      :href="apiServer + '/api/claim/' + veriClaim.id"
-      target="_blank"
-      class="block w-full text-center text-md uppercase bg-blue-600 text-white px-1.5 py-2 rounded-md mb-2"
-    >
-      View on the Public Server
-    </a>
-  </section>
-</template>
-
-<script lang="ts">
-import { AxiosError, RawAxiosRequestHeaders } from "axios";
-import * as yaml from "js-yaml";
-import * as R from "ramda";
-import { IIdentifier } from "@veramo/core";
-import { Component, Vue } from "vue-facing-decorator";
-import { useClipboard } from "@vueuse/core";
-
-import GiftedDialog from "@/components/GiftedDialog.vue";
-import OfferDialog from "@/components/OfferDialog.vue";
-import { NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import * as serverUtil from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { Account } from "@/db/tables/accounts";
-import { GiverInputInfo } from "@/libs/endorserServer";
-
-@Component({
-  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
-})
-export default class ClaimView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  accountIdentityStr: string = "null";
-  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
-  detailsForGive = null;
-  detailsForOffer = null;
-  fullClaim = null;
-  fullClaimDump = "";
-  fullClaimMessage = "";
-  numConfsNotVisible = 0; // number of hidden DIDs in the confirmerIdList, minus the issuer if they aren't visible
-  showDidCopy = false;
-  showIdCopy = false;
-  veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
-  veriClaimDump = "";
-  veriClaimDidsVisible = {};
-  windowLocation = window.location.href;
-
-  R = R;
-  yaml = yaml;
-  libsUtil = libsUtil;
-  serverUtil = serverUtil;
-
-  resetThisValues() {
-    this.confirmerIdList = [];
-    this.confsVisibleErrorMessage = "";
-    this.confsVisibleToIdList = [];
-    this.detailsForGive = null;
-    this.detailsForOffer = null;
-    this.fullClaim = null;
-    this.fullClaimDump = "";
-    this.fullClaimMessage = "";
-    this.numConfsNotVisible = 0;
-    this.veriClaim = serverUtil.BLANK_GENERIC_SERVER_RECORD;
-    this.veriClaimDump = "";
-  }
-
-  async created() {
-    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();
-
-    await accountsDB.open();
-    const accounts = accountsDB.accounts;
-    const accountsArr = await accounts?.toArray();
-    this.allMyDids = accountsArr.map((acc) => acc.did);
-    const account = accountsArr.find((acc) => acc.did === this.activeDid);
-    this.accountIdentityStr = account?.identity || "null";
-    const identity = JSON.parse(this.accountIdentityStr);
-
-    const pathParam = window.location.pathname.substring("/claim/".length);
-    let claimId;
-    if (pathParam) {
-      claimId = decodeURIComponent(pathParam);
-      await this.loadClaim(claimId, identity);
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "No claim ID was provided.",
-        },
-        -1,
-      );
-    }
-
-    // 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;
-  }
-
-  // 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");
-  }
-
-  totalConfirmers() {
-    return (
-      this.numConfsNotVisible +
-      this.confirmerIdList.length +
-      this.confsVisibleToIdList.length
-    );
-  }
-
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load project records with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
-  public async getHeaders(identity: IIdentifier) {
-    const headers: RawAxiosRequestHeaders = {
-      "Content-Type": "application/json",
-    };
-    if (identity) {
-      const token = await accessToken(identity);
-      headers["Authorization"] = "Bearer " + token;
-    }
-    return headers;
-  }
-
-  // Isn't there a better way to make this available to the template?
-  didInfo(did: string) {
-    return serverUtil.didInfo(
-      did,
-      this.activeDid,
-      this.allMyDids,
-      this.allContacts,
-    );
-  }
-
-  async loadClaim(claimId: string, identity: IIdentifier) {
-    const urlPath = libsUtil.isGlobalUri(claimId)
-      ? "/api/claim/byHandle/"
-      : "/api/claim/";
-    const url = this.apiServer + urlPath + encodeURIComponent(claimId);
-    const headers = await this.getHeaders(identity);
-
-    try {
-      const resp = await this.axios.get(url, { headers });
-      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.",
-          },
-          -1,
-        );
-        return;
-      }
-
-      // retrieve more details on Give, Offer, or Plan
-      if (this.veriClaim.claimType === "GiveAction") {
-        const giveUrl =
-          this.apiServer +
-          "/api/v2/report/gives?handleId=" +
-          encodeURIComponent(this.veriClaim.handleId as string);
-        const giveHeaders = await this.getHeaders(identity);
-        const giveResp = await this.axios.get(giveUrl, {
-          headers: giveHeaders,
-        });
-        if (giveResp.status === 200) {
-          this.detailsForGive = giveResp.data.data[0];
-        } else {
-          console.error("Error getting detailed give info:", giveResp);
-        }
-      } else if (this.veriClaim.claimType === "Offer") {
-        const offerUrl =
-          this.apiServer +
-          "/api/v2/report/offers?handleId=" +
-          encodeURIComponent(this.veriClaim.handleId as string);
-        const offerHeaders = await this.getHeaders(identity);
-        const offerResp = await this.axios.get(offerUrl, {
-          headers: offerHeaders,
-        });
-        if (offerResp.status === 200) {
-          this.detailsForOffer = offerResp.data.data[0];
-        } else {
-          console.error("Error getting detailed offer info:", offerResp);
-        }
-      }
-
-      // retrieve the list of confirmers
-      const confirmUrl =
-        this.apiServer +
-        "/api/report/issuersWhoClaimedOrConfirmed?claimId=" +
-        encodeURIComponent(serverUtil.stripEndorserPrefix(claimId));
-      const confirmHeaders = await this.getHeaders(identity);
-      const response = await this.axios.get(confirmUrl, {
-        headers: confirmHeaders,
-      });
-      if (response.status === 200) {
-        const resultList1 = response.data.result || [];
-        const resultList2 = R.reject(serverUtil.isHiddenDid, resultList1);
-        const resultList3 = R.reject(
-          (did: string) => did === this.veriClaim.issuer,
-          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.",
-        },
-        -1,
-      );
-    }
-  }
-
-  async showFullClaim(claimId: string) {
-    await accountsDB.open();
-    const accounts = accountsDB.accounts;
-    const accountsArr: Account[] = await accounts?.toArray();
-    const account = accountsArr.find((acc) => acc.did === this.activeDid);
-    const identity = JSON.parse(account?.identity || "null");
-
-    const url =
-      this.apiServer + "/api/claim/full/" + encodeURIComponent(claimId);
-    const headers = await this.getHeaders(identity);
-
-    try {
-      const resp = await this.axios.get(url, { headers });
-      if (resp.status === 200) {
-        this.fullClaim = resp.data;
-        this.fullClaimDump = yaml.dump(this.fullClaim);
-      } else {
-        // actually, axios typically throws an error so we never get here
-        console.error("Error getting full claim:", resp);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem getting that claim. See logs for more info.",
-          },
-          -1,
-        );
-      }
-    } catch (error: unknown) {
-      console.error("Error retrieving full claim:", error);
-      const serverError = error as AxiosError;
-      if (serverError.response?.status === 403) {
-        this.fullClaimMessage =
-          "You are not authorized to view the full contents of this claim." +
-          " To see all the details, ask the issuer to allow you to see their claims." +
-          " If you cannot see the issuer's DID, ask someone in the Confirmations section above." +
-          " If there are no connections, you will have to ask people in your" +
-          " network for their help, some other way; send them to this page and" +
-          " see if they can make a connection for you.";
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Something went wrong retrieving that claim. See logs for more info.",
-          },
-          -1,
-        );
-      }
-    }
-  }
-
-  // similar code is found in ProjectViewView
-  async confirmClaim() {
-    if (confirm("Do you personally confirm that this is true?")) {
-      // 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,
-        await this.getIdentity(this.activeDid),
-        this.apiServer,
-        this.axios,
-      );
-      if (result.type === "success") {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "Confirmation submitted.",
-          },
-          5000,
-        );
-      } 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.",
-          },
-          -1,
-        );
-      }
-    }
-  }
-
-  showDifferentClaimPage(claimId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(claimId),
-    };
-    this.$router.push(route).then(async () => {
-      this.resetThisValues();
-      await this.loadClaim(claimId, JSON.parse(this.accountIdentityStr));
-    });
-  }
-
-  openFulfillGiftDialog() {
-    const giver: GiverInputInfo = {
-      did: libsUtil.offerGiverDid(this.veriClaim),
-    };
-    (this.$refs.customGiveDialog as GiftedDialog).open(
-      giver,
-      this.veriClaim.handleId,
-    );
-  }
-
-  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,
-        );
-      });
-  }
-
-  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,
-    });
-  }
-}
-</script>

src/views/ConfirmContactView.vue

@@ -1,6 +1,6 @@
 <template>
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">

src/views/ContactAmountsView.vue

@@ -1,6 +1,6 @@
 <template>
   <QuickNav selected="Contacts"></QuickNav>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <h1
@@ -16,7 +16,7 @@
       </h1>
 
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
-        Transferred with {{ contact?.name }}
+        Given with {{ contact?.name }}
       </h1>
     </div>
 
@@ -25,13 +25,6 @@
       <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
@@ -105,14 +98,9 @@
 </template>
 
 <script lang="ts">
-import { AxiosError } from "axios";
-import * as didJwt from "did-jwt";
 import * as R from "ramda";
-import { IIdentifier } from "@veramo/core";
-import { Component, Vue } from "vue-facing-decorator";
 
-import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
+import { Component, Vue } from "vue-facing-decorator";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
@@ -123,10 +111,21 @@ import {
   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 ContactAmountssView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+export default class ContactsView extends Vue {
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";
@@ -149,7 +148,7 @@ export default class ContactAmountssView extends Vue {
 
     if (!identity) {
       throw new Error(
-        "Attempted to load Give records with no identifier available.",
+        "Attempted to load Give records with no identity available.",
       );
     }
     return identity;
@@ -179,7 +178,6 @@ export default class ContactAmountssView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.error("Error retrieving settings or gives.", err);
       this.$notify(
         {
           group: "alert",
@@ -187,7 +185,7 @@ export default class ContactAmountssView extends Vue {
           title: "Error",
           text:
             err.userMessage ||
-            "There was an error retrieving your settings or contacts or gives.",
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -1,
       );

src/views/ContactGiftingView.vue

@@ -1,7 +1,7 @@
 <template>
   <QuickNav selected="Home"></QuickNav>
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
@@ -20,13 +20,13 @@
     <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">
-            <img
-              src="../assets/blank-square.svg"
-              width="32"
+          <span class="grow italic text-slate-500"
+            ><EntityIcon
+              :entityId="null"
+              :iconSize="32"
               class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-            />
-            Anonymous/Unnamed
+            ></EntityIcon>
+            Anonymous
           </span>
           <span class="text-right">
             <button
@@ -45,12 +45,12 @@
         class="border-b border-slate-300 py-3"
       >
         <h2 class="text-base flex gap-4 items-center">
-          <span class="grow font-semibold">
-            <EntityIcon
+          <span class="grow font-semibold"
+            ><EntityIcon
               :entityId="contact.did"
               :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">
@@ -69,71 +69,48 @@
     <GiftedDialog
       ref="customDialog"
       message="Received from"
-      :projectId="projectId"
+      showGivenToUser="true"
     />
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { IIdentifier } from "@veramo/core";
-
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { Account, AccountsSchema } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { 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;
+}
 
 @Component({
   components: { GiftedDialog, QuickNav, EntityIcon },
 })
 export default class ContactGiftingView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
   apiServer = "";
   accounts: typeof AccountsSchema;
   numAccounts = 0;
-  projectId = localStorage.getItem("projectId") || "";
 
   async beforeCreate() {
     accountsDB.open();
     this.numAccounts = await accountsDB.accounts.count();
   }
 
-  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.orderBy("name").toArray();
-
-      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",
-          type: "danger",
-          title: "Error",
-          text:
-            err.message ||
-            "There was an error retrieving your settings or contacts.",
-        },
-        -1,
-      );
-    }
-  }
-
   public async getIdentity(activeDid: string) {
     await accountsDB.open();
     const account = (await accountsDB.accounts
@@ -144,7 +121,7 @@ export default class ContactGiftingView extends Vue {
 
     if (!identity) {
       throw new Error(
-        "Attempted to load Give records with no identifier available.",
+        "Attempted to load Give records with no identity available.",
       );
     }
     return identity;
@@ -159,6 +136,29 @@ export default class ContactGiftingView extends Vue {
     return headers;
   }
 
+  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();
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    } catch (err: any) {
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text:
+            err.message ||
+            "There was an error retrieving the latest sweet, sweet action.",
+        },
+        -1,
+      );
+    }
+  }
+
   openDialog(giver: GiverInputInfo) {
     (this.$refs.customDialog as GiftedDialog).open(giver);
   }

src/views/ContactQRScanShowView.vue

@@ -1,7 +1,7 @@
 <template>
   <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <!-- Back -->
@@ -18,22 +18,9 @@
       <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
         Your Contact Info
       </h1>
-      <p
-        v-if="!givenName"
-        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
-      >
-        <span class="text-red">Beware!</span>
-        You aren't sharing your name, so quickly
-        <router-link
-          :to="{ name: 'new-edit-account' }"
-          class="bg-blue-500 text-white px-1.5 py-1 rounded-md"
-        >
-          click here to set it for them.
-        </router-link>
-      </p>
     </div>
 
-    <div @click="onCopyToClipboard()" v-if="activeDid" class="text-center">
+    <div @click="onCopyToClipboard()" v-if="activeDid">
       <!--
         Play with display options: https://qr-code-styling.com/
         See docs: https://www.npmjs.com/package/qr-code-generator-vue3
@@ -44,44 +31,33 @@
         :dotsOptions="{ type: 'square' }"
         class="flex justify-center"
       />
-      <span> Click QR to copy your contact URL to your clipboard. </span>
     </div>
     <div class="text-center" v-else>
       You have no identitifiers yet, so
-      <router-link
-        :to="{ name: 'start' }"
-        class="bg-blue-500 text-white px-1.5 py-1 rounded-md"
-      >
+      <router-link :to="{ name: 'start' }" class="text-blue-500">
         create your identifier.
       </router-link>
       <br />
-      If you don't that first, these contacts won't see your activity.
+      We recommend you do that first; otherwise, these contacts won't see your
+      activity.
     </div>
 
-    <div class="text-center">
-      <h1 class="text-4xl text-center font-light pt-6">Scan Contact Info</h1>
-      <qrcode-stream @detect="onScanDetect" @error="onScanError" />
-      <span>
-        If you do not see a scanning camera window here, check your camera
-        permissions.
-      </span>
-    </div>
+    <h1 class="text-4xl text-center font-light pt-4">Scan Contact Info</h1>
+    <qrcode-stream @detect="onScanDetect" @error="onScanError" />
   </section>
 </template>
 
 <script lang="ts">
-import * as didJwt from "did-jwt";
-import { sha256 } from "ethereum-cryptography/sha256.js";
 import QRCodeVue3 from "qr-code-generator-vue3";
-import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
 import { QrcodeStream } from "vue-qrcode-reader";
 import { useClipboard } from "@vueuse/core";
 
-import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { deriveAddress, nextDerivationPath, SimpleSigner } from "@/libs/crypto";
+import * as R from "ramda";
+import { SimpleSigner } from "@/libs/crypto";
+import * as didJwt from "did-jwt";
 import QuickNav from "@/components/QuickNav.vue";
 import { Account } from "@/db/tables/accounts";
 import {
@@ -92,6 +68,13 @@ import {
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;
 
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
+
 @Component({
   components: {
     QrcodeStream,
@@ -100,11 +83,10 @@ const Buffer = require("buffer/").Buffer;
   },
 })
 export default class ContactQRScanShow extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
   apiServer = "";
-  givenName = "";
   qrValue = "";
 
   public async getIdentity(activeDid: string) {
@@ -118,7 +100,7 @@ export default class ContactQRScanShow extends Vue {
 
     if (!identity) {
       throw new Error(
-        "Attempted to show contact info with no identifier available.",
+        "Attempted to show contact info with no identity available.",
       );
     }
     return identity;
@@ -129,7 +111,6 @@ export default class ContactQRScanShow extends Vue {
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
     this.activeDid = settings?.activeDid || "";
     this.apiServer = settings?.apiServer || "";
-    this.givenName = settings?.firstName || "";
 
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
@@ -138,14 +119,6 @@ export default class ContactQRScanShow extends Vue {
       const identity = await this.getIdentity(this.activeDid);
       const publicKeyHex = identity.keys[0].publicKeyHex;
       const publicEncKey = Buffer.from(publicKeyHex, "hex").toString("base64");
-
-      const newDerivPath = nextDerivationPath(account.derivationPath);
-      const nextPublicHex = deriveAddress(account.mnemonic, newDerivPath)[2];
-      const nextPublicEncKey = Buffer.from(nextPublicHex, "hex");
-      const nextPublicEncKeyHash = sha256(nextPublicEncKey);
-      const nextPublicEncKeyHashBase64 =
-        Buffer.from(nextPublicEncKeyHash).toString("base64");
-
       const contactInfo = {
         iat: Date.now(),
         iss: this.activeDid,
@@ -154,7 +127,6 @@ export default class ContactQRScanShow extends Vue {
             (settings?.firstName || "") +
             (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
           publicEncKey,
-          nextPublicEncKeyHash: nextPublicEncKeyHashBase64,
         },
       };
 
@@ -180,6 +152,7 @@ export default class ContactQRScanShow extends Vue {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onScanDetect(content: any) {
     if (content[0]?.rawValue) {
+      //console.log("onDetect", content[0].rawValue);
       localStorage.setItem("contactEndorserUrl", content[0].rawValue);
       this.$router.push({ name: "contacts" });
     } else {
@@ -197,7 +170,7 @@ export default class ContactQRScanShow extends Vue {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   onScanError(error: any) {
-    console.error("Scan was invalid:", error);
+    console.log("Scan was invalid:", error);
     this.$notify(
       {
         group: "alert",

src/views/ContactScanView.vue

@@ -1,5 +1,5 @@
 <template>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">

src/views/ContactsView.vue

@@ -1,6 +1,6 @@
 <template>
   <QuickNav selected="Contacts"></QuickNav>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Heading -->
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Your Contacts
@@ -9,27 +9,26 @@
     <div class="flex justify-between py-2">
       <span />
       <span>
-        <a
-          @click="showHintsForOnboarding()"
+        <router-link
+          :to="{ name: 'help' }"
           class="text-xs uppercase bg-blue-500 text-white px-1.5 py-1 rounded-md ml-1"
         >
-          Onboarding Guide
-        </a>
+          Help
+        </router-link>
       </span>
     </div>
 
     <!-- New Contact -->
-    <div class="mt-4 mb-4 flex items-stretch">
-      <router-link
-        :to="{ name: 'contact-qr' }"
-        class="flex items-center bg-slate-500 text-white px-1.5 py-1 mr-1 rounded-md"
-      >
-        <fa icon="qrcode" class="fa-fw text-2xl" />
-      </router-link>
-      <textarea
+    <div class="mb-4 flex">
+      <span class="self-center bg-slate-500 text-white px-1.5 py-1 rounded-md">
+        <router-link :to="{ name: 'contact-qr' }">
+          <fa icon="qrcode" class="fa-fw" />
+        </router-link>
+      </span>
+      <input
         type="text"
-        placeholder="URL or DID, Name, Public Key, Next Public Key Hash"
-        class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2 h-10"
+        placeholder="DID, Name, Public Key (base 16 or 64)"
+        class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
         v-model="contactInput"
       />
       <button
@@ -44,14 +43,14 @@
       <div class="w-full text-right">
         Hours to Add:
         <input
-          class="border rounded border-slate-400 w-24 text-right"
+          class="border border rounded border-slate-400 w-24 text-right"
           type="text"
           placeholder="1"
           v-model="hourInput"
         />
         <br />
         <input
-          class="border rounded border-slate-400 w-48"
+          class="border border rounded border-slate-400 w-48"
           type="text"
           placeholder="Description"
           v-model="hourDescriptionInput"
@@ -73,13 +72,9 @@
           }}
         </button>
         <br />
-        (Only most recent hours included. To see more, click
-        <span
-          class="text-sm uppercase bg-slate-500 text-white px-1 py-1 rounded-md"
-        >
-          <fa icon="file-lines" class="fa-fw" />
-        </span>
-        )
+        (Only hours shown)
+        <br />
+        (Only recent shown)
       </div>
     </div>
 
@@ -96,9 +91,8 @@
               :entityId="contact.did"
               :iconSize="24"
               class="inline-block align-text-bottom border border-slate-300 rounded"
-              @click="showLargeIdenticon = contact.did"
             ></EntityIcon>
-            {{ contact.name || AppString.NO_CONTACT_NAME }}
+            {{ contact.name || "(no name)" }}
             <button
               class="text-sm uppercase bg-slate-500 text-white px-1 rounded-md"
               @click="
@@ -110,34 +104,16 @@
               <fa icon="pen" class="fa-fw" />
             </button>
           </h2>
-          <div class="text-sm truncate">
-            {{ contact.did }}
-            <button
-              @click="
-                libsUtil.doCopyTwoSecRedo(
-                  contact.did,
-                  () => (showDidCopy = !showDidCopy),
-                )
-              "
-              class="ml-2 mr-2"
-            >
-              <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-            </button>
-            <span v-show="showDidCopy">Copied DID</span>
-          </div>
+          <div class="text-sm truncate">{{ contact.did }}</div>
           <div class="text-sm truncate" v-if="contact.publicKeyBase64">
             Public Key (base 64): {{ contact.publicKeyBase64 }}
           </div>
-          <div class="text-sm truncate" v-if="contact.nextPubKeyHashB64">
-            Next Public Key Hash (base 64):
-            {{ contact.nextPubKeyHashB64 }}
-          </div>
 
           <div id="ContactActions" class="flex gap-1.5 mt-2">
             <div v-if="activeDid">
               <button
                 v-if="contact.seesMe"
-                class="text-sm uppercase bg-slate-500 text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
                 @click="setVisibility(contact, false, true)"
                 title="They can see you"
               >
@@ -145,14 +121,14 @@
               </button>
               <button
                 v-else
-                class="text-sm uppercase bg-slate-500 text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
                 @click="setVisibility(contact, true, true)"
                 title="They cannot see you"
               >
                 <fa icon="eye-slash" class="fa-fw" />
               </button>
               <button
-                class="text-sm uppercase bg-slate-500 text-white mx-0.5 my-0.5 px-2 py-1.5 rounded-md"
+                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
                 @click="checkVisibility(contact)"
                 title="Check Visibility"
                 v-if="activeDid"
@@ -163,14 +139,19 @@
                 @click="register(contact)"
                 class="text-sm uppercase bg-slate-500 text-white ml-6 px-2 py-1.5 rounded-md"
                 v-if="activeDid"
-                title="Registration"
               >
                 <fa
                   v-if="contact.registered"
                   icon="person-circle-check"
                   class="fa-fw"
+                  title="Registered"
+                />
+                <fa
+                  v-else
+                  icon="person-circle-question"
+                  class="fa-fw"
+                  title="Registration Unknown"
                 />
-                <fa v-else icon="person-circle-question" class="fa-fw" />
               </button>
             </div>
 
@@ -189,7 +170,7 @@
               <button
                 class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded-l-md"
                 @click="onClickAddGive(activeDid, contact.did)"
-                :title="givenByMeDescriptions[contact.did] || ''"
+                title="givenByMeDescriptions[contact.did]"
               >
                 To:
                 {{
@@ -208,7 +189,7 @@
               <button
                 class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded-r-md -ml-1.5 border-l border-blue-400"
                 @click="onClickAddGive(contact.did, activeDid)"
-                :title="givenToMeDescriptions[contact.did] || ''"
+                title="givenToMeDescriptions[contact.did]"
               >
                 From:
                 {{
@@ -230,7 +211,7 @@
                   query: { contactDid: contact.did },
                 }"
                 class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-                title="See more given activity"
+                title="See all given activity"
               >
                 <fa icon="file-lines" class="fa-fw" />
               </router-link>
@@ -240,18 +221,6 @@
       </li>
     </ul>
     <p v-else>There are no contacts.</p>
-    <div v-if="showLargeIdenticon" class="fixed z-[100] top-0 inset-x-0 w-full">
-      <div
-        class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-      >
-        <EntityIcon
-          :entityId="showLargeIdenticon"
-          :iconSize="512"
-          class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-          @click="showLargeIdenticon = ''"
-        />
-      </div>
-    </div>
 
     <div v-if="contactEdit !== null" class="dialog-overlay">
       <div class="dialog">
@@ -262,21 +231,19 @@
           placeholder="Name"
           v-model="contactNewName"
         />
-        <div class="flex justify-between">
-          <button
-            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-            @click="onClickSaveName(contactEdit, contactNewName)"
-          >
-            <fa icon="save" />
-          </button>
-          <span class="inline-block w-2" />
-          <button
-            class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
-            @click="onClickCancelName()"
-          >
-            <fa icon="ban" />
-          </button>
-        </div>
+        <button
+          class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
+          @click="onClickSaveName(contactEdit, contactNewName)"
+        >
+          <fa icon="save" />
+        </button>
+        <span class="inline-block w-2" />
+        <button
+          class="text-sm bg-blue-600 text-white px-2 py-1.5 rounded -ml-1.5 border-l border-blue-400"
+          @click="onClickCancelName()"
+        >
+          <fa icon="ban" />
+        </button>
       </div>
     </div>
   </section>
@@ -284,13 +251,11 @@
 
 <script lang="ts">
 import { AxiosError } from "axios";
-import { IndexableType } from "dexie";
 import * as didJwt from "did-jwt";
 import * as R from "ramda";
-import { IIdentifier } from "@veramo/core";
-import { Component, Vue } from "vue-facing-decorator";
 
-import { AppString, NotificationIface } from "@/constants/app";
+import { NotificationIface } from "@/constants/app";
+import { IIdentifier } from "@veramo/core";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
@@ -300,15 +265,13 @@ import {
   SimpleSigner,
 } from "@/libs/crypto";
 import {
-  CONTACT_CSV_HEADER,
   CONTACT_URL_PREFIX,
   GiveServerRecord,
   GiveVerifiableCredential,
-  isDid,
   RegisterVerifiableCredential,
   SERVICE_ID,
 } from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
+import { Component, Vue } from "vue-facing-decorator";
 import QuickNav from "@/components/QuickNav.vue";
 import EntityIcon from "@/components/EntityIcon.vue";
 import { Account } from "@/db/tables/accounts";
@@ -344,14 +307,9 @@ export default class ContactsView extends Vue {
   hourDescriptionInput = "";
   hourInput = "0";
   isRegistered = false;
-  showDidCopy = false;
   showGiveNumbers = false;
   showGiveTotals = true;
   showGiveConfirmed = true;
-  showLargeIdenticon = "";
-
-  AppString = AppString;
-  libsUtil = libsUtil;
 
   async created() {
     await db.open();
@@ -364,16 +322,20 @@ export default class ContactsView extends Vue {
     if (this.showGiveNumbers) {
       this.loadGives();
     }
-    this.contacts = await db.contacts.orderBy("name").toArray();
+    const allContacts = await db.contacts.toArray();
+    this.contacts = R.sort(
+      (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
+      allContacts,
+    );
 
     if (this.contactEndorserUrl) {
-      await this.addContactFromScan(this.contactEndorserUrl);
+      await this.newContactFromScan(this.contactEndorserUrl);
       localStorage.removeItem("contactEndorserUrl");
       this.contactEndorserUrl = "";
     }
   }
 
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
+  public async getIdentity(activeDid: string) {
     await accountsDB.open();
     const accounts = await accountsDB.accounts.toArray();
     const account = R.find((acc) => acc.did === activeDid, accounts) as Account;
@@ -381,7 +343,7 @@ export default class ContactsView extends Vue {
 
     if (!identity) {
       throw new Error(
-        "Attempted to load Give records with no identifier available.",
+        "Attempted to load Give records with no identity available.",
       );
     }
     return identity;
@@ -404,10 +366,6 @@ export default class ContactsView extends Vue {
   }
 
   async loadGives() {
-    if (!this.activeDid) {
-      return;
-    }
-
     const handleResponse = (
       resp: { status: number; data: { data: GiveServerRecord[] } },
       descriptions: Record<string, string>,
@@ -442,11 +400,11 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Retrieval Error",
+            title: "Server Error",
             text:
               "Got an error retrieving your " +
               (useRecipient ? "given" : "received") +
-              " data from the server.",
+              " time from the server.",
           },
           -1,
         );
@@ -497,31 +455,18 @@ export default class ContactsView extends Vue {
       this.givenToMeConfirmed = givenToMeConfirmed;
       this.givenToMeUnconfirmed = givenToMeUnconfirmed;
     } catch (error) {
-      console.error("Error loading gives", error);
       this.$notify(
         {
           group: "alert",
           type: "danger",
-          title: "Load Error",
-          text: "Got an error loading your gives.",
+          title: "Server Error",
+          text: error as string,
         },
         -1,
       );
     }
   }
 
-  showHintsForOnboarding() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "info",
-        title: "Onboard Someone",
-        text: libsUtil.ONBOARD_MESSAGE,
-      },
-      -1,
-    );
-  }
-
   async onClickNewContact(): Promise<void> {
     if (!this.contactInput) {
       this.$notify(
@@ -537,47 +482,12 @@ export default class ContactsView extends Vue {
     }
 
     if (this.contactInput.startsWith(CONTACT_URL_PREFIX)) {
-      await this.addContactFromScan(this.contactInput);
-      return;
-    }
-
-    if (this.contactInput.startsWith(CONTACT_CSV_HEADER)) {
-      const lines = this.contactInput.split(/\n/);
-      const lineAdded = [];
-      for (const line of lines) {
-        if (!line.trim() || line.startsWith(CONTACT_CSV_HEADER)) {
-          continue;
-        }
-        lineAdded.push(this.addContactFromEndorserMobileLine(line));
-      }
-      try {
-        await Promise.all(lineAdded);
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Contacts Added",
-            text: "Each contact was added. Nothing was sent to the server.",
-          },
-          -1, // keeping it up so that the "visibility" message is seen
-        );
-      } catch (e) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Contacts Maybe Added",
-            text: "An error occurred. Some contacts may have been added.",
-          },
-          -1,
-        );
-      }
-      this.contacts = await db.contacts.orderBy("name").toArray();
+      await this.newContactFromScan(this.contactInput);
       return;
     }
 
     let did = this.contactInput;
-    let name, publicKeyInput, nextPublicKeyHashInput;
+    let name, publicKeyBase64;
     const commaPos1 = this.contactInput.indexOf(",");
     if (commaPos1 > -1) {
       did = this.contactInput.substring(0, commaPos1).trim();
@@ -585,76 +495,19 @@ export default class ContactsView extends Vue {
       const commaPos2 = this.contactInput.indexOf(",", commaPos1 + 1);
       if (commaPos2 > -1) {
         name = this.contactInput.substring(commaPos1 + 1, commaPos2).trim();
-        publicKeyInput = this.contactInput.substring(commaPos2 + 1).trim();
-        const commaPos3 = this.contactInput.indexOf(",", commaPos2 + 1);
-        if (commaPos3 > -1) {
-          publicKeyInput = this.contactInput.substring(commaPos2 + 1, commaPos3).trim(); // eslint-disable-line prettier/prettier
-          nextPublicKeyHashInput = this.contactInput.substring(commaPos3 + 1).trim(); // eslint-disable-line prettier/prettier
-        }
+        publicKeyBase64 = this.contactInput.substring(commaPos2 + 1).trim();
       }
     }
     // help with potential mistakes while this sharing requires copy-and-paste
-    let publicKeyBase64 = publicKeyInput;
     if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
       // it must be all hex (compressed public key), so convert
       publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
     }
-    let nextPubKeyHashB64 = nextPublicKeyHashInput;
-    if (nextPubKeyHashB64 && /^[0-9A-Fa-f]{66}$/i.test(nextPubKeyHashB64)) {
-      // it must be all hex (compressed public key), so convert
-      nextPubKeyHashB64 = Buffer.from(nextPubKeyHashB64, "hex").toString("base64"); // eslint-disable-line prettier/prettier
-    }
-    const newContact = {
-      did,
-      name,
-      publicKeyBase64,
-      nextPubKeyHashB64: nextPubKeyHashB64,
-    };
+    const newContact = { did, name, publicKeyBase64 };
     await this.addContact(newContact);
   }
 
-  async addContactFromEndorserMobileLine(line: string): Promise<IndexableType> {
-    // Note that Endorser Mobile puts name first, then did, etc.
-    let name = line;
-    let did = "";
-    let publicKeyInput, seesMe, registered;
-    const commaPos1 = line.indexOf(",");
-    if (commaPos1 > -1) {
-      name = line.substring(0, commaPos1).trim();
-      did = line.substring(commaPos1 + 1).trim();
-      const commaPos2 = line.indexOf(",", commaPos1 + 1);
-      if (commaPos2 > -1) {
-        did = line.substring(commaPos1 + 1, commaPos2).trim();
-        publicKeyInput = line.substring(commaPos2 + 1).trim();
-        const commaPos3 = line.indexOf(",", commaPos2 + 1);
-        if (commaPos3 > -1) {
-          publicKeyInput = line.substring(commaPos2 + 1, commaPos3).trim();
-          seesMe = line.substring(commaPos3 + 1).trim() == "true";
-          const commaPos4 = line.indexOf(",", commaPos3 + 1);
-          if (commaPos4 > -1) {
-            seesMe = line.substring(commaPos3 + 1, commaPos4).trim() == "true";
-            registered = line.substring(commaPos4 + 1).trim() == "true";
-          }
-        }
-      }
-    }
-    // help with potential mistakes while this sharing requires copy-and-paste
-    let publicKeyBase64 = publicKeyInput;
-    if (publicKeyBase64 && /^[0-9A-Fa-f]{66}$/i.test(publicKeyBase64)) {
-      // it must be all hex (compressed public key), so convert
-      publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
-    }
-    const newContact = {
-      did,
-      name,
-      publicKeyBase64,
-      seesMe,
-      registered,
-    };
-    return db.contacts.add(newContact);
-  }
-
-  async addContactFromScan(url: string): Promise<void> {
+  async newContactFromScan(url: string): Promise<void> {
     const payload = getContactPayloadFromJwtUrl(url);
     if (!payload) {
       this.$notify(
@@ -671,7 +524,6 @@ export default class ContactsView extends Vue {
       return this.addContact({
         did: payload.iss,
         name: payload.own.name,
-        nextPubKeyHashB64: payload.own.nextPublicEncKeyHash,
         publicKeyBase64: payload.own.publicEncKey,
       } as Contact);
     }
@@ -690,18 +542,6 @@ export default class ContactsView extends Vue {
       );
       return;
     }
-    if (!isDid(newContact.did)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Invalid DID",
-          text: "The DID is not valid. It must begin with 'did:'",
-        },
-        -1,
-      );
-      return;
-    }
     newContact.seesMe = true; // since we will immediately set that on the server
     return db.contacts
       .add(newContact)
@@ -715,20 +555,10 @@ export default class ContactsView extends Vue {
         if (this.activeDid) {
           this.setVisibility(newContact, true, false);
           addedMessage =
-            "They were added, and your activity is visible to them.";
+            newContact.name +
+            " was added, and your activity is visible to them.";
         } else {
-          addedMessage = "They were added.";
-        }
-        if (this.isRegistered) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "info",
-              title: "New User?",
-              text: "If they are a new user, be sure to register to onboard them.",
-            },
-            -1,
-          );
+          addedMessage = newContact.name + " was added.";
         }
         this.$notify(
           {
@@ -737,28 +567,32 @@ export default class ContactsView extends Vue {
             title: "Contact Added",
             text: addedMessage,
           },
-          -1, // keeping it up so that the "visibility" message is seen
+          5000,
         );
+        if (this.isRegistered) {
+          // putting this last so that it shows on the top
+          this.$notify(
+            {
+              group: "alert",
+              type: "info",
+              title: "New User?",
+              text:
+                "If " +
+                newContact.name +
+                " is a new user, be sure to register them.",
+            },
+            -1,
+          );
+        }
       })
       .catch((err) => {
         console.error("Error when adding contact to storage:", err);
-        let message = "An error prevented this import.";
-        if (
-          err.message?.indexOf("Key already exists in the object store.") > -1
-        ) {
-          message =
-            "A contact with that DID is already in your contact list. Edit them directly below.";
-        }
-        if (err.name === "ConstraintError") {
-          message +=
-            " Check that the contact doesn't conflict with any you already have.";
-        }
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Contact Not Added",
-            text: message,
+            text: "An error prevented this import.",
           },
           -1,
         );
@@ -786,7 +620,7 @@ export default class ContactsView extends Vue {
   async register(contact: Contact) {
     if (
       confirm(
-        "Are you sure you want to register " +
+        "Are you sure you want to use one of your registrations for " +
           this.nameForDid(this.contacts, contact.did) +
           (contact.registered
             ? " -- especially since they are already marked as registered"
@@ -862,17 +696,14 @@ export default class ContactsView extends Vue {
             this.$notify(
               {
                 group: "alert",
-                type: "success",
+                type: "info",
                 title: "Registration Success",
-                text:
-                  (contact.name || "That unnamed person") +
-                  " has been registered.",
+                text: contact.name + " has been registered.",
               },
-              5000,
+              -1,
             );
           }
         } catch (error) {
-          console.error("Error when registering:", error);
           let userMessage = "There was an error. See logs for more info.";
           const serverError = error as AxiosError;
           if (serverError) {
@@ -889,7 +720,7 @@ export default class ContactsView extends Vue {
             {
               group: "alert",
               type: "danger",
-              title: "Registration Error",
+              title: "Server Error",
               text: userMessage,
             },
             -1,
@@ -904,70 +735,62 @@ export default class ContactsView extends Vue {
     visibility: boolean,
     showSuccessAlert: boolean,
   ) {
-    const visibilityPrompt =
-      showSuccessAlert &&
-      (visibility
-        ? "Are you sure you want to make your activity visible to them?"
-        : "Are you sure you want to hide all your activity from them?");
-    if (!visibilityPrompt || confirm(visibilityPrompt)) {
-      const url =
-        this.apiServer +
-        "/api/report/" +
-        (visibility ? "canSeeMe" : "cannotSeeMe");
-      const identity = await this.getIdentity(this.activeDid);
-      const headers = await this.getHeaders(identity);
-      const payload = JSON.stringify({ did: contact.did });
+    const url =
+      this.apiServer +
+      "/api/report/" +
+      (visibility ? "canSeeMe" : "cannotSeeMe");
+    const identity = await this.getIdentity(this.activeDid);
+    const headers = await this.getHeaders(identity);
+    const payload = JSON.stringify({ did: contact.did });
 
-      try {
-        const resp = await this.axios.post(url, payload, { headers });
-        if (resp.status === 200) {
-          if (showSuccessAlert) {
-            this.$notify(
-              {
-                group: "alert",
-                type: "success",
-                title: "Visibility Set",
-                text:
-                  this.nameForDid(this.contacts, contact.did) +
-                  " can " +
-                  (visibility ? "" : "not ") +
-                  "see your activity.",
-              },
-              -1,
-            );
-          }
-          contact.seesMe = visibility;
-          db.contacts.update(contact.did, { seesMe: visibility });
-        } else {
-          console.error(
-            "Got some bad server response when setting visibility: ",
-            resp.status,
-            resp,
-          );
-          const message =
-            resp.data.error?.message || "Got some error setting visibility.";
+    try {
+      const resp = await this.axios.post(url, payload, { headers });
+      if (resp.status === 200) {
+        if (showSuccessAlert) {
           this.$notify(
             {
               group: "alert",
-              type: "danger",
-              title: "Error Setting Visibility",
-              text: message,
+              type: "success",
+              title: "Visibility Set",
+              text:
+                this.nameForDid(this.contacts, contact.did) +
+                " can " +
+                (visibility ? "" : "not ") +
+                "see your activity.",
             },
             -1,
           );
         }
-      } catch (err) {
-        console.error("Got some error when setting visibility:", err);
+        contact.seesMe = visibility;
+        db.contacts.update(contact.did, { seesMe: visibility });
+      } else {
+        console.error(
+          "Got some bad server response when setting visibility: ",
+          resp,
+        );
+        const message =
+          resp.data.error?.message || "Bad server response of " + resp.status;
         this.$notify(
           {
             group: "alert",
             type: "danger",
-            title: "Error Setting Visibility",
-            text: "Check connectivity and try again.",
+            title: "Server Error",
+            text: message,
           },
           -1,
         );
       }
+    } catch (err) {
+      console.error("Got some server error when setting visibility:", err);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Server Error",
+          text: "Check connectivity and try again.",
+        },
+        -1,
+      );
     }
   }
 
@@ -1000,25 +823,25 @@ export default class ContactsView extends Vue {
           -1,
         );
       } else {
-        console.error("Got bad server response checking visibility:", resp);
+        console.log("Got bad server response when checking visibility: ", resp);
         const message = resp.data.error?.message || "Got bad server response.";
         this.$notify(
           {
             group: "alert",
             type: "danger",
-            title: "Error Checking Visibility",
+            title: "Server Error",
             text: message,
           },
           -1,
         );
       }
     } catch (err) {
-      console.error("Caught error from request to check visibility:", err);
+      console.log("Caught error from server request to check visibility:", err);
       this.$notify(
         {
           group: "alert",
           type: "danger",
-          title: "Error Checking Visibility",
+          title: "Server Error",
           text: "Check connectivity and try again.",
         },
         -1,
@@ -1026,13 +849,19 @@ export default class ContactsView extends Vue {
     }
   }
 
+  // from https://stackoverflow.com/a/175787/845494
+  //
+  private isNumeric(str: string): boolean {
+    return !isNaN(+str);
+  }
+
   private nameForDid(contacts: Array<Contact>, did: string): string {
     const contact = R.find((con) => con.did == did, contacts);
     return this.nameForContact(contact);
   }
 
   private nameForContact(contact?: Contact, capitalize?: boolean): string {
-    return contact?.name || (capitalize ? "T" : "t") + "his unnamed user";
+    return contact?.name || (capitalize ? "T" : "t") + "this unnamed user";
   }
 
   async onClickAddGive(fromDid: string, toDid: string): Promise<void> {
@@ -1061,7 +890,7 @@ export default class ContactsView extends Vue {
         return;
       }
     }
-    if (!libsUtil.isNumeric(this.hourInput)) {
+    if (!this.isNumeric(this.hourInput)) {
       this.$notify(
         {
           group: "alert",
@@ -1071,13 +900,13 @@ export default class ContactsView extends Vue {
         },
         -1,
       );
-    } else if (parseFloat(this.hourInput) == 0 && !this.hourDescriptionInput) {
+    } else if (!parseFloat(this.hourInput)) {
       this.$notify(
         {
           group: "alert",
           type: "danger",
           title: "Input Error",
-          text: "Giving no hours or description does nothing.",
+          text: "Giving 0 hours does nothing.",
         },
         -1,
       );
@@ -1087,7 +916,7 @@ export default class ContactsView extends Vue {
           group: "alert",
           type: "danger",
           title: "Status Error",
-          text: "No identifier is available.",
+          text: "No identity is available.",
         },
         -1,
       );
@@ -1117,7 +946,7 @@ export default class ContactsView extends Vue {
             "?",
         )
       ) {
-        this.createAndSubmitContactGive(
+        this.createAndSubmitGive(
           identity,
           fromDid,
           toDid,
@@ -1129,7 +958,7 @@ export default class ContactsView extends Vue {
   }
 
   // similar function is in endorserServer.ts
-  private async createAndSubmitContactGive(
+  private async createAndSubmitGive(
     identity: IIdentifier,
     fromDid: string,
     toDid: string,
@@ -1184,7 +1013,7 @@ export default class ContactsView extends Vue {
               title: "Done",
               text: "Successfully logged time to the server.",
             },
-            5000,
+            -1,
           );
 
           if (fromDid === identity.did) {
@@ -1198,7 +1027,6 @@ export default class ContactsView extends Vue {
           }
         }
       } catch (error) {
-        console.error("Error in createAndSubmitContactGive: ", error);
         let userMessage = "There was an error. See logs for more info.";
         const serverError = error as AxiosError;
         if (serverError) {
@@ -1215,7 +1043,7 @@ export default class ContactsView extends Vue {
           {
             group: "alert",
             type: "danger",
-            title: "Error Sending Give",
+            title: "Server Error",
             text: userMessage,
           },
           -1,

src/views/DiscoverView.vue

@@ -1,9 +1,8 @@
 <template>
   <QuickNav selected="Discover"></QuickNav>
-  <TopMessage />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Heading -->
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Discover
@@ -51,13 +50,13 @@
         <li>
           <a
             href="#"
+            v-bind:class="computedRemoteTabClassNames()"
             @click="
               projects = [];
               isRemoteActive = true;
               isLocalActive = false;
               searchAll();
             "
-            v-bind:class="computedRemoteTabClassNames()"
           >
             Anywhere
             <span
@@ -103,11 +102,11 @@
             class="block py-4 flex gap-4"
           >
             <div class="w-12">
-              <ProjectIcon
+              <EntityIcon
                 :entityId="project.handleId"
                 :iconSize="48"
                 class="block border border-slate-300 rounded-md"
-              ></ProjectIcon>
+              ></EntityIcon>
             </div>
 
             <div class="grow">
@@ -129,36 +128,38 @@
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 
-import QuickNav from "@/components/QuickNav.vue";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import ProjectIcon from "@/components/ProjectIcon.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { Contact } from "@/db/tables/contacts";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import { didInfo, PlanData } from "@/libs/endorserServer";
+import { didInfo, ProjectData } from "@/libs/endorserServer";
+import QuickNav from "@/components/QuickNav.vue";
+import InfiniteScroll from "@/components/InfiniteScroll.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component({
   components: {
-    EntityIcon,
-    InfiniteScroll,
-    ProjectIcon,
     QuickNav,
-    TopMessage,
+    InfiniteScroll,
+    EntityIcon,
   },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
   searchTerms = "";
-  projects: PlanData[] = [];
+  projects: ProjectData[] = [];
   isLoading = false;
   isLocalActive = true;
   isRemoteActive = false;
@@ -172,8 +173,8 @@ export default class DiscoverView extends Vue {
   async mounted() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-    this.activeDid = (settings?.activeDid as string) || "";
-    this.apiServer = (settings?.apiServer as string) || "";
+    this.activeDid = settings?.activeDid || "";
+    this.apiServer = settings?.apiServer || "";
     this.searchBox = settings?.searchBoxes?.[0] || null;
 
     this.allContacts = await db.contacts.toArray();
@@ -217,7 +218,7 @@ export default class DiscoverView extends Vue {
 
       if (!identity) {
         throw new Error(
-          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
         );
       }
 
@@ -254,7 +255,7 @@ export default class DiscoverView extends Vue {
 
       if (response.status !== 200) {
         const details = await response.text();
-        console.error("Problem with full search:", details);
+        console.log("Problem with full search:", details);
         this.$notify(
           {
             group: "alert",
@@ -270,11 +271,11 @@ export default class DiscoverView extends Vue {
 
       const results = await response.json();
 
-      const plans: PlanData[] = results.data;
+      const plans: ProjectData[] = results.data;
       if (plans) {
         for (const plan of plans) {
-          const { name, description, handleId, issuerDid, rowid } = plan;
-          this.projects.push({ name, description, handleId, issuerDid, rowid });
+          const { name, description, handleId, rowid } = plan;
+          this.projects.push({ name, description, handleId, rowid });
         }
         this.remoteCount = this.projects.length;
       } else {
@@ -282,7 +283,7 @@ export default class DiscoverView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
-      console.error("Error with feed load:", e);
+      console.log("Error with feed load:", e);
       this.$notify(
         {
           group: "alert",
@@ -337,7 +338,7 @@ export default class DiscoverView extends Vue {
 
       if (response.status !== 200) {
         const details = await response.text();
-        console.error("Problem with nearby search:", details);
+        console.log("Problem with nearby search:", details);
         this.$notify(
           {
             group: "alert",
@@ -354,16 +355,10 @@ export default class DiscoverView extends Vue {
 
       if (results.data) {
         if (beforeId) {
-          const plans: PlanData[] = results.data;
+          const plans: ProjectData[] = results.data;
           for (const plan of plans) {
-            const { name, description, handleId, issuerDid, rowid } = plan;
-            this.projects.push({
-              name,
-              description,
-              handleId,
-              issuerDid,
-              rowid,
-            });
+            const { name, description, handleId = plan.handleId, rowid } = plan;
+            this.projects.push({ name, description, handleId, rowid });
           }
         } else {
           this.projects = results.data;
@@ -374,7 +369,7 @@ export default class DiscoverView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (e: any) {
-      console.error("Error with feed load:", e);
+      console.log("Error with feed load:", e);
       this.$notify(
         {
           group: "alert",
@@ -422,15 +417,13 @@ export default class DiscoverView extends Vue {
       "py-3": true,
       "rounded-t-lg": true,
       "border-b-2": true,
-
       active: this.isLocalActive,
-      "text-black": this.isLocalActive,
-      "border-black": this.isLocalActive,
+      "text-blue-600": this.isLocalActive,
+      "border-blue-600": this.isLocalActive,
       "font-semibold": this.isLocalActive,
-
-      "text-blue-600": !this.isLocalActive,
       "border-transparent": !this.isLocalActive,
-      "hover:border-slate-400": !this.isLocalActive,
+      "hover:text-slate-600": !this.isLocalActive,
+      "hover:border-slate-300": !this.isLocalActive,
     };
   }
 
@@ -440,15 +433,13 @@ export default class DiscoverView extends Vue {
       "py-3": true,
       "rounded-t-lg": true,
       "border-b-2": true,
-
       active: this.isRemoteActive,
-      "text-black": this.isRemoteActive,
-      "border-black": this.isRemoteActive,
+      "text-blue-600": this.isRemoteActive,
+      "border-blue-600": this.isRemoteActive,
       "font-semibold": this.isRemoteActive,
-
-      "text-blue-600": !this.isRemoteActive,
       "border-transparent": !this.isRemoteActive,
-      "hover:border-slate-400": !this.isRemoteActive,
+      "hover:text-slate-600": !this.isRemoteActive,
+      "hover:border-slate-300": !this.isRemoteActive,
     };
   }
 }

src/views/HelpNotificationsView.vue

@@ -2,7 +2,7 @@
   <QuickNav />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <!-- Back -->
@@ -21,391 +21,45 @@
       </h1>
     </div>
 
-    <!-- eslint-disable prettier/prettier -->
     <div>
-      <p>Here are ways to test notifications and get them working.</p>
+      <p>Here are things to try to get notifications working.</p>
 
-      <h2 class="text-xl font-semibold mt-4">Full Test</h2>
-      <div>
-        <p>
-          If this works then you're all set.
-          <button
-            @click="sendTestWebPushMessage(true)"
-            class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-          >
-            Send Yourself a Test Web Push Message (Through Push Server but
-            Skipping Client Filter)
-          </button>
-        </p>
-      </div>
+      <h2 class="text-xl font-semibold">Test</h2>
+      <p>Somehow call the service-worker self.showNotification</p>
 
-      <h2 class="text-xl font-semibold mt-4">
-        If this app doesn't support notifications...
-        <!-- Note that that exact verbiage shows in a message elsewhere. -->
-      </h2>
-      <div>
-        <p>
-          To be notified of interesting updates, install this app on your device
-          (as opposed to using it inside the browser app). In Chrome, it may prompt
-          you, and you can also look for the "Install" command in the browser
-          settings; on the the desktop, look for this icon in the address bar:
-          <img
-            src="../assets/help/chrome-install-pwa.png"
-            alt="Chrome 'install' icon"
-            class="ml-4"
-          />
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold mt-4">
-        If you must enable notifications...
-        <!-- Note that that exact verbiage shows in a message elsewhere. -->
-      </h2>
-      <div>
-        <p>
-          <button class="text-blue-500" @click="showNotificationChoice()">
-            Click here.
-          </button>
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold mt-4">
-        If you're waiting for system initialization...
-        <!-- Note that that exact verbiage shows in a message elsewhere. -->
-      </h2>
-      <div>
-        <p>
-          ... and it never stops, then there is a problem with the underlying
-          service worker or push server mechanism in your browser. Your best bet
-          is to follow the "Reinstall" steps below or use a different browser.
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold mt-4">Check App Permissions</h2>
-      <div>
-        <p>
-          In Apple iOS, check "Settings" -> "Notifications", look for the Time
-          Safari app (or the browser you're using), and make sure notifications
-          are enabled.
-        </p>
-        <p>
-          In Android, hold on to the app icon, then select "App Info", then
-          "Notifications" and make sure they're enabled. If it's still a problem
-          then go further:
-        </p>
-        <p>
-          If you installed the app with Chrome, make sure there are no other
-          tabs with it open. Here are some ways to clear caches that can mess
-          things up (and note that this clears out data from the installed app
-          -- which is good to do while the app is installed):
-        </p>
-        <ul>
-          <li class="list-disc ml-4">
-            Go to Chrome "App Info", then "Storage & Cache" and "Clear Storage".
-          </li>
-          <li class="list-disc ml-4">
-            Go to Chrome "Settings", then "Privacy and Security" and "Clear
-            "Clear browsing data", then "Cookies and site data". Make sure the
-            "Time Range" at the top shows "All time".
-          </li>
-        </ul>
-        <p>
-          On a Mac, go to "Settings" and check "Notifications".
-          <img
-            src="../assets/help/mac-installed-app-settings.png"
-            alt="Mac app settings"
-            class="ml-4"
-          />
-        </p>
-      </div>
-
-      <h2 class="text-xl font-semibold mt-4">Check Browser Permissions</h2>
-      <div>
-        <p>In Apple iOS, check Settings -> Notifications.</p>
-        <p>In Android, check Settings -> Notifications.</p>
-
-        You can find more details about compatibility
-        <a
-          href="https://developer.mozilla.org/en-US/docs/Web/API/Push_API#browser_compatibility"
-          class="text-blue-500"
-          target="_blank"
-        >
-          here <fa icon="arrow-up-right-from-square" class="fa-fw" />
-        </a>
-      </div>
-
-      <h2 class="text-xl font-semibold mt-4">
-        Check Operating System (OS) Permissions
-      </h2>
-      <div class="px-2">
-        <div>
-          <h3 class="text-lg font-semibold">Mobile Phone - Apple iOS</h3>
-          <div>
-            Notifications require iOS 16.4 or higher. To check your iOS version,
-            go to Settings > General > About > Software Version.
-          </div>
-
-          <h3 class="text-lg font-semibold">Mobile Phone - Google Android</h3>
-          <div>
-            We recommend Chrome. It must be version 42 or higher. Check your
-            version under Settings -> About Chrome.
-          </div>
-
-          <h3 class="text-lg font-semibold">Desktop - Mac</h3>
-          <div>
-            <span>
-              See "System Settings" -> "Notifications" and make sure it is
-              enabled for the browser you're using. Note that these
-              notifications require Mac OS 13; see your macOS version under
-              Apple -> "About This Mac".
-            </span>
-          </div>
-
-          <h3 class="text-lg font-semibold">Desktop - Windows</h3>
-          In Windows, check "Settings" -> "Notifications".
-          <img
-            src="../assets/help/windows-system-enable-notifications.png"
-            alt="Windows system settings"
-            class="ml-4"
-          />
-        </div>
-        <div>
-          You can find more details about compatibility
-          <a
-            href="https://developer.mozilla.org/en-US/docs/Web/API/Push_API#browser_compatibility"
-            class="text-blue-500"
-            target="_blank"
-          >
-            here <fa icon="arrow-up-right-from-square" class="fa-fw" />
-          </a>
-        </div>
-      </div>
-
-      <h2 class="text-xl font-semibold mt-4">Reinstall</h2>
-      <div>
-        <p>
-          If all else fails, uninstall the app, ensure all the browser tabs with
-          it are closed, and clear out caches and storage.
-        </p>
-        <p>
-          Of course, you'll want to back up all your data first -- all seeds as
-          well as the contacts & settings -- on the Account
-          <fa icon="circle-user" /> page.
-        </p>
-        <ul class="ml-4 list-disc">
-          <li>
-            Clear cache.
-            <ul>
-              <li>
-                In mobile, look for the browser app settings. This is true even
-                for an installed app: go to the browser which you used to
-                initially visit timesafari.app, because those settings affect
-                the app. Look for "Delete browsing data" in the "Settings",
-                under "Privacy and Security".
-              </li>
-              <li>
-                In Chrome, go to `chrome://settings/cookies` and "all site data
-                and permissions" for timesafari.app; in Firefox, go to
-                `about:preferences` and search for "cache" then "Manage Data"
-                for timesafari.app. Also manually remove the IndexedDB data if
-                the DBs still show.)
-              </li>
-            </ul>
-          </li>
-          <li>
-            Clear notification permission. (In Chrome, go to
-            `chrome://settings/content/notifications`; in Firefox, go to
-            `about:preferences` and search for "notifications".)
-          </li>
-          <li>
-            Unregister service worker. (In Chrome, go to
-            `chrome://serviceworker-internals/`; in Firefox, go to
-            `about:serviceworkers`.)
-          </li>
-          <li>
-            Clear "Cache Storage". (In Chrome, in dev tools under "Application";
-            in Firefox, in dev tools under "Storage".)
-          </li>
-        </ul>
-        <p>Then reinstall the app.</p>
-      </div>
-
-      <h2 class="text-xl font-semibold mt-4">Tests</h2>
-      <button
-        @click="showTestNotification()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
-      >
-        Send Test Notification Directly to Device (Not Through Push Server)
-      </button>
+      <h2 class="text-xl font-semibold">Check OS-level permissions</h2>
       <p>
-        If that didn't show a notification on your device, the problem is that
-        your browser or your operating system are not allowing notifications
-        through. See "Check App Permissions" and "Check Browser Permissions" and
-        "Check Operating System (OS) Permissions" above.
+        Walk-throughs & screenshots, maybe for all combinations of OS &
+        browsers.
       </p>
 
-      <button
-        @click="alertWebPushSubscription()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
-      >
-        Show Web Push Subscription Info
-      </button>
+      <h2 class="text-xl font-semibold">Check browser-level permissions</h2>
+      <p>Walk-throughs & screenshots for browser settings</p>
+
+      <h2 class="text-xl font-semibold">Explain full reset to start again</h2>
       <p>
-        If that showed "null" then the notification is not active.
-        <button class="text-blue-500" @click="showNotificationChoice()">
-          Click here.
-        </button>
+        Walk-throughs for clearing everything & subscribing anew to get a
+        message
       </p>
 
-      <button
-        @click="sendTestWebPushMessage(true)"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
-      >
-        Send Yourself a Test Web Push Message (Through Push Server but Skipping
-        Client Filter)
-      </button>
-      <p>
-        If that didn't show a notification on your device, there is a problem
-        getting to the push server. Disable notifications and then enable them
-        again.
-      </p>
-
-      <button
-        @click="sendTestWebPushMessage()"
-        class="block w-full text-center text-md bg-slate-500 text-white px-1.5 py-2 rounded-md mt-4 mb-2"
-      >
-        Send Yourself a Test Web Push Message (Through Push Server and Client
-        Filter)
-      </button>
-      <p>
-        If you don't see a message, it could be that there is nothing new for
-        you to see. If the previous test worked, then things should work fine.
-        If you notice a full 24 hours where you get no notification and you know
-        that there are new items that should show, gather as many details as
-        possible and go to the bottom of
-        <router-link to="help" class="text-blue-500"> this page </router-link>
-        for ways to contact us.
-      </p>
+      <h2 class="text-xl font-semibold">Auto-detection</h2>
+      <p>Show results of auto-detection whether they're turned on</p>
     </div>
-    <!-- eslint-enable -->
   </section>
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-
 import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
-import { sendTestThroughPushServer } from "@/libs/util";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component({ components: { QuickNav } })
 export default class HelpNotificationsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  subscription: PushSubscription | null = null;
-
-  async mounted() {
-    try {
-      const registration = await navigator.serviceWorker.ready;
-      this.subscription = await registration.pushManager.getSubscription();
-    } catch (error) {
-      console.error("Mount error:", error);
-    }
-  }
-
-  alertWebPushSubscription() {
-    console.log(
-      "Web push subscription:",
-      JSON.parse(JSON.stringify(this.subscription)), // gives more info than plain console logging
-    );
-    alert(JSON.stringify(this.subscription));
-  }
-
-  async sendTestWebPushMessage(skipFilter: boolean = false) {
-    if (!this.subscription) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Not Subscribed",
-          // Note that this exact verbiage shows in help text.
-          text: "You must enable notifications before testing the web push.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    try {
-      await sendTestThroughPushServer(this.subscription, skipFilter);
-
-      this.$notify(
-        {
-          group: "alert",
-          type: "success",
-          title: "Test Web Push Sent",
-          text:
-            "Check your device for the test web push message" +
-            (skipFilter ? "." : " if there are new items in your feed."),
-        },
-        -1,
-      );
-    } catch (error) {
-      console.error("Got an error sending test notification:", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Sending Test",
-          text: "Got an error sending the test web push notification.",
-        },
-        -1,
-      );
-    }
-  }
-
-  showTestNotification() {
-    const TEST_NOTIFICATION_TITLE = "It Worked";
-    navigator.serviceWorker.ready
-      .then((registration) => {
-        return registration.showNotification(TEST_NOTIFICATION_TITLE, {
-          body: "This is your test notification.",
-        });
-      })
-      .then(() => {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Sent",
-            text: `A notification was triggered, so one should show on your device entitled '${TEST_NOTIFICATION_TITLE}'.`,
-          },
-          5000,
-        );
-      })
-      .catch((error) => {
-        console.error("Got a notification error:", error);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Failed",
-            text: "Got an error sending a notification.",
-          },
-          -1,
-        );
-      });
-  }
-
-  showNotificationChoice() {
-    this.$notify(
-      {
-        group: "modal",
-        type: "notification-permission",
-        title: "", // unused, only here to satisfy type check
-        text: "", // unused, only here to satisfy type check
-      },
-      -1,
-    );
-  }
+  $notify!: (notification: Notification, timeout?: number) => void;
 }
 </script>

src/views/HelpView.vue

@@ -2,7 +2,7 @@
   <QuickNav />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <!-- Back -->
@@ -21,27 +21,25 @@
       </h1>
     </div>
 
-    <!-- eslint-disable prettier/prettier -->
     <div>
       <p>
         This app is a window into data that you and your friends own, focused on
         gifts and collaboration.
       </p>
 
-      <h2 class="text-xl font-semibold">What is the idea here?</h2>
+      <h2 class="text-xl font-semibold">What is the philosophy here?</h2>
       <p>
         We are building networks of people who want to grow a giving society.
-        First of all, you can see what people have given, and also recognize
-        gifts you've seen, in a way that leaves a permanent record -- one that
-        came from you, and the recipient can prove it was for them. This is
-        personally gratifying, but it extends to broader work: volunteers get
-        confirmation of activity, and selectively show off their contributions
-        and network.
+        First of all, you can record ways you've seen people give, and that
+        leaves a permanent record -- one that came from you, and the recipient
+        can prove it was for them. This is personally gratifying, but it extends
+        to broader work: volunteers can get confirmation of activity and
+        selectively show off their contributions and network.
       </p>
       <p>
-        You can show giving and also offer help to ideas, based on others'
-        willingness to help out, too. You can record your own ideas and invite
-        others to collaborate.
+        You can also record projects and plans and invite others to collaborate.
+        Soon you'll be able to see when others are interested and see how much
+        they're willing to contribute, even if there are conditions.
       </p>
       <p>
         This app uses the power of cryptography to build a reputation, recording
@@ -64,21 +62,8 @@
         register others; later, you can create projects, too.
       </p>
       <p>
-        Note that there are rate limits to how many others you can register,
-        so it may take some time to register everyone you want. Take your time...
-        make it an opportunity to get to know their projects, and show your own.
-      </p>
-
-      <h2 class="text-xl font-semibold">
-        I had an identifier, but I reinstalled and I got a new one automatically.
-        How do I restore my old one?
-      </h2>
-      <p>
-        Go
-        <router-link class="text-blue-500" to="/import-account">import your identifier</router-link>.
-        If you don't want the old one, click "Advanced" and check the box to erase it.
-        (The erase option only shows if you have exactly one identifier.
-         For more in-depth surgery, you'll have to erase data from the browser or reinstall.)
+        Note that there are limits to how many others each person can register,
+        so you may have to wait.
       </p>
 
       <h2 class="text-xl font-semibold">How do I add someone else?</h2>
@@ -108,7 +93,7 @@
         <h2 class="text-xl font-semibold">
           How do I backup my identifier (secret) data?
         </h2>
-        <ul class="list-disc list-outside ml-4">
+        <ul class="list-disc list-inside">
           <li>
             Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page.
           </li>
@@ -124,7 +109,7 @@
         <h2 class="text-xl font-semibold">
           How do I backup my other (non-identifier-secret) data?
         </h2>
-        <ul class="list-disc list-outside ml-4">
+        <ul class="list-disc list-inside">
           <li>
             Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page.
           </li>
@@ -138,7 +123,7 @@
 
       <h2 class="text-xl font-semibold">How do I restore my data?</h2>
       <p>
-        There are two steps to restore your data: the identity secrets, then the
+        There are two parts to restore your data: the identity secrets and the
         other data such as settings, contacts, etc.
       </p>
 
@@ -146,7 +131,7 @@
         <h2 class="text-xl font-semibold">
           How do I restore my identifier (secret) data?
         </h2>
-        <ul class="list-disc list-outside ml-4">
+        <ul class="list-disc list-inside">
           <li>
             <router-link class="text-blue-500" to="/import-account">
               Go to the import page
@@ -158,10 +143,12 @@
         <h2 class="text-xl font-semibold">
           How do I restore my other (non-identifier-secret) data?
         </h2>
-        <ul class="list-disc list-outside ml-4">
+        <ul class="list-disc list-inside">
           <li>
-            Go to Your Identity <fa icon="circle-user" class="fa-fw" /> page,
-            click Advanced, and follow the instructions for the Contacts & Settings Database "Import".
+            Make sure you have your backup file (above), then contact us with
+            your interest. This is functionality that has to be written, and
+            your interest will help us prioritize it, but there are also manual
+            ways to restore your data.
           </li>
         </ul>
       </div>
@@ -176,55 +163,14 @@
         </router-link>
       </p>
 
-      <h2 class="text-xl font-semibold">How do I erase my data?</h2>
-      <p>
-        Before doing this, note the two kinds of data to backup: identity data,
-        and other data for contacts and settings (see instructions above).
-      </p>
-      <ul>
-        <li class="list-disc list-outside ml-4">
-          Mobile
-          <ul>
-            <li class="list-disc list-outside ml-4">
-              Chrome: Settings -> Privacy and Security -> Clear Browsing Data
-            </li>
-            <li class="list-disc list-outside ml-4">
-              DuckDuckGo: long hold -> Clear Data (takes effect immediately)
-            </li>
-          </ul>
-        </li>
-        <li class="list-disc list-outside ml-4">
-          Desktop
-          <ul>
-            <li class="list-disc list-outside ml-4">
-              Chrome:
-              <a href="chrome://settings/content/all" class="text-blue-500"
-                >clear here</a
-              >
-              also clear under dev tools Application
-            </li>
-            <li class="list-disc list-outside ml-4">
-              Firefox: <a href="about:preferences">go here</a>, Manage Data,
-              find timesafari.app and select, hit Remove Selected, then Save
-              Changes
-            </li>
-            <li class="list-disc list-outside ml-4">
-              Safari: Settings -> Privacy -> Manage Website Data, search for
-              timesafari.app and select, hit Remove Selected, then Done.
-            </li>
-          </ul>
-        </li>
-      </ul>
-      <p>To erase your data from our servers, contact us (below).</p>
-
       <h2 class="text-xl font-semibold">
         I know there is a record from someone, so why can't I see that info?
       </h2>
       <p>
         If you don't see anything associated with a person, this is typically
         because they have not given you permission to see their information. Ask
-        them to add you to their contact list, and ask specifically to make sure
-        the eye next to your name is open like this
+        them to add you to their contact list and make sure the eye next to your
+        name is open like this
         <fa icon="eye" class="fa-fw" /> and not closed like this
         <fa icon="eye-slash" class="fa-fw" />.
       </p>
@@ -235,22 +181,6 @@
         different page.
       </p>
 
-      <h2 class="text-xl font-semibold">
-        Where do I get help with notifications?
-      </h2>
-      <p>
-        <router-link class="text-blue-500" to="/help-notifications"
-          >Here.</router-link
-        >
-      </p>
-
-      <h2 class="text-xl font-semibold">
-        How do I get higher limits?
-      </h2>
-      <p>
-        Let's talk. Contact us (below).
-      </p>
-
       <h2 class="text-xl font-semibold">
         How do I access even more functionality?
       </h2>
@@ -266,31 +196,11 @@
         </a>
       </p>
 
-      <h2 class="text-xl font-semibold">What are the terms & conditions and the privacy policy?</h2>
-      <p style="display:inline; align-items: center">
-        This work is marked with
-        <a href="http://creativecommons.org/publicdomain/zero/1.0?ref=chooser-v1" target="_blank" rel="license noopener noreferrer">
-          <span class="text-blue-500 mr-1">CC0 1.0</span>
-          <img
-              src="../assets/help/creative-commons-circle.svg"
-              alt="CC circle"
-              width="20"
-              class="display: inline"
-          />
-          <img
-              src="../assets/help/creative-commons-zero.svg"
-              alt="CC zero"
-              width="20"
-              style="display: inline"
-          />
-        </a>
-        <br />
-        For notifications, this service stores push token data; that can be revoked at any time
-        by disabling notifications on the Account <fa icon="circle-user" class="fa-fw" /> page.
-        <br />
-        For all other claim data,
+      <h2 class="text-xl font-semibold">What is your privacy policy?</h2>
+      <p>
+        See
         <a href="https://endorser.ch/privacy-policy" class="text-blue-500">
-          the Endorser Service has this Privacy Policy.
+          the Endorser Service Privacy Policy.
         </a>
       </p>
 
@@ -304,36 +214,38 @@
       </p>
 
       <h2 class="text-xl font-semibold">What app version is this?</h2>
-      <p>{{ package.version }} ({{ commitHash }})</p>
+      <p>
+        {{ package.version }}
+      </p>
 
       <h2 class="text-xl font-semibold">
         For any other questions, including removing your data:
       </h2>
       <p>
         Contact us at
-        <a href="mailto:info@TimeSafari.app" class="text-blue-500"
-          >info@TimeSafari.app</a
-        >
+        <a mailto="info@TimeSafari.app">info@TimeSafari.app</a>
       </p>
     </div>
-    <!-- eslint enable -->
   </section>
 </template>
 
 <script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-
 import * as Package from "../../package.json";
+import { Component, Vue } from "vue-facing-decorator";
 import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
-import { ONBOARD_MESSAGE } from "@/libs/util";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component({ components: { QuickNav } })
 export default class Help extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   package = Package;
-  commitHash = process.env.VUE_APP_GIT_HASH;
 
   showOnboardInfo() {
     this.$notify(
@@ -341,7 +253,8 @@ export default class Help extends Vue {
         group: "alert",
         type: "info",
         title: "Onboard Someone",
-        text: ONBOARD_MESSAGE,
+        // If you edit this, check that the numbers still line up on the side in the alert (on mobile, preferably).
+        text: "1) Check that they've entered their name. 2) Go to the scanning page via the Identity page and then the through the QR icon at the top, and then scan and register them. 3) Have them go to that page and scan you.",
       },
       -1,
     );

src/views/HomeView.vue

@@ -1,129 +1,43 @@
 <template>
-  <QuickNav selected="Home" />
-  <TopMessage />
-
+  <QuickNav selected="Home"></QuickNav>
   <!-- CONTENT -->
-  <section id="Content" class="p-2 pb-24 max-w-3xl mx-auto">
-    <h1 id="ViewHeading" class="text-4xl text-center font-light px-4 mb-8">
+  <section id="Content" class="p-6 pb-24">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Time Safari
     </h1>
 
-    <!-- prompt to install notifications -->
-    <div class="mb-8">
-      <div
-        v-if="!notificationsSupported()"
-        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
-      >
-        <p style="display: inline; align-items: center">
-          This currently doesn't support notifications, so let's fix that.
-          <br />
-          <!-- Note that that exact verbiage shows in the help. -->
-
-          <span v-if="userAgentInfo.getOS().name === 'iOS'">
-            Tap on "Share"<img
-              src="../assets/help/apple-share-icon.svg"
-              alt="Apple 'share' icon"
-              width="30"
-              style="display: inline; margin: 0 5px; vertical-align: middle"
-            />and then "Add to Home Screen"
-            <fa icon="square-plus" title="Apple 'Add' icon" />
-            and go click on that new app.
-          </span>
-          <span
-            v-else-if="userAgentInfo.getBrowser()?.name?.startsWith('Chrome')"
-          >
-            You should see a prompt to install, or you can click on the
-            top-right dots
-            <fa
-              icon="ellipsis-vertical"
-              title="vertical ellipsis"
-              class="fa-fw"
-            />
-            and then "Install"<img
-              src="../assets/help/install-android-chrome.png"
-              alt="Android 'install' icon"
-              width="30"
-              style="display: inline; margin: 0 5px; vertical-align: middle"
-            />
-            and go use that app. If you already did these steps, reload this app
-            so that it is fully detected.
-          </span>
-          <span v-else>
-            Try
-            <a href="https://www.google.com/chrome/" class="text-blue-500"
-              >Google Chrome</a
-            >
-            or look for a way to install as an app from this browser.
-          </span>
-        </p>
-      </div>
-    </div>
-
-    <div v-if="showShortcutBvc" class="mb-4">
-      <router-link
-        :to="{ name: 'quick-action-bvc' }"
-        class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
-      >
-        Bountiful Voluntaryist Community Actions</router-link
-      >
-    </div>
-
     <!-- show the actions for recognizing a give -->
     <div class="mb-8">
-      <div v-if="isCreatingIdentifier">
-        <p class="text-slate-500 text-center italic mt-4 mb-4">
-          <fa icon="spinner" class="fa-spin-pulse"></fa> Loading&hellip;
-        </p>
-      </div>
-      <div
-        v-if="!activeDid && !isCreatingIdentifier"
-        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
-      >
-        <p class="text-lg mb-3">
-          Want to connect with your contacts, or share contributions or
-          projects?
-        </p>
-        <router-link
-          :to="{ name: 'start' }"
-          class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
-        >
-          Create An Identifier</router-link
+      <div v-if="!activeDid">
+        To record others' giving,
+        <router-link :to="{ name: 'start' }" class="text-blue-500">
+          create your identifier.</router-link
         >
       </div>
 
-      <div
-        v-else-if="!isRegistered"
-        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
-      >
-        Someone must register your identifier before you can record anyone's
-        giving.
-        <router-link
-          :to="{ name: 'contact-qr' }"
-          class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
+      <div v-else-if="!isRegistered">
+        To record others' giving, someone must register your account, so show
+        them
+        <router-link :to="{ name: 'contact-qr' }" class="text-blue-500">
+          your identity info</router-link
         >
-          Show Them Your Identifier Info</router-link
-        >
-        <br />
-        To double-check that you're registered,
-        <br />
+        and then
         <router-link :to="{ name: 'account' }" class="text-blue-500">
-          see your Usage Limits on the Account
-          <fa icon="circle-user" /> page.</router-link
+          check your limits.</router-link
         >
       </div>
 
       <div v-else>
         <!-- activeDid && isRegistered -->
-        <div class="mb-4">
-          <h2 class="text-xl font-bold">Record Something Given By:</h2>
-        </div>
+        <h2 class="text-xl font-bold">Record Something Given</h2>
 
         <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
           <li @click="openDialog()">
-            <img
-              src="../assets/blank-square.svg"
+            <EntityIcon
+              :entityId="null"
+              :iconSize="64"
               class="mx-auto border border-slate-300 rounded-md mb-1"
-            />
+            ></EntityIcon>
             <h3
               class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
             >
@@ -131,7 +45,7 @@
             </h3>
           </li>
           <li
-            v-for="contact in allContacts.slice(0, 7)"
+            v-for="contact in allContacts"
             :key="contact.did"
             @click="openDialog(contact)"
           >
@@ -139,7 +53,7 @@
               :entityId="contact.did"
               :iconSize="64"
               class="mx-auto border border-slate-300 rounded-md mb-1"
-            />
+            ></EntityIcon>
             <h3
               class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
             >
@@ -148,20 +62,21 @@
           </li>
         </ul>
 
-        <div class="flex justify-between">
-          <router-link
-            v-if="allContacts.length >= 7"
-            :to="{ name: 'contact-gives' }"
-            class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
-          >
-            Choose From All Contacts
-          </router-link>
-          <button
-            @click="openGiftedPrompts()"
-            class="block text-center text-md font-bold bg-slate-500 text-white px-2 py-3 rounded-md"
-          >
-            Ideas...
-          </button>
+        <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
+        <router-link
+          v-if="allContacts.length >= 7"
+          :to="{ name: 'contact-gives' }"
+          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
+        >
+          Show More Contacts&hellip;
+        </router-link>
+
+        <!-- If there are no contacts, show this instead: -->
+        <div
+          class="rounded border border-dashed border-slate-300 bg-slate-100 px-4 py-3 text-center italic text-slate-500"
+          v-if="allContacts.length === 0"
+        >
+          (No contacts to show.)
         </div>
       </div>
     </div>
@@ -171,133 +86,83 @@
       message="Received from"
       showGivenToUser="true"
     />
-    <GiftedPrompts ref="giftedPrompts" />
 
-    <!-- Results List -->
     <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
       <h2 class="text-xl font-bold mb-4">Latest Activity</h2>
-      <InfiniteScroll @reached-bottom="loadMoreGives">
-        <ul class="border-t border-slate-300">
-          <li
-            class="border-b border-slate-300 py-2"
-            v-for="record in feedData"
-            :key="record.jwtId"
-          >
-            <div
-              class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
-              v-if="record.jwtId == feedLastViewedClaimId"
-            >
-              You've already seen all the following
-            </div>
-
-            <div class="grid grid-cols-12">
-              <span class="col-span-11 justify-self-start">
-                <span>
-                  <fa
-                    v-if="record.giver.known || record.receiver.known"
-                    icon="circle-user"
-                    class="col-span-1 pt-1 pl-0 pr-3 text-slate-500"
-                  />
-                  <fa
-                    v-else
-                    icon="gift"
-                    class="col-span-1 pt-1 pl-3 pr-0 text-slate-500"
-                  />
-                </span>
-                {{ giveDescription(record) }}
-                <a @click="onClickLoadClaim(record.jwtId)">
-                  <fa
-                    icon="circle-info"
-                    class="pl-2 text-blue-500 cursor-pointer"
-                  ></fa>
-                </a>
-              </span>
-              <span class="col-span-1 justify-self-end shrink">
-                <router-link
-                  v-if="record.fulfillsPlanHandleId"
-                  :to="
-                    '/project/' +
-                    encodeURIComponent(record.fulfillsPlanHandleId)
-                  "
-                  class="justify-end"
-                >
-                  <fa icon="hammer" class="ml-4 pl-2 text-blue-500"></fa>
-                </router-link>
-              </span>
-            </div>
-          </li>
-        </ul>
-      </InfiniteScroll>
-      <div v-if="isFeedLoading">
+      <div :class="{ hidden: isHiddenSpinner }">
         <p class="text-slate-500 text-center italic mt-4 mb-4">
           <fa icon="spinner" class="fa-spin-pulse"></fa> Loading&hellip;
         </p>
       </div>
+      <ul class="border-t border-slate-300">
+        <li
+          class="border-b border-slate-300 py-2"
+          v-for="record in feedData"
+          :key="record.jwtId"
+        >
+          <div
+            class="border-b border-dashed border-slate-400 text-orange-400 pb-2 mb-2 font-bold uppercase text-sm"
+            v-if="record.jwtId == feedLastViewedId"
+          >
+            You've seen all the following
+          </div>
+          <div class="flex">
+            <fa icon="gift" class="pt-1 pr-2 text-slate-500"></fa>
+            <!-- icon values: "coins" = money; "clock" = time; "gift" = others -->
+            <span class="">{{ this.giveDescription(record) }}</span>
+          </div>
+        </li>
+      </ul>
     </div>
   </section>
 </template>
 
 <script lang="ts">
-import { UAParser } from "ua-parser-js";
-import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";
-
-import EntityIcon from "@/components/EntityIcon.vue";
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import GiftedPrompts from "@/components/GiftedPrompts.vue";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { NotificationIface } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
-import { Account } from "@/db/tables/accounts";
-import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import {
-  contactForDid,
-  didInfoForContact,
+  didInfo,
   GiverInputInfo,
   GiveServerRecord,
 } from "@/libs/endorserServer";
-import { generateSaveAndActivateIdentity } from "@/libs/util";
+import { Contact } from "@/db/tables/contacts";
+import QuickNav from "@/components/QuickNav.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
+import { IIdentifier } from "@veramo/core";
+import { Account } from "@/db/tables/accounts";
 
-interface GiveRecordWithContactInfo extends GiveServerRecord {
-  giver: {
-    displayName: string;
-    known: boolean;
-  };
-  receiver: {
-    displayName: string;
-    known: boolean;
-  };
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
 }
 
 @Component({
-  components: {
-    GiftedDialog,
-    GiftedPrompts,
-    QuickNav,
-    EntityIcon,
-    InfiniteScroll,
-    TopMessage,
-  },
+  components: { GiftedDialog, QuickNav, EntityIcon },
 })
 export default class HomeView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
   allContacts: Array<Contact> = [];
   allMyDids: Array<string> = [];
   apiServer = "";
-  feedData: GiveRecordWithContactInfo[] = [];
+  feedAllLoaded = false;
+  feedData = [];
   feedPreviousOldestId?: string;
-  feedLastViewedClaimId?: string;
-  isCreatingIdentifier = false;
-  isFeedLoading = true;
+  feedLastViewedId?: string;
+  isHiddenSpinner = true;
   isRegistered = false;
-  showShortcutBvc = false;
-  userAgentInfo = new UAParser(); // see https://docs.uaparser.js.org/v2/api/ua-parser-js/get-os.html
+  numAccounts = 0;
+
+  async beforeCreate() {
+    await accountsDB.open();
+    this.numAccounts = await accountsDB.accounts.count();
+  }
 
   public async getIdentity(activeDid: string) {
     await accountsDB.open();
@@ -329,24 +194,11 @@ export default class HomeView extends Vue {
       this.apiServer = settings?.apiServer || "";
       this.activeDid = settings?.activeDid || "";
       this.allContacts = await db.contacts.toArray();
-      this.feedLastViewedClaimId = settings?.lastViewedClaimId;
+      this.feedLastViewedId = settings?.lastViewedClaimId;
       this.isRegistered = !!settings?.isRegistered;
-      this.showShortcutBvc = !!settings?.showShortcutBvc;
-
-      if (this.allMyDids.length === 0) {
-        this.isCreatingIdentifier = true;
-        this.activeDid = await generateSaveAndActivateIdentity();
-        this.allMyDids = [this.activeDid];
-        this.isCreatingIdentifier = false;
-      }
-
-      // this returns a Promise but we don't need to wait for it
-
-      await this.updateAllFeed();
-
+      this.updateAllFeed();
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (err: any) {
-      console.error("Error retrieving settings or feed.", err);
       this.$notify(
         {
           group: "alert",
@@ -354,17 +206,13 @@ export default class HomeView extends Vue {
           title: "Error",
           text:
             err.userMessage ||
-            "There was an error retrieving your settings or the latest activity.",
+            "There was an error retrieving the latest sweet, sweet action.",
         },
         -1,
       );
     }
   }
 
-  notificationsSupported() {
-    return "Notification" in window;
-  }
-
   public async buildHeaders() {
     const headers: HeadersInit = {
       "Content-Type": "application/json",
@@ -380,7 +228,7 @@ export default class HomeView extends Vue {
 
       if (!identity) {
         throw new Error(
-          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+          "An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
         );
       }
 
@@ -391,100 +239,54 @@ export default class HomeView extends Vue {
     return headers;
   }
 
-  /**
-   * Data loader used by infinite scroller
-   * @param payload is the flag from the InfiniteScroll indicating if it should load
-   **/
-  public async loadMoreGives(payload: boolean) {
-    if (payload) {
-      this.updateAllFeed();
-    }
-  }
-
   public async updateAllFeed() {
-    this.isFeedLoading = true;
-    await this.retrieveGives(this.apiServer, this.feedPreviousOldestId)
+    this.isHiddenSpinner = false;
+    await this.retrieveClaims(this.apiServer, this.feedPreviousOldestId)
       .then(async (results) => {
         if (results.data.length > 0) {
-          // include the descriptions of the giver and receiver
-          const newFeedData: GiveRecordWithContactInfo = results.data.map(
-            (record: GiveServerRecord) => {
-              // similar code is in endorser-mobile utility.ts
-              // claim.claim happen for some claims wrapped in a Verifiable Credential
-              // eslint-disable-next-line @typescript-eslint/no-explicit-any
-              const claim = (record.fullClaim as any).claim || record.fullClaim;
-              // agent.did is for legacy data, before March 2023
-              const giverDid =
-                claim.agent?.identifier || (claim.agent as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
-              // recipient.did is for legacy data, before March 2023
-              const recipientDid =
-                claim.recipient?.identifier || (claim.recipient as any)?.did; // eslint-disable-line @typescript-eslint/no-explicit-any
-              return {
-                ...record,
-                giver: didInfoForContact(
-                  giverDid,
-                  this.activeDid,
-                  contactForDid(giverDid, this.allContacts),
-                  this.allMyDids,
-                ),
-                receiver: didInfoForContact(
-                  recipientDid,
-                  this.activeDid,
-                  contactForDid(recipientDid, this.allContacts),
-                  this.allMyDids,
-                ),
-              };
-            },
-          );
-          this.feedData = this.feedData.concat(newFeedData);
+          this.feedData = this.feedData.concat(results.data);
+          this.feedAllLoaded = results.hitLimit;
           this.feedPreviousOldestId =
             results.data[results.data.length - 1].jwtId;
-          // The following update is only done on the first load.
           if (
-            this.feedLastViewedClaimId == null ||
-            this.feedLastViewedClaimId < results.data[0].jwtId
+            this.feedLastViewedId == null ||
+            this.feedLastViewedId < results.data[0].jwtId
           ) {
             await db.open();
             db.settings.update(MASTER_SETTINGS_KEY, {
               lastViewedClaimId: results.data[0].jwtId,
             });
+            // but not for this page because we need to remember what it was before
           }
         }
       })
       .catch((e) => {
-        console.error("Error with feed load:", e);
+        console.log("Error with feed load:", e);
         this.$notify(
           {
             group: "alert",
             type: "danger",
-            title: "Feed Error",
+            title: "Export Error",
             text: e.userMessage || "There was an error retrieving feed data.",
           },
           -1,
         );
       });
-    this.isFeedLoading = false;
+
+    this.isHiddenSpinner = true;
   }
 
-  /**
-   * Retrieve claims in reverse chronological order
-   *
-   * @param beforeId the earliest ID (of previous searches) to search earlier
-   * @return claims in reverse chronological order
-   */
-  public async retrieveGives(endorserApiServer: string, beforeId?: string) {
+  public async retrieveClaims(endorserApiServer: string, beforeId?: string) {
     const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
     const response = await fetch(
-      endorserApiServer +
-        "/api/v2/report/gives?giftNotTrade=true&" +
-        beforeQuery,
+      endorserApiServer + "/api/v2/report/gives?" + beforeQuery,
       {
         method: "GET",
         headers: await this.buildHeaders(),
       },
     );
 
-    if (!response.ok) {
+    if (response.status !== 200) {
       throw await response.text();
     }
 
@@ -497,59 +299,46 @@ export default class HomeView extends Vue {
     }
   }
 
-  giveDescription(giveRecord: GiveRecordWithContactInfo) {
+  giveDescription(giveRecord: GiveServerRecord) {
     // similar code is in endorser-mobile utility.ts
     // claim.claim happen for some claims wrapped in a Verifiable Credential
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const claim = (giveRecord.fullClaim as any).claim || giveRecord.fullClaim;
-
+    // agent.did is for legacy data, before March 2023
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const giverDid = claim.agent?.identifier || (claim.agent as any)?.did;
+    const giverInfo = didInfo(
+      giverDid,
+      this.activeDid,
+      this.allMyDids,
+      this.allContacts,
+    );
     let gaveAmount = claim.object?.amountOfThisGood
       ? this.displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
       : "";
     if (claim.description) {
       if (gaveAmount) {
-        gaveAmount = " (and " + gaveAmount + ")";
+        gaveAmount = gaveAmount + ", and also: ";
       }
-      gaveAmount = claim.description + gaveAmount;
+      gaveAmount = gaveAmount + claim.description;
     }
     if (!gaveAmount) {
       gaveAmount = "something not described";
     }
-
-    /**
-     * Only show giver and/or receiver info first if they're named.
-     * - If only giver is named, show "... gave"
-     * - If only receiver is named, show "... received"
-     */
-
-    const giverInfo = giveRecord.giver;
-    const recipientInfo = giveRecord.receiver;
-    if (giverInfo.known && recipientInfo.known) {
-      // both giver and recipient are named
-      return `${giverInfo.displayName} gave to ${recipientInfo.displayName}: ${gaveAmount}`;
-    } else if (giverInfo.known) {
-      // giver is named but recipient is not
-      return `${giverInfo.displayName} gave: ${gaveAmount} (to ${recipientInfo.displayName})`;
-    } else if (recipientInfo.known) {
-      // recipient is named but giver is not
-      return `${recipientInfo.displayName} received: ${gaveAmount} (from ${giverInfo.displayName})`;
-    } else {
-      // neither giver nor recipient are named
-      let peopleInfo;
-      if (giverInfo.displayName === recipientInfo.displayName) {
-        peopleInfo = `between two who are ${giverInfo.displayName}`;
-      } else {
-        peopleInfo = `from ${giverInfo.displayName} to ${recipientInfo.displayName}`;
-      }
-      return gaveAmount + " (" + peopleInfo + ")";
-    }
-  }
-
-  onClickLoadClaim(jwtId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(jwtId),
-    };
-    this.$router.push(route);
+    // recipient.did is for legacy data, before March 2023
+    const gaveRecipientId =
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      claim.recipient?.identifier || (claim.recipient as any)?.did;
+    const gaveRecipientInfo = gaveRecipientId
+      ? " to " +
+        didInfo(
+          gaveRecipientId,
+          this.activeDid,
+          this.allMyDids,
+          this.allContacts,
+        )
+      : "";
+    return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
   }
 
   displayAmount(code: string, amt: number) {
@@ -560,12 +349,8 @@ export default class HomeView extends Vue {
     return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
   }
 
-  openDialog(giver?: GiverInputInfo) {
+  openDialog(giver: GiverInputInfo) {
     (this.$refs.customDialog as GiftedDialog).open(giver);
   }
-
-  openGiftedPrompts() {
-    (this.$refs.giftedPrompts as GiftedPrompts).open();
-  }
 }
 </script>

src/views/IdentitySwitcherView.vue

@@ -1,6 +1,6 @@
 <template>
   <QuickNav selected="Profile"></QuickNav>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
@@ -18,23 +18,16 @@
     <!-- Identity List -->
 
     <!-- Current Identity - Display First! -->
-    <div
-      v-if="activeDid && !activeDidInIdentities"
-      class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-4"
-    >
-      <fa icon="circle-check" class="fa-fw text-red-600 text-xl mr-3"></fa>
-      <div class="text-sm text-slate-500">
-        <div class="overflow-hidden truncate">
+    <div class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-4">
+      <fa icon="circle-check" class="fa-fw text-blue-600 text-xl mr-3"></fa>
+      <span class="overflow-hidden">
+        <h2 class="text-xl font-semibold mb-0">
+          {{ givenName }}
+        </h2>
+        <div class="text-sm text-slate-500 truncate">
           <b>ID:</b> <code>{{ activeDid }}</code>
         </div>
-        <b
-          >There is a data corruption error: this identity is selected but it is
-          not in storage. You cannot send any more claims with this identity
-          until you import the seed again. This may require reinstalling the
-          app; if you know how, you can also clear out the TimeSafariAccounts
-          IndexedDB. Be sure to back up all your Settings & Contacts first.</b
-        >
-      </div>
+      </span>
     </div>
 
     <!-- Other Identity/ies -->
@@ -45,12 +38,7 @@
         :key="ident.did"
         @click="switchAccount(ident.did)"
       >
-        <fa
-          v-if="ident.did === activeDid"
-          icon="circle-check"
-          class="fa-fw text-blue-600 text-xl mr-3"
-        />
-        <fa v-else icon="circle" class="fa-fw text-slate-400 text-xl mr-3" />
+        <fa icon="circle" class="fa-fw text-slate-400 text-xl mr-3"></fa>
         <span class="overflow-hidden">
           <h2 class="text-xl font-semibold mb-0"></h2>
           <div class="text-sm text-slate-500 truncate">
@@ -80,26 +68,42 @@
 </template>
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-
-import { AppString, NotificationIface } from "@/constants/app";
+import { AppString } from "@/constants/app";
 import { db, accountsDB } from "@/db/index";
 import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import QuickNav from "@/components/QuickNav.vue";
 
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
+
 @Component({ components: { QuickNav } })
 export default class IdentitySwitcherView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   Constants = AppString;
   public accounts: typeof AccountsSchema;
   public activeDid = "";
-  public activeDidInIdentities = false;
   public apiServer = "";
   public apiServerInput = "";
+  public givenName = "";
   public otherIdentities: Array<{ did: string }> = [];
   public showContactGives = false;
 
+  public async getIdentity(activeDid: string) {
+    await accountsDB.open();
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
+    const identity = JSON.parse((account?.identity as string) || "null");
+    return identity;
+  }
+
   async created() {
     try {
       await db.open();
@@ -107,15 +111,24 @@ export default class IdentitySwitcherView extends Vue {
       this.activeDid = settings?.activeDid || "";
       this.apiServer = settings?.apiServer || "";
       this.apiServerInput = settings?.apiServer || "";
+      this.givenName =
+        (settings?.firstName || "") +
+        (settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
       this.showContactGives = !!settings?.showContactGivesInline;
 
+      const identity = await this.getIdentity(this.activeDid);
+
+      if (identity) {
+        db.settings.update(MASTER_SETTINGS_KEY, {
+          activeDid: identity.did,
+        });
+      }
       await accountsDB.open();
       const accounts = await accountsDB.accounts.toArray();
       for (let n = 0; n < accounts.length; n++) {
         const did = JSON.parse(accounts[n].identity)["did"];
-        this.otherIdentities.push({ did: did });
-        if (did && this.activeDid === did) {
-          this.activeDidInIdentities = true;
+        if (did && this.activeDid !== did) {
+          this.otherIdentities.push({ did: did });
         }
       }
     } catch (err) {
@@ -141,6 +154,16 @@ export default class IdentitySwitcherView extends Vue {
     await db.settings.update(MASTER_SETTINGS_KEY, {
       activeDid: did,
     });
+    this.activeDid = did || "";
+    this.otherIdentities = [];
+    await accountsDB.open();
+    const accounts = await accountsDB.accounts.toArray();
+    for (let n = 0; n < accounts.length; n++) {
+      const did = JSON.parse(accounts[n].identity)["did"];
+      if (did && this.activeDid !== did) {
+        this.otherIdentities.push({ did: did });
+      }
+    }
     this.$router.push({ name: "account" });
   }
 }

src/views/ImportAccountView.vue

@@ -1,5 +1,5 @@
 <template>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
@@ -10,12 +10,12 @@
         >
           <fa icon="chevron-left"></fa>
         </button>
-        Import Existing Identifier
+        Import Existing Identity
       </h1>
     </div>
     <!-- Import Account Form -->
     <p class="text-center text-xl mb-4 font-light">
-      Enter your seed phrase below to import your identifier on this device.
+      Enter your seed phrase below to import your identity on this device.
     </p>
     <!-- id used by puppeteer test script -->
     <input
@@ -25,7 +25,7 @@
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
       v-model="mnemonic"
     />
-
+    {{ mnemonic }}
     <h3
       class="text-sm uppercase font-semibold mb-3"
       @click="showAdvanced = !showAdvanced"
@@ -36,28 +36,17 @@
       Enter a custom derivation path
       <input
         type="text"
-        class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
         v-model="derivationPath"
       />
-      <span class="ml-4">
-        For previous uPort or Endorser users,
-        <a
-          @click="derivationPath = UPORT_DERIVATION_PATH"
-          class="text-blue-500"
-        >
-          click here to use that value.
-        </a>
-      </span>
-
-      <div class="mt-4" v-if="numAccounts == 1">
-        <input type="checkbox" class="mr-2" v-model="shouldErase" />
-        <label>Erase the previous identifier.</label>
-      </div>
+      For previous uPort or Endorser users,
+      <a @click="derivationPath = UPORT_DERIVATION_PATH" class="text-blue-500">
+        click here to use that value.
+      </a>
     </div>
-
     <div class="mt-8">
       <button
-        @click="fromMnemonic()"
+        @click="from_mnemonic()"
         class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
       >
         Import
@@ -75,15 +64,13 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-
-import { NotificationIface } from "@/constants/app";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
   newIdentifier,
-} from "@/libs/crypto";
+} from "../libs/crypto";
+import { accountsDB, db } from "@/db/index";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 
 @Component({
   components: {},
@@ -91,29 +78,20 @@ import {
 export default class ImportAccountView extends Vue {
   UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'"; // for legacy imports, likely never used
 
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
   mnemonic = "";
   address = "";
-  numAccounts = 0;
   privateHex = "";
   publicHex = "";
   derivationPath = DEFAULT_ROOT_DERIVATION_PATH;
   showAdvanced = false;
-  shouldErase = false;
-
-  async created() {
-    await accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
-  }
 
   public onCancelClick() {
     this.$router.back();
   }
 
-  public async fromMnemonic() {
+  public async from_mnemonic() {
     const mne: string = this.mnemonic.trim().toLowerCase();
-    try {
+    if (this.mnemonic.trim().length > 0) {
       [this.address, this.privateHex, this.publicHex] = deriveAddress(
         mne,
         this.derivationPath,
@@ -126,48 +104,25 @@ export default class ImportAccountView extends Vue {
         this.derivationPath,
       );
 
-      await accountsDB.open();
-      if (this.shouldErase) {
-        await accountsDB.accounts.clear();
-      }
-      await accountsDB.accounts.add({
-        dateCreated: new Date().toISOString(),
-        derivationPath: this.derivationPath,
-        did: newId.did,
-        identity: JSON.stringify(newId),
-        mnemonic: mne,
-        publicKeyHex: newId.keys[0].publicKeyHex,
-      });
+      try {
+        await accountsDB.open();
+        await accountsDB.accounts.add({
+          dateCreated: new Date().toISOString(),
+          derivationPath: this.derivationPath,
+          did: newId.did,
+          identity: JSON.stringify(newId),
+          mnemonic: mne,
+          publicKeyHex: newId.keys[0].publicKeyHex,
+        });
 
-      // record that as the active DID
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        activeDid: newId.did,
-      });
-      this.$router.push({ name: "account" });
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.error("Error saving mnemonic & updating settings:", err);
-      if (err == "Error: invalid mnemonic") {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Invalid Mnemonic",
-            text: "Please check your mnemonic and try again.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Got an error creating that identifier.",
-          },
-          -1,
-        );
+        // record that as the active DID
+        await db.open();
+        db.settings.update(MASTER_SETTINGS_KEY, {
+          activeDid: newId.did,
+        });
+        this.$router.push({ name: "account" });
+      } catch (err) {
+        console.error("Error saving mnemonic & updating settings:", err);
       }
     }
   }

src/views/ImportDerivedAccountView.vue

@@ -1,5 +1,5 @@
 <template>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
@@ -72,7 +72,6 @@ import {
   DEFAULT_ROOT_DERIVATION_PATH,
   deriveAddress,
   newIdentifier,
-  nextDerivationPath,
 } from "../libs/crypto";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
@@ -122,7 +121,17 @@ export default class ImportAccountView extends Vue {
       }
     });
     // increment the last number in that max derivation path
-    const newDerivPath = nextDerivationPath(accountWithMaxDeriv.derivationPath);
+    let lastStr = accountWithMaxDeriv.derivationPath.split("/").slice(-1)[0];
+    if (lastStr.endsWith("'")) {
+      lastStr = lastStr.slice(0, -1);
+    }
+    const lastNum = parseInt(lastStr, 10);
+    const newLastNum = lastNum + 1;
+    const newDerivPath = accountWithMaxDeriv.derivationPath
+      .split("/")
+      .slice(0, -1)
+      .concat([newLastNum.toString() + "'"])
+      .join("/");
 
     const mne: string = accountWithMaxDeriv.mnemonic;
 

src/views/NewEditAccountView.vue

@@ -1,5 +1,5 @@
 <template>
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
@@ -68,7 +68,7 @@ export default class NewEditAccountView extends Vue {
     });
     localStorage.setItem("firstName", this.givenName as string);
     localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
-    this.$router.back();
+    this.$router.push({ name: "account" });
   }
 
   onClickCancel() {

src/views/NewEditCommitmentView.vue

@@ -0,0 +1,67 @@
+<template>
+  <!-- CONTENT -->
+  <section id="Content" class="p-6 pb-24">
+    <!-- Breadcrumb -->
+    <div id="ViewBreadcrumb" class="mb-8">
+      <h1 class="text-lg text-center font-light relative px-7">
+        <!-- Cancel -->
+        <router-link
+          :to="{ name: 'project' }"
+          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
+          ><fa icon="chevron-left" class="fa-fw"></fa>
+        </router-link>
+
+        Make Commitment
+      </h1>
+    </div>
+
+    <!-- Project Details -->
+
+    <select class="block w-full rounded border border-slate-400 mb-4 px-3 py-2">
+      <option disabled>Choose a commitment type…</option>
+      <option selected>Time</option>
+      <option>Cryptocurrency</option>
+      <option>Money</option>
+    </select>
+
+    <!-- Time amount -->
+    <div class="mb-4 flex items-stretch">
+      <input
+        type="number"
+        placeholder="0.0"
+        class="block w-full rounded-l border border-slate-400 px-3 py-2"
+      />
+      <span
+        class="px-4 py-2 rounded-r bg-slate-200 border border-l-0 border-slate-400"
+        >hours</span
+      >
+    </div>
+
+    <!-- Crypto amount -->
+
+    <!-- Money amount -->
+
+    <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="Commit"
+      />
+      <button
+        type="button"
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+      >
+        Maybe Later
+      </button>
+    </div>
+  </section>
+</template>
+
+<script lang="ts">
+import { Component, Vue } from "vue-facing-decorator";
+
+@Component({
+  components: {},
+})
+export default class NewEditCommitmentView extends Vue {}
+</script>

src/views/NewEditProjectView.vue

@@ -1,7 +1,7 @@
 <template>
   <QuickNav selected="Projects"></QuickNav>
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
@@ -29,23 +29,6 @@
       v-model="fullClaim.name"
     />
 
-    <input
-      type="text"
-      placeholder="Other Authorized Representative"
-      class="block w-full rounded border border-slate-400 px-3 py-2"
-      v-model="agentDid"
-    />
-    <div class="mb-4">
-      <p v-if="activeDid != projectIssuerDid && agentDid != projectIssuerDid">
-        <span class="text-red-500">Beware!</span>
-        If you save this, the original project owner will no longer be able to
-        edit it.
-        <button @click="agentDid = projectIssuerDid" class="text-blue-500">
-          Click here to make the original owner an authorized representative.
-        </button>
-      </p>
-    </div>
-
     <textarea
       placeholder="Description"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
@@ -54,13 +37,12 @@
       maxlength="5000"
     ></textarea>
     <div class="text-xs text-slate-500 italic -mt-3 mb-4">
-      {{ fullClaim.description?.length }}/5000 max. characters
+      {{ fullClaim.description.length }}/5000 max. characters
     </div>
 
     <input
       v-model="fullClaim.url"
       placeholder="Website"
-      autocapitalize="none"
       class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
     />
 
@@ -75,8 +57,8 @@
     </div>
     <div v-if="includeLocation" style="height: 600px; width: 800px">
       <div class="px-2 py-2">
-        For your security, choose a location nearby but not exactly at the
-        place.
+        For your security, we recommend you choose a location nearby but not
+        exactly at the place.
       </div>
 
       <l-map
@@ -116,7 +98,7 @@
         <span :class="{ hidden: isHiddenSpinner }">
           <!-- icon no worky? -->
           <i class="fa-solid fa-spinner fa-spin-pulse"></i>
-          Saving...</span
+          Saving&hellip;</span
         >
       </button>
       <button
@@ -138,7 +120,6 @@ import { Component, Vue } from "vue-facing-decorator";
 import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";
 
 import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
@@ -146,14 +127,20 @@ import { useAppStore } from "@/store/app";
 import { IIdentifier } from "@veramo/core";
 import { PlanVerifiableCredential } from "@/libs/endorserServer";
 
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
+
 @Component({
   components: { LMap, LMarker, LTileLayer, QuickNav },
 })
 export default class NewEditProjectView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
-  agentDid = "";
   apiServer = "";
   errorMessage = "";
   fullClaim: PlanVerifiableCredential = {
@@ -163,14 +150,9 @@ export default class NewEditProjectView extends Vue {
     description: "",
   }; // this default is only to avoid errors before plan is loaded
   includeLocation = false;
-  isHiddenSave = false;
-  isHiddenSpinner = true;
-  lastClaimJwtId = "";
   latitude = 0;
   longitude = 0;
   numAccounts = 0;
-  projectId = localStorage.getItem("projectId") || "";
-  projectIssuerDid = "";
   zoom = 2;
 
   async beforeCreate() {
@@ -184,11 +166,11 @@ export default class NewEditProjectView extends Vue {
       .where("did")
       .equals(activeDid)
       .first();
-    const identity = JSON.parse((account?.identity as string) || "null");
+    const identity = JSON.parse(account?.identity || "null");
 
     if (!identity) {
       throw new Error(
-        "Attempted to load project records with no identifier available.",
+        "Attempted to load project records with no identity available.",
       );
     }
     return identity;
@@ -203,11 +185,15 @@ export default class NewEditProjectView extends Vue {
     return headers;
   }
 
+  projectId = localStorage.getItem("projectId") || "";
+  isHiddenSave = false;
+  isHiddenSpinner = true;
+
   async created() {
     await db.open();
     const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-    this.activeDid = (settings?.activeDid as string) || "";
-    this.apiServer = (settings?.apiServer as string) || "";
+    this.activeDid = settings?.activeDid || "";
+    this.apiServer = settings?.apiServer || "";
 
     if (this.projectId) {
       if (this.numAccounts === 0) {
@@ -216,15 +202,15 @@ export default class NewEditProjectView extends Vue {
         const identity = await this.getIdentity(this.activeDid);
         if (!identity) {
           throw new Error(
-            "An ID is chosen but there are no keys for it so it cannot be used to talk with the service. Switch your ID.",
+            "An ID is chosen but there are no keys for it so it cannot be used to talk with the service.",
           );
         }
-        this.loadProject(identity);
+        this.LoadProject(identity);
       }
     }
   }
 
-  async loadProject(identity: IIdentifier) {
+  async LoadProject(identity: IIdentifier) {
     const url =
       this.apiServer +
       "/api/claim/byHandle/" +
@@ -238,33 +224,23 @@ export default class NewEditProjectView extends Vue {
     try {
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200) {
-        this.projectIssuerDid = resp.data.issuer;
         this.fullClaim = resp.data.claim;
-        this.lastClaimJwtId = resp.data.id;
         if (this.fullClaim?.location) {
           this.includeLocation = true;
           this.latitude = this.fullClaim.location.geo.latitude;
           this.longitude = this.fullClaim.location.geo.longitude;
         }
-        if (this.fullClaim?.agent?.identifier) {
-          this.agentDid = this.fullClaim.agent.identifier;
-        }
       }
     } catch (error) {
       console.error("Got error retrieving that project", error);
     }
   }
 
-  private async saveProject(identity: IIdentifier) {
+  private async SaveProject(identity: IIdentifier) {
     // Make a claim
     const vcClaim: PlanVerifiableCredential = this.fullClaim;
     if (this.projectId) {
-      vcClaim.lastClaimId = this.lastClaimJwtId;
-    }
-    if (this.agentDid) {
-      vcClaim.agent = {
-        identifier: this.agentDid,
-      };
+      vcClaim.identifier = this.projectId;
     }
     if (this.includeLocation) {
       vcClaim.location = {
@@ -307,16 +283,25 @@ export default class NewEditProjectView extends Vue {
 
       try {
         const resp = await this.axios.post(url, payload, { headers });
-        if (resp.data?.success?.handleId) {
+        // handleId is new in server v release-1.6.0; remove fullIri when that
+        // version shows up here: https://api.endorser.ch/api-docs/
+        if (resp.data?.success?.handleId || resp.data?.success?.fullIri) {
           this.errorMessage = "";
 
-          useAppStore()
-            .setProjectId(resp.data.success.handleId)
-            .then(() => {
-              this.$router.push({ name: "project" });
-            });
+          // handleId is new in server v release-1.6.0; remove fullIri when that
+          // version shows up here: https://api.endorser.ch/api-docs/
+          useAppStore().setProjectId(
+            resp.data.success.handleId || resp.data.success.fullIri,
+          );
+          setTimeout(
+            function (that: NewEditProjectView) {
+              that.$router.push({ name: "project" });
+            },
+            2000,
+            this,
+          );
         } else {
-          console.error(
+          console.log(
             "Got unexpected 'data' inside response from server",
             resp,
           );
@@ -336,11 +321,9 @@ export default class NewEditProjectView extends Vue {
           error?: { message?: string };
         }>;
         if (serverError) {
-          console.error("Got error from server", serverError);
+          console.log("Got error from server", serverError);
           if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
-            userMessage =
-              (serverError.response?.data?.error?.message as string) ||
-              userMessage;
+            userMessage = serverError.response?.data?.error?.message || ""; // This is info for the user.
             this.$notify(
               {
                 group: "alert",
@@ -390,7 +373,7 @@ export default class NewEditProjectView extends Vue {
       console.error("Error: there is no account.");
     } else {
       const identity = await this.getIdentity(this.activeDid);
-      this.saveProject(identity);
+      this.SaveProject(identity);
     }
   }
 

src/views/NewIdentifierView.vue

@@ -2,7 +2,7 @@
   <QuickNav />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <!-- Back -->
@@ -54,7 +54,9 @@
 <script lang="ts">
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
-import { generateSaveAndActivateIdentity } from "@/libs/util";
+import { accountsDB, db } from "@/db/index";
+import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import QuickNav from "@/components/QuickNav.vue";
 
 @Component({ components: { QuickNav } })
@@ -62,10 +64,31 @@ export default class NewIdentifierView extends Vue {
   loading = true;
 
   async mounted() {
-    await generateSaveAndActivateIdentity();
+    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,
+    });
+
     this.loading = false;
     setTimeout(() => {
-      this.$router.push({ name: "home" });
+      this.$router.push({ name: "account" });
     }, 1000);
   }
 }

src/views/ProjectViewView.vue

@@ -1,9 +1,7 @@
 <template>
-  <QuickNav />
-  <TopMessage />
-
+  <QuickNav selected="Projects"></QuickNav>
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div id="ViewBreadcrumb" class="mb-8">
       <h1 class="text-lg text-center font-light relative px-7">
@@ -23,11 +21,11 @@
       <div>
         <div class="block pb-4 flex gap-4">
           <div class="flex-none w-16 pt-1">
-            <ProjectIcon
+            <EntityIcon
               :entityId="projectId"
               :iconSize="64"
               class="block border border-slate-300 rounded-md"
-            ></ProjectIcon>
+            ></EntityIcon>
           </div>
 
           <div class="overflow-hidden">
@@ -35,23 +33,7 @@
             <div class="text-sm mb-3">
               <div class="truncate">
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{
-                  serverUtil.didInfo(issuer, activeDid, allMyDids, allContacts)
-                }}
-                <span v-if="!serverUtil.isEmptyOrHiddenDid(issuer)">
-                  <button
-                    @click="
-                      libsUtil.doCopyTwoSecRedo(
-                        issuer,
-                        () => (showDidCopy = !showDidCopy),
-                      )
-                    "
-                    class="ml-2 mr-2"
-                  >
-                    <fa icon="copy" class="text-slate-400 fa-fw"></fa>
-                  </button>
-                  <span v-show="showDidCopy">Copied DID</span>
-                </span>
+                {{ issuer }}
               </div>
               <div v-if="timeSince">
                 <fa icon="calendar" class="fa-fw text-slate-400"></fa>
@@ -64,7 +46,6 @@
                   target="_blank"
                   class="underline"
                   >Map View
-                  <fa icon="arrow-up-right-from-square" class="fa-fw" />
                 </a>
               </div>
               <div v-if="url">
@@ -96,14 +77,9 @@
             >
           </div>
         </div>
-
-        <a @click="onClickLoadClaim(projectId)" class="cursor-pointer">
-          <fa icon="circle-info" class="pl-2 pt-1 text-blue-500" />
-        </a>
       </div>
-
       <button
-        v-if="activeDid === issuer || activeDid === agentDid"
+        v-if="issuer == activeDid"
         type="button"
         class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
         @click="onEditClick()"
@@ -112,42 +88,36 @@
       </button>
     </div>
 
-    <div v-if="activeDid" class="mb-4">
-      <div class="text-center">
+    <div class="mb-4">
+      <div v-if="activeDid" class="text-center">
         <button
-          @click="openOfferDialog()"
+          @click="openOfferDialog({ name: 'you', did: activeDid })"
           class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
         >
-          Offer (maybe with conditions)...
+          I offer&hellip;
         </button>
       </div>
     </div>
-    <OfferDialog ref="customOfferDialog" :projectId="this.projectId" />
 
-    <div v-if="activeDid">
-      <GiftedDialog
-        ref="customGiveDialog"
-        message="Received from"
-        :projectId="this.projectId"
-      >
-      </GiftedDialog>
-      <div class="text-center">
-        <p class="mt-2 mb-4 text-center">Record a contribution from:</p>
+    <div>
+      <div v-if="activeDid" class="text-center">
+        <button
+          @click="openGiftDialog({ name: 'you', did: activeDid })"
+          class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
+        >
+          I gave&hellip;
+        </button>
+        <p class="mt-2 mb-4 text-center">Or, record a gift from:</p>
       </div>
+      <p v-if="!activeDid" class="mt-2 mb-4">Record a gift from:</p>
+
       <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
-        <li @click="openGiftDialog({ name: 'you', did: activeDid })">
-          <fa icon="hand" class="fa-fw text-slate-400 text-5xl" />
-          <h3
-            class="mt-5 text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
-          >
-            You
-          </h3>
-        </li>
         <li @click="openGiftDialog()">
-          <img
-            src="../assets/blank-square.svg"
+          <EntityIcon
+            :entityId="null"
+            :iconSize="64"
             class="mx-auto border border-slate-300 rounded-md mb-1"
-          />
+          ></EntityIcon>
           <h3
             class="text-xs italic font-medium text-ellipsis whitespace-nowrap overflow-hidden"
           >
@@ -155,7 +125,7 @@
           </h3>
         </li>
         <li
-          v-for="contact in allContacts.slice(0, 6)"
+          v-for="contact in allContacts"
           :key="contact.did"
           @click="openGiftDialog(contact)"
         >
@@ -163,7 +133,7 @@
             :entityId="contact.did"
             :iconSize="64"
             class="mx-auto border border-slate-300 rounded-md mb-1"
-          />
+          ></EntityIcon>
           <h3
             class="text-xs font-medium text-ellipsis whitespace-nowrap overflow-hidden"
           >
@@ -173,13 +143,13 @@
       </ul>
 
       <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
-      <a
+      <router-link
         v-if="allContacts.length >= 7"
-        @click="onClickAllContactsGifting()"
+        :to="{ name: 'contact-gives' }"
         class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
       >
         Show More Contacts&hellip;
-      </a>
+      </router-link>
     </div>
 
     <!-- Gifts to & from this -->
@@ -190,10 +160,7 @@
         </h3>
 
         <div v-if="offersToThis.length === 0">
-          (None yet. Wanna
-          <span @click="openOfferDialog()" class="cursor-pointer text-blue-500"
-            >offer something... especially if others join you</span
-          >?)
+          (None yet. Record one above.)
         </div>
 
         <ul v-else class="text-sm border-t border-slate-300">
@@ -205,43 +172,19 @@
             <div class="flex justify-between gap-4">
               <span>
                 <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{
-                  serverUtil.didInfo(
-                    offer.offeredByDid,
-                    activeDid,
-                    allMyDids,
-                    allContacts,
-                  )
-                }}
+                {{ didInfo(offer.agentDid, activeDid, allMyDids, allContacts) }}
               </span>
-              <span v-if="offer.amount" class="whitespace-nowrap">
+              <span v-if="offer.amount">
                 <fa
-                  :icon="libsUtil.iconForUnitCode(offer.unit)"
+                  :icon="iconForUnitCode(offer.unit)"
                   class="fa-fw text-slate-400"
                 />{{ offer.amount }}
               </span>
             </div>
             <div v-if="offer.objectDescription" class="text-slate-500">
-              <fa icon="comment" class="fa-fw text-slate-400" />
+              <fa icon="comment" class="fa-fw text-slate-400"></fa>
               {{ offer.objectDescription }}
             </div>
-            <div class="flex justify-between">
-              <a
-                @click="onClickLoadClaim(offer.jwtId as string)"
-                class="cursor-pointer"
-              >
-                <fa icon="circle-info" class="pl-2 pt-1 text-blue-500" />
-              </a>
-              <a
-                v-if="checkIsFulfillable(offer)"
-                @click="onClickFulfillGiveToOffer(offer)"
-              >
-                <fa
-                  icon="hand-holding-heart"
-                  class="text-blue-500 cursor-pointer"
-                />
-              </a>
-            </div>
           </li>
         </ul>
       </div>
@@ -249,10 +192,7 @@
       <div class="bg-slate-100 px-4 py-3 rounded-md">
         <h3 class="text-sm uppercase font-semibold mb-3">Given To This Idea</h3>
 
-        <div v-if="givesToThis.length === 0">
-          (None yet. If you've seen something, say something by clicking a
-          contact above.)
-        </div>
+        <div v-if="givesToThis.length === 0">(None yet. Record one above.)</div>
 
         <ul v-else class="text-sm border-t border-slate-300">
           <li
@@ -263,38 +203,19 @@
             <div class="flex justify-between gap-4">
               <span
                 ><fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{
-                  serverUtil.didInfo(
-                    give.agentDid,
-                    activeDid,
-                    allMyDids,
-                    allContacts,
-                  )
-                }}
+                {{ didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
               </span>
-              <span v-if="give.amount" class="whitespace-nowrap">
+              <span v-if="give.amount">
                 <fa
-                  :icon="libsUtil.iconForUnitCode(give.unit)"
+                  :icon="iconForUnitCode(give.unit)"
                   class="fa-fw text-slate-400"
                 />{{ give.amount }}
               </span>
             </div>
-            <div class="text-slate-500">
-              <fa icon="calendar" class="fa-fw text-slate-400" />
-              {{ give.issuedAt?.substring(0, 10) }}
-            </div>
             <div v-if="give.description" class="text-slate-500">
-              <fa icon="comment" class="fa-fw text-slate-400" />
+              <fa icon="comment" class="fa-fw text-slate-400"></fa>
               {{ give.description }}
             </div>
-            <div class="flex justify-between">
-              <a @click="onClickLoadClaim(give.jwtId)">
-                <fa icon="circle-info" class="text-blue-500 cursor-pointer" />
-              </a>
-              <a v-if="checkIsConfirmable(give)" @click="confirmClaim(give)">
-                <fa icon="circle-check" class="text-blue-500 cursor-pointer" />
-              </a>
-            </div>
           </li>
         </ul>
       </div>
@@ -307,35 +228,40 @@
           <h3 class="text-sm uppercase font-semibold mb-3">
             Contributions To This Idea
           </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <div v-for="plan in fulfillersToThis" :key="plan.handleId">
+          <ul>
+            <li v-for="plan in fulfillersToThis" :key="plan.handleId">
               <button
                 @click="onClickLoadProject(plan.handleId)"
                 class="text-blue-500"
               >
                 {{ plan.name }}
               </button>
-            </div>
-          </div>
+            </li>
+          </ul>
         </div>
 
         <div v-if="fulfilledByThis" class="bg-slate-100 px-4 py-3 rounded-md">
           <h3 class="text-sm uppercase font-semibold mb-3">
-            Contributions From This Idea
+            Contributions By This Idea
           </h3>
-          <!-- centering because long, wrapped project names didn't left align with blank or "text-left" -->
-          <div class="text-center">
-            <button
-              @click="onClickLoadProject(fulfilledByThis.handleId)"
-              class="text-blue-500"
-            >
-              {{ fulfilledByThis.name }}
-            </button>
-          </div>
+          <button
+            @click="onClickLoadProject(fulfilledByThis.handleId)"
+            class="text-blue-500"
+          >
+            {{ fulfilledByThis.name }}
+          </button>
         </div>
       </div>
     </div>
+
+    <GiftedDialog
+      ref="customGiveDialog"
+      message="Received from"
+      :projectId="this.projectId"
+    >
+    </GiftedDialog>
+    <OfferDialog ref="customOfferDialog" :projectId="this.projectId">
+    </OfferDialog>
   </section>
 </template>
 
@@ -347,42 +273,36 @@ import { Component, Vue } from "vue-facing-decorator";
 
 import GiftedDialog from "@/components/GiftedDialog.vue";
 import OfferDialog from "@/components/OfferDialog.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import ProjectIcon from "@/components/ProjectIcon.vue";
-import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
-import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import * as libsUtil from "@/libs/util";
+import { isGlobalUri } from "@/libs/util";
 import {
-  BLANK_GENERIC_SERVER_RECORD,
-  GenericServerRecord,
+  didInfo,
   GiverInputInfo,
   GiveServerRecord,
   OfferServerRecord,
   PlanServerRecord,
 } from "@/libs/endorserServer";
-import * as serverUtil from "@/libs/endorserServer";
+import QuickNav from "@/components/QuickNav.vue";
+import EntityIcon from "@/components/EntityIcon.vue";
+import { Account } from "@/db/tables/accounts";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component({
-  components: {
-    EntityIcon,
-    GiftedDialog,
-    OfferDialog,
-    ProjectIcon,
-    QuickNav,
-    TopMessage,
-  },
+  components: { EntityIcon, GiftedDialog, OfferDialog, QuickNav },
 })
 export default class ProjectViewView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeDid = "";
-  agentDid = "";
   allMyDids: Array<string> = [];
   allContacts: Array<Contact> = [];
   apiServer = "";
@@ -397,15 +317,11 @@ export default class ProjectViewView extends Vue {
   name = "";
   offersToThis: Array<OfferServerRecord> = [];
   projectId = localStorage.getItem("projectId") || ""; // handle ID
-  showDidCopy = false;
   timeSince = "";
   truncatedDesc = "";
   truncateLength = 40;
   url = "";
 
-  libsUtil = libsUtil;
-  serverUtil = serverUtil;
-
   async created() {
     await db.open();
     const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
@@ -415,7 +331,7 @@ export default class ProjectViewView extends Vue {
 
     await accountsDB.open();
     const accounts = accountsDB.accounts;
-    const accountsArr: Account[] = await accounts?.toArray();
+    const accountsArr = await accounts?.toArray();
     this.allMyDids = accountsArr.map((acc) => acc.did);
     const account = accountsArr.find((acc) => acc.did === this.activeDid);
     const identity = JSON.parse(account?.identity || "null");
@@ -424,7 +340,7 @@ export default class ProjectViewView extends Vue {
     if (pathParam) {
       this.projectId = decodeURIComponent(pathParam);
     }
-    this.loadProject(this.projectId, identity);
+    this.LoadProject(this.projectId, identity);
   }
 
   public async getIdentity(activeDid: string) {
@@ -434,6 +350,12 @@ export default class ProjectViewView extends Vue {
       .equals(activeDid)
       .first()) as Account;
     const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load project records with no identity available.",
+      );
+    }
     return identity;
   }
 
@@ -455,6 +377,15 @@ export default class ProjectViewView extends Vue {
   }
 
   // Isn't there a better way to make this available to the template?
+  didInfo(
+    did: string,
+    activeDid: string,
+    dids: Array<string>,
+    contacts: Array<Contact>,
+  ) {
+    return didInfo(did, activeDid, dids, contacts);
+  }
+
   expandText() {
     this.expanded = true;
   }
@@ -463,7 +394,7 @@ export default class ProjectViewView extends Vue {
     this.expanded = false;
   }
 
-  async loadProject(projectId: string, identity: IIdentifier) {
+  async LoadProject(projectId: string, identity: IIdentifier) {
     this.projectId = projectId;
 
     const url =
@@ -485,7 +416,6 @@ export default class ProjectViewView extends Vue {
           const now = moment.now();
           this.timeSince = moment.utc(now).to(eventDate);
         }
-        this.agentDid = resp.data.claim?.agent?.identifier;
         this.issuer = resp.data.issuer;
         this.name = resp.data.claim?.name || "(no name)";
         this.description = resp.data.claim?.description || "(no description)";
@@ -493,21 +423,19 @@ export default class ProjectViewView extends Vue {
         this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
         this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
         this.url = resp.data.claim?.url || "";
-      } else {
-        // actually, axios throws an error on 404 so we probably never get here
-        console.error("Error getting project:", resp);
+      } else if (resp.status === 404) {
+        // actually, axios throws an error so we never get here
         this.$notify(
           {
             group: "alert",
             type: "danger",
             title: "Error",
-            text: "There was a problem getting that project. See logs for more info.",
+            text: "That project does not exist.",
           },
           -1,
         );
       }
     } catch (error: unknown) {
-      console.error("Error retrieving project:", error);
       const serverError = error as AxiosError;
       if (serverError.response?.status === 404) {
         this.$notify(
@@ -529,12 +457,13 @@ export default class ProjectViewView extends Vue {
           },
           -1,
         );
+        console.error("Error retrieving project:", serverError.message);
       }
     }
 
     const givesInUrl =
       this.apiServer +
-      "/api/v2/report/givesToPlans?planIds=" +
+      "/api/v2/report/givesForPlans?planIds=" +
       encodeURIComponent(JSON.stringify([projectId]));
     try {
       const resp = await this.axios.get(givesInUrl, { headers });
@@ -687,7 +616,7 @@ export default class ProjectViewView extends Vue {
       path: "/project/" + encodeURIComponent(projectId),
     };
     this.$router.push(route);
-    this.loadProject(projectId, await this.getIdentity(this.activeDid));
+    this.LoadProject(projectId, await this.getIdentity(this.activeDid));
   }
 
   getOpenStreetMapUrl() {
@@ -704,7 +633,7 @@ export default class ProjectViewView extends Vue {
     );
   }
 
-  openGiftDialog(contact?: GiverInputInfo) {
+  openGiftDialog(contact: GiverInputInfo) {
     (this.$refs.customGiveDialog as GiftedDialog).open(contact);
   }
 
@@ -712,46 +641,28 @@ export default class ProjectViewView extends Vue {
     (this.$refs.customOfferDialog as OfferDialog).open();
   }
 
-  onClickAllContactsGifting() {
-    localStorage.setItem("projectId", this.projectId);
-    const route = {
-      name: "contact-gives",
-    };
-    this.$router.push(route);
-  }
+  UNIT_CODES: Record<string, Record<string, string>> = {
+    BTC: {
+      name: "Bitcoin",
+      faIcon: "bitcoin-sign",
+    },
+    HUR: {
+      name: "hours",
+      faIcon: "clock",
+    },
+    USD: {
+      name: "US Dollars",
+      faIcon: "dollar",
+    },
+  };
 
-  onClickLoadClaim(jwtId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(jwtId),
-    };
-    this.$router.push(route);
-  }
-
-  checkIsFulfillable(offer: OfferServerRecord) {
-    const offerRecord: GenericServerRecord = {
-      ...BLANK_GENERIC_SERVER_RECORD,
-      claim: offer.fullClaim,
-      claimType: "Offer",
-      issuer: offer.offeredByDid,
-    };
-    return libsUtil.canFulfillOffer(offerRecord);
-  }
-
-  onClickFulfillGiveToOffer(offer: OfferServerRecord) {
-    const offerRecord: GenericServerRecord = {
-      ...BLANK_GENERIC_SERVER_RECORD,
-      claim: offer.fullClaim,
-      issuer: offer.offeredByDid,
-    };
-    const giver: GiverInputInfo = {
-      did: libsUtil.offerGiverDid(offerRecord),
-    };
-    (this.$refs.customGiveDialog as GiftedDialog).open(giver, offer.handleId);
+  iconForUnitCode(unitCode: string) {
+    return this.UNIT_CODES[unitCode]?.faIcon || "question";
   }
 
   // return an HTTPS URL if it's not a global URL
   addScheme(url: string) {
-    if (!libsUtil.isGlobalUri(url)) {
+    if (!isGlobalUri(url)) {
       return "https://" + url;
     }
     return url;
@@ -776,67 +687,5 @@ export default class ProjectViewView extends Vue {
       return url;
     }
   }
-
-  checkIsConfirmable(give: GiveServerRecord) {
-    const giveDetails: GenericServerRecord = {
-      ...BLANK_GENERIC_SERVER_RECORD,
-      claim: give.fullClaim,
-      claimType: "GiveAction",
-      issuer: give.agentDid,
-    };
-    return libsUtil.isGiveRecordTheUserCanConfirm(giveDetails, this.activeDid);
-  }
-
-  // similar code is found in ClaimView
-  async confirmClaim(give: GiveServerRecord) {
-    if (confirm("Do you personally confirm that this is true?")) {
-      // similar logic is found in endorser-mobile
-      const goodClaim = serverUtil.removeSchemaContext(
-        serverUtil.removeVisibleToDids(
-          serverUtil.addLastClaimOrHandleAsIdIfMissing(
-            give.fullClaim,
-            give.jwtId,
-            give.handleId,
-          ),
-        ),
-      );
-      const confirmationClaim: serverUtil.GenericVerifiableCredential = {
-        "@context": "https://schema.org",
-        "@type": "AgreeAction",
-        object: goodClaim,
-      };
-      const result = await serverUtil.createAndSubmitClaim(
-        confirmationClaim,
-        await this.getIdentity(this.activeDid),
-        this.apiServer,
-        this.axios,
-      );
-      if (result.type === "success") {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "Confirmation submitted.",
-          },
-          5000,
-        );
-      } else {
-        console.error("Got error submitting the confirmation:", result);
-        const message =
-          (result.error?.error as string) ||
-          "There was a problem submitting the confirmation. See logs for more info.";
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: message,
-          },
-          -1,
-        );
-      }
-    }
-  }
 }
 </script>

src/views/ProjectsView.vue

@@ -1,51 +1,13 @@
 <template>
   <QuickNav selected="Projects"></QuickNav>
-  <TopMessage />
-
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Heading -->
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Your Ideas
+      Your Plans
     </h1>
 
-    <!-- Result Tabs -->
-    <div class="text-center text-slate-500 border-b border-slate-300">
-      <ul class="flex flex-wrap justify-center gap-4 -mb-px">
-        <li>
-          <a
-            href="#"
-            @click="
-              offers = [];
-              projects = [];
-              showOffers = true;
-              showProjects = false;
-              loadOffers();
-            "
-            v-bind:class="computedOfferTabClassNames()"
-          >
-            Offers
-          </a>
-        </li>
-        <li>
-          <a
-            href="#"
-            @click="
-              offers = [];
-              projects = [];
-              showOffers = false;
-              showProjects = true;
-              loadProjects();
-            "
-            v-bind:class="computedProjectTabClassNames()"
-          >
-            Projects
-          </a>
-        </li>
-      </ul>
-    </div>
-
     <!-- Quick Search -->
-    <!--
+
     <div id="QuickSearch" class="mb-4 flex">
       <input
         type="text"
@@ -58,11 +20,9 @@
         <fa icon="magnifying-glass" class="fa-fw"></fa>
       </button>
     </div>
-    -->
 
     <!-- New Project -->
     <button
-      v-if="showProjects"
       class="fixed right-6 bottom-24 text-center text-4xl leading-none bg-blue-600 text-white w-14 py-2.5 rounded-full"
       @click="onClickNewProject()"
     >
@@ -77,108 +37,8 @@
       <fa icon="spinner" class="fa-spin-pulse"></fa>
     </div>
 
-    <!-- Offer Results List -->
-    <InfiniteScroll v-if="showOffers" @reached-bottom="loadMoreOfferData">
-      <ul class="border-t border-slate-300">
-        <li
-          class="border-b border-slate-300"
-          v-for="offer in offers"
-          :key="offer.handleId"
-        >
-          <div class="block py-4 flex gap-4">
-            <div v-if="offer.fulfillsPlanHandleId" class="flex-none w-12">
-              <ProjectIcon
-                :entityId="offer.fulfillsPlanHandleId"
-                :iconSize="48"
-                class="inline-block align-middle border border-slate-300 rounded-md"
-              ></ProjectIcon>
-            </div>
-            <div v-if="offer.recipientDid" class="flex-none w-12">
-              <EntityIcon
-                :entityId="offer.recipientDid"
-                :iconSize="48"
-                class="inline-block align-middle border border-slate-300 rounded-md"
-              ></EntityIcon>
-            </div>
-
-            <div>
-              <div>
-                {{ offer.objectDescription }}
-              </div>
-
-              <span class="text-sm">
-                <span v-if="offer.amount">
-                  <fa
-                    :icon="libsUtil.iconForUnitCode(offer.unit)"
-                    class="fa-fw text-slate-400"
-                  />
-
-                  <span v-if="offer.amountGiven >= offer.amount">
-                    <fa icon="check-circle" class="fa-fw text-green-500" />
-                    All {{ offer.amount }} given
-                  </span>
-                  <span v-else>
-                    <fa
-                      icon="triangle-exclamation"
-                      class="fa-fw text-yellow-500"
-                    />
-                    {{ offer.amountGiven ? "" : "All" }}
-                    {{ offer.amount - (offer.amountGiven || 0) }} remaining
-                  </span>
-
-                  <span v-if="offer.amountGiven > 0">
-                    <span class="text-sm text-slate-400">
-                      ({{ offer.amountGiven }} given,
-                      <span
-                        v-if="offer.amountGivenConfirmed >= offer.amountGiven"
-                      >
-                        <!-- no need for green icon; unnecessary if there's already a green, confusing if there's a yellow -->
-                        all
-                      </span>
-                      <span v-else>
-                        <!-- only show icon if there's not already a warning -->
-                        <fa
-                          v-if="offer.amountGiven >= offer.amount"
-                          icon="triangle-exclamation"
-                          class="fa-fw text-yellow-300"
-                        />
-                        {{ offer.amountGivenConfirmed || 0 }}
-                      </span>
-                      of that is confirmed)
-                    </span>
-                  </span>
-                </span>
-                <span v-else>
-                  <!-- Non-amount offer -->
-                  <span v-if="offer.nonAmountGivenConfirmed">
-                    <fa icon="check-circle" class="fa-fw text-green-500" />
-                    {{ offer.nonAmountGivenConfirmed }}
-                    {{ offer.nonAmountGivenConfirmed == 1 ? "give" : "gives" }}
-                    are confirmed.
-                  </span>
-                  <span v-else>
-                    <fa
-                      icon="triangle-exclamation"
-                      class="fa-fw text-yellow-500"
-                    />
-                    <span class="text-sm">Not confirmed by anyone</span>
-                  </span>
-                </span>
-
-                <a @click="onClickLoadClaim(offer.jwtId)">
-                  <fa
-                    icon="circle-info"
-                    class="pl-2 text-blue-500 cursor-pointer"
-                  ></fa>
-                </a>
-              </span>
-            </div>
-          </div>
-        </li>
-      </ul>
-    </InfiniteScroll>
-    <!-- Project Results List -->
-    <InfiniteScroll v-if="showProjects" @reached-bottom="loadMoreProjectData">
+    <!-- Results List -->
+    <InfiniteScroll @reached-bottom="loadMoreData">
       <ul class="border-t border-slate-300">
         <li
           class="border-b border-slate-300"
@@ -190,11 +50,11 @@
             class="block py-4 flex gap-4"
           >
             <div class="flex-none w-12">
-              <ProjectIcon
+              <EntityIcon
                 :entityId="project.handleId"
                 :iconSize="48"
                 class="inline-block align-middle border border-slate-300 rounded-md"
-              ></ProjectIcon>
+              ></EntityIcon>
             </div>
 
             <div class="grow overflow-hidden">
@@ -212,76 +72,37 @@
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-
-import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import * as libsUtil from "@/libs/util";
 import { IIdentifier } from "@veramo/core";
 import InfiniteScroll from "@/components/InfiniteScroll.vue";
 import QuickNav from "@/components/QuickNav.vue";
-import ProjectIcon from "@/components/ProjectIcon.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { OfferServerRecord, PlanData } from "@/libs/endorserServer";
 import EntityIcon from "@/components/EntityIcon.vue";
+import { ProjectData } from "@/libs/endorserServer";
+
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
 
 @Component({
-  components: { EntityIcon, InfiniteScroll, QuickNav, ProjectIcon, TopMessage },
+  components: { InfiniteScroll, QuickNav, EntityIcon },
 })
 export default class ProjectsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   apiServer = "";
-  projects: PlanData[] = [];
-  currentIid: IIdentifier;
+  projects: ProjectData[] = [];
+  current: IIdentifier;
   isLoading = false;
   numAccounts = 0;
-  offers: OfferServerRecord[] = [];
-  showOffers = true;
-  showProjects = false;
 
-  libsUtil = libsUtil;
-
-  /**
-   * 'created' hook runs when the Vue instance is first created
-   **/
-  async created() {
-    try {
-      await db.open();
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      const activeDid: string = (settings?.activeDid as string) || "";
-      this.apiServer = (settings?.apiServer as string) || "";
-
-      await accountsDB.open();
-      this.numAccounts = await accountsDB.accounts.count();
-      if (this.numAccounts === 0) {
-        console.error("No accounts found.");
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "You need an identifier to load your projects.",
-          },
-          -1,
-        );
-      } else {
-        this.currentIid = await this.getIdentity(activeDid);
-        await this.loadOffers();
-      }
-    } catch (err) {
-      console.error("Error initializing:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong loading your projects.",
-        },
-        -1,
-      );
-    }
+  async beforeCreate() {
+    await accountsDB.open();
+    this.numAccounts = await accountsDB.accounts.count();
   }
 
   /**
@@ -289,7 +110,7 @@ export default class ProjectsView extends Vue {
    * @param url the url used to fetch the data
    * @param token Authorization token
    **/
-  async projectDataLoader(url: string, token: string) {
+  async dataLoader(url: string, token: string) {
     const headers: { [key: string]: string } = {
       "Content-Type": "application/json",
       Authorization: `Bearer ${token}`,
@@ -299,17 +120,13 @@ export default class ProjectsView extends Vue {
       this.isLoading = true;
       const resp = await this.axios.get(url, { headers });
       if (resp.status === 200 || !resp.data.data) {
-        const plans: PlanData[] = resp.data.data;
+        const plans: ProjectData[] = resp.data.data;
         for (const plan of plans) {
-          const { name, description, handleId, issuerDid, rowid } = plan;
-          this.projects.push({ name, description, handleId, issuerDid, rowid });
+          const { name, description, handleId, rowid } = plan;
+          this.projects.push({ name, description, handleId, rowid });
         }
       } else {
-        console.error(
-          "Bad server response & data for plans:",
-          resp.status,
-          resp.data,
-        );
+        console.log("Bad server response & data:", resp.status, resp.data);
         this.$notify(
           {
             group: "alert",
@@ -322,7 +139,7 @@ export default class ProjectsView extends Vue {
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
     } catch (error: any) {
-      console.error("Got error loading plans:", error.message || error);
+      console.error("Got error loading projects:", error.message || error);
       this.$notify(
         {
           group: "alert",
@@ -341,44 +158,15 @@ export default class ProjectsView extends Vue {
    * Data loader used by infinite scroller
    * @param payload is the flag from the InfiniteScroll indicating if it should load
    **/
-  async loadMoreProjectData(payload: boolean) {
+  async loadMoreData(payload: boolean) {
     if (this.projects.length > 0 && payload) {
       const latestProject = this.projects[this.projects.length - 1];
-      await this.loadProjects(
-        this.currentIid,
-        `beforeId=${latestProject.rowid}`,
-      );
+      const url = `${this.apiServer}/api/v2/report/plansByIssuer?beforeId=${latestProject.rowid}`;
+      const token = await accessToken(this.current);
+      await this.dataLoader(url, token);
     }
   }
 
-  /**
-   * Load projects initially
-   * @param identifier of the user
-   * @param urlExtra additional url parameters in a string
-   **/
-  async loadProjects(identifier?: IIdentifier, urlExtra: string = "") {
-    const identity = identifier || this.currentIid;
-    const url = `${this.apiServer}/api/v2/report/plansByIssuer?${urlExtra}`;
-    const token: string = await accessToken(identity);
-    await this.projectDataLoader(url, token);
-  }
-
-  public async getIdentity(activeDid: string): Promise<IIdentifier> {
-    await accountsDB.open();
-    const account = await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first();
-    const identity = JSON.parse((account?.identity as string) || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load project records with no identifier available.",
-      );
-    }
-    return identity;
-  }
-
   /**
    * Handle clicking on a project entry found in the list
    * @param id of the project
@@ -391,6 +179,72 @@ export default class ProjectsView extends Vue {
     this.$router.push(route);
   }
 
+  /**
+   * Load projects initially
+   * @param identity of the user
+   **/
+  async LoadProjects(identity: IIdentifier) {
+    const url = `${this.apiServer}/api/v2/report/plansByIssuer`;
+    const token: string = await accessToken(identity);
+    await this.dataLoader(url, token);
+  }
+
+  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 project records with no identity available.",
+      );
+    }
+    return identity;
+  }
+
+  /**
+   * 'created' hook runs when the Vue instance is first created
+   **/
+  async created() {
+    try {
+      await db.open();
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+      const activeDid = settings?.activeDid || "";
+      this.apiServer = settings?.apiServer || "";
+
+      if (this.numAccounts === 0) {
+        console.error("No accounts found.");
+        this.$notify(
+          {
+            group: "alert",
+            type: "danger",
+            title: "Error",
+            text: "You need an identity to load your projects.",
+          },
+          -1,
+        );
+      } else {
+        const identity = await this.getIdentity(activeDid);
+        this.current = identity;
+        this.LoadProjects(identity);
+      }
+    } catch (err) {
+      console.log("Error initializing:", err);
+      this.$notify(
+        {
+          group: "alert",
+          type: "danger",
+          title: "Error",
+          text: "Something went wrong loading your projects.",
+        },
+        -1,
+      );
+    }
+  }
+
   /**
    * Handling clicking on the new project button
    **/
@@ -401,120 +255,5 @@ export default class ProjectsView extends Vue {
     };
     this.$router.push(route);
   }
-
-  onClickLoadClaim(jwtId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(jwtId),
-    };
-    this.$router.push(route);
-  }
-
-  /**
-   * Core offer data loader
-   * @param url the url used to fetch the data
-   * @param token Authorization token
-   **/
-  async offerDataLoader(url: string, token: string) {
-    const headers: { [key: string]: string } = {
-      "Content-Type": "application/json",
-      Authorization: `Bearer ${token}`,
-    };
-
-    try {
-      this.isLoading = true;
-      const resp = await this.axios.get(url, { headers });
-      if (resp.status === 200 || !resp.data.data) {
-        this.offers = this.offers.concat(resp.data.data);
-      } else {
-        console.error(
-          "Bad server response & data for offers:",
-          resp.status,
-          resp.data,
-        );
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to get offers from the server. Try again later.",
-          },
-          -1,
-        );
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Got error loading offers:", error.message || error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Got an error loading offers.",
-        },
-        -1,
-      );
-    } finally {
-      this.isLoading = false;
-    }
-  }
-
-  /**
-   * Data loader used by infinite scroller
-   * @param payload is the flag from the InfiniteScroll indicating if it should load
-   **/
-  async loadMoreOfferData(payload: boolean) {
-    if (this.offers.length > 0 && payload) {
-      const latestOffer = this.offers[this.offers.length - 1];
-      await this.loadOffers(this.currentIid, `&beforeId=${latestOffer.jwtId}`);
-    }
-  }
-
-  /**
-   * Load offers initially
-   * @param identifier of the user
-   * @param urlExtra additional url parameters in a string
-   **/
-  async loadOffers(identifier?: IIdentifier, urlExtra: string = "") {
-    const identity = identifier || this.currentIid;
-    const url = `${this.apiServer}/api/v2/report/offers?offeredByDid=${identity.did}${urlExtra}`;
-    const token: string = await accessToken(identity);
-    await this.offerDataLoader(url, token);
-  }
-
-  public computedOfferTabClassNames() {
-    return {
-      "inline-block": true,
-      "py-3": true,
-      "rounded-t-lg": true,
-      "border-b-2": true,
-
-      active: this.showOffers,
-      "text-black": this.showOffers,
-      "border-black": this.showOffers,
-      "font-semibold": this.showOffers,
-
-      "text-blue-600": !this.showOffers,
-      "border-transparent": !this.showOffers,
-      "hover:border-slate-400": !this.showOffers,
-    };
-  }
-
-  public computedProjectTabClassNames() {
-    return {
-      "inline-block": true,
-      "py-3": true,
-      "rounded-t-lg": true,
-      "border-b-2": true,
-
-      active: this.showProjects,
-      "text-black": this.showProjects,
-      "border-black": this.showProjects,
-      "font-semibold": this.showProjects,
-
-      "text-blue-600": !this.showProjects,
-      "border-transparent": !this.showProjects,
-      "hover:border-slate-400": !this.showProjects,
-    };
-  }
 }
 </script>

src/views/QuickActionBvcBeginView.vue

@@ -1,220 +0,0 @@
-<template>
-  <QuickNav />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <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 px-4 mb-4">
-      Beginning of BVC Saturday Meeting
-    </h1>
-
-    <div>
-      <h2 class="text-2xl m-2">You're Here</h2>
-      <div class="m-2 flex">
-        <input type="checkbox" v-model="attended" class="h-6 w-6" />
-        <span class="pb-2 pl-2 pr-2">Attended</span>
-      </div>
-      <div class="m-2 flex">
-        <input type="checkbox" v-model="gaveTime" class="h-6 w-6" />
-        <span class="pb-2 pl-2 pr-2">Spent Time</span>
-        <span v-if="gaveTime">
-          <input
-            type="text"
-            placeholder="How much time"
-            v-model="hoursStr"
-            size="1"
-            class="border border-slate-400 h-6 px-2"
-          />
-          hour(s)
-        </span>
-        <!-- This is to match input height to avoid shifting when hiding & showing. -->
-        <span v-else class="h-6" />
-      </div>
-    </div>
-
-    <div
-      v-if="attended || (gaveTime && hoursStr && hoursStr != '0')"
-      class="flex justify-center mt-4"
-    >
-      <button
-        @click="record()"
-        class="block text-center text-md font-bold bg-blue-500 text-white px-2 py-3 rounded-md w-56"
-      >
-        Sign & Send
-      </button>
-    </div>
-    <div v-else class="flex justify-center mt-4">
-      <button
-        class="block text-center text-md font-bold bg-slate-500 text-white px-2 py-3 rounded-md w-56"
-      >
-        Select Your Actions
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import axios from "axios";
-import { DateTime } from "luxon";
-import { Component, Vue } from "vue-facing-decorator";
-
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
-import { NotificationIface } from "@/constants/app";
-import { db } from "@/db/index";
-import {
-  BVC_MEETUPS_PROJECT_CLAIM_ID,
-  bvcMeetingJoinClaim,
-  createAndSubmitClaim,
-  createAndSubmitGive,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-
-@Component({
-  components: {
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class QuickActionBvcBeginView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  attended = true;
-  gaveTime = true;
-  hoursStr = "1";
-  todayOrPreviousStartDate = "";
-
-  async mounted() {
-    let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
-    if (currentOrPreviousSat.weekday < 6) {
-      // it's not Saturday or Sunday,
-      // so move back one week before setting to the Saturday
-      currentOrPreviousSat = currentOrPreviousSat.minus({ week: 1 });
-    }
-    const eventStartDateObj = currentOrPreviousSat
-      .set({ weekday: 6 })
-      .set({ hour: 9 })
-      .startOf("hour");
-
-    // Hack, but full ISO pushes the length to 340 which crashes verifyJWT!
-    this.todayOrPreviousStartDate =
-      eventStartDateObj.toISO({
-        suppressMilliseconds: true,
-      }) || "";
-  }
-
-  async record() {
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    const activeDid = settings?.activeDid || "";
-    const apiServer = settings?.apiServer || "";
-
-    try {
-      const hoursNum = libsUtil.numberOrZero(this.hoursStr);
-      const identity = await libsUtil.getIdentity(activeDid);
-
-      // first send the claim for time given
-      let timeSuccess = false;
-      if (this.gaveTime && hoursNum > 0) {
-        const timeResult = await createAndSubmitGive(
-          axios,
-          apiServer,
-          identity,
-          activeDid,
-          undefined,
-          undefined,
-          hoursNum,
-          "HUR",
-          BVC_MEETUPS_PROJECT_CLAIM_ID,
-        );
-        if (timeResult.type === "success") {
-          timeSuccess = true;
-        } else {
-          console.error("Error sending give:", timeResult);
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error",
-              text:
-                timeResult?.error?.userMessage ||
-                "There was an error sending the time.",
-            },
-            -1,
-          );
-        }
-      }
-
-      // now send the claim for attendance
-      let attendedSuccess = false;
-      if (this.attended) {
-        const attendResult = await createAndSubmitClaim(
-          bvcMeetingJoinClaim(activeDid, this.todayOrPreviousStartDate),
-          identity,
-          apiServer,
-          axios,
-        );
-        if (attendResult.type === "success") {
-          attendedSuccess = true;
-        } else {
-          console.error("Error sending give:", attendResult);
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error",
-              text:
-                attendResult?.error?.userMessage ||
-                "There was an error sending the attendance.",
-            },
-            -1,
-          );
-        }
-      }
-
-      if (timeSuccess || attendedSuccess) {
-        const actions =
-          timeSuccess && attendedSuccess
-            ? "attendance and time have been"
-            : timeSuccess
-              ? "time has been"
-              : "attendance has been";
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: `Your ${actions} recorded.`,
-          },
-          -1,
-        );
-      }
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Error sending claims.", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: error.userMessage || "There was an error sending claims.",
-        },
-        -1,
-      );
-    }
-  }
-}
-</script>

src/views/QuickActionBvcEndView.vue

@@ -1,368 +0,0 @@
-<template>
-  <QuickNav />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <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 px-4 mb-4">
-      End of BVC Saturday Meeting
-    </h1>
-
-    <div>
-      <h2 class="text-2xl m-2">Confirm</h2>
-      <div v-if="loadingConfirms" class="flex justify-center">
-        <fa icon="spinner" class="animate-spin" />
-      </div>
-      <div v-else-if="claimsToConfirm.length === 0">
-        There are no claims yet today for you to confirm.
-        <span v-if="claimCountWithHidden > 0">
-          {{
-            claimCountWithHidden === 1
-              ? "(There is 1 claim with hidden details.)"
-              : `(There are ${claimCountWithHidden} claims with hidden details.)`
-          }}
-        </span>
-      </div>
-      <ul class="border-t border-slate-300 m-2">
-        <li
-          class="border-b border-slate-300 py-2"
-          v-for="record in claimsToConfirm"
-          :key="record.id"
-        >
-          <div class="grid grid-cols-12">
-            <span class="col-span-11 justify-self-start">
-              <span>
-                <input
-                  type="checkbox"
-                  :checked="claimsToConfirmSelected.includes(record.id)"
-                  @click="
-                    claimsToConfirmSelected.includes(record.id)
-                      ? claimsToConfirmSelected.splice(
-                          claimsToConfirmSelected.indexOf(record.id),
-                          1,
-                        )
-                      : claimsToConfirmSelected.push(record.id)
-                  "
-                  class="mr-2 h-6 w-6"
-                />
-              </span>
-              {{
-                claimSpecialDescription(
-                  record,
-                  activeDid,
-                  allMyDids,
-                  allContacts,
-                )
-              }}
-              <a @click="onClickLoadClaim(record.id)">
-                <fa
-                  icon="circle-info"
-                  class="pl-2 text-blue-500 cursor-pointer"
-                />
-              </a>
-            </span>
-          </div>
-        </li>
-      </ul>
-    </div>
-
-    <div>
-      <h2 class="text-2xl m-2">Anything else?</h2>
-      <div class="m-2 flex">
-        <input type="checkbox" v-model="someoneGave" class="h-6 w-6" />
-        <span class="pb-2 pl-2 pr-2">Someone else gave</span>
-        <span v-if="someoneGave">
-          <input
-            type="text"
-            v-model="description"
-            size="20"
-            class="border border-slate-400 h-6 px-2"
-          />
-        </span>
-        <!-- This is to match input height to avoid shifting when hiding & showing. -->
-        <span v-else class="h-6">...</span>
-      </div>
-    </div>
-
-    <div
-      v-if="claimsToConfirmSelected.length || (someoneGave && description)"
-      class="flex justify-center mt-4"
-    >
-      <button
-        @click="record()"
-        class="block text-center text-md font-bold bg-blue-500 text-white px-2 py-3 rounded-md w-56"
-      >
-        Sign & Send
-      </button>
-    </div>
-    <div v-else class="flex justify-center mt-4">
-      <button
-        class="block text-center text-md font-bold bg-slate-500 text-white px-2 py-3 rounded-md w-56"
-      >
-        Choose What To Confirm
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import axios from "axios";
-import { DateTime } from "luxon";
-import * as R from "ramda";
-import { IIdentifier } from "@veramo/core";
-import { Component, Vue } from "vue-facing-decorator";
-
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.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 { accessToken } from "@/libs/crypto";
-import {
-  BVC_MEETUPS_PROJECT_CLAIM_ID,
-  claimSpecialDescription,
-  containsHiddenDid,
-  createAndSubmitConfirmation,
-  createAndSubmitGive,
-  ErrorResult,
-  GenericServerRecord,
-  GenericVerifiableCredential,
-} from "@/libs/endorserServer";
-import * as libsUtil from "@/libs/util";
-
-@Component({
-  methods: { claimSpecialDescription },
-  components: {
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class QuickActionBvcBeginView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
-  activeDid = "";
-  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
-  apiServer = "";
-  claimCountWithHidden = 0;
-  claimsToConfirm: GenericServerRecord[] = [];
-  claimsToConfirmSelected: string[] = [];
-  description = "breakfast";
-  loadingConfirms = true;
-  someoneGave = false;
-
-  async created() {
-    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.apiServer = settings?.apiServer || "";
-    this.activeDid = settings?.activeDid || "";
-    this.allContacts = await db.contacts.toArray();
-  }
-
-  async mounted() {
-    this.loadingConfirms = true;
-    let currentOrPreviousSat = DateTime.now().setZone("America/Denver");
-    if (currentOrPreviousSat.weekday < 6) {
-      // it's not Saturday or Sunday,
-      // so move back one week before setting to the Saturday
-      currentOrPreviousSat = currentOrPreviousSat.minus({ week: 1 });
-    }
-    const eventStartDateObj = currentOrPreviousSat
-      .set({ weekday: 6 })
-      .set({ hour: 9 })
-      .startOf("hour");
-
-    // Hack, but full ISO pushes the length to 340 which crashes verifyJWT!
-    const todayOrPreviousStartDate =
-      eventStartDateObj.toISO({
-        suppressMilliseconds: true,
-      }) || "";
-
-    await accountsDB.open();
-    const allAccounts = await accountsDB.accounts.toArray();
-    this.allMyDids = allAccounts.map((acc) => acc.did);
-    const account: Account | undefined = await accountsDB.accounts
-      .where("did")
-      .equals(this.activeDid)
-      .first();
-    const identity: IIdentifier = JSON.parse(
-      (account?.identity as string) || "null",
-    );
-    const headers = {
-      Authorization: "Bearer " + (await accessToken(identity)),
-    };
-    try {
-      const response = await fetch(
-        this.apiServer +
-          "/api/claim/?" +
-          "issuedAt_greaterThanOrEqualTo=" +
-          encodeURIComponent(todayOrPreviousStartDate) +
-          "&excludeConfirmations=true",
-        { headers },
-      );
-
-      if (!response.ok) {
-        console.log("Bad response", response);
-        throw new Error("Bad response when retrieving claims.");
-      }
-      await response.json().then((data) => {
-        const dataByOthers = R.reject(
-          (claim: GenericServerRecord) => claim.issuer === this.activeDid,
-          data,
-        );
-        const dataByOthersWithoutHidden = R.reject(
-          containsHiddenDid,
-          dataByOthers,
-        );
-        this.claimsToConfirm = dataByOthersWithoutHidden;
-        this.claimCountWithHidden =
-          dataByOthers.length - dataByOthersWithoutHidden.length;
-      });
-    } catch (error) {
-      console.error("Error:", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "There was an error retrieving today's claims to confirm.",
-        },
-        -1,
-      );
-    }
-    this.loadingConfirms = false;
-  }
-
-  onClickLoadClaim(jwtId: string) {
-    const route = {
-      path: "/claim/" + encodeURIComponent(jwtId),
-    };
-    this.$router.push(route);
-  }
-
-  async record() {
-    try {
-      const identity = await libsUtil.getIdentity(this.activeDid);
-
-      // in parallel, make a confirmation for each selected claim and send them all to the server
-      const confirmResults = await Promise.allSettled(
-        this.claimsToConfirmSelected.map(async (jwtId) => {
-          const record = this.claimsToConfirm.find(
-            (claim) => claim.id === jwtId,
-          );
-          if (!record) {
-            return { type: "error", error: "Record not found." };
-          }
-          const identity = await libsUtil.getIdentity(this.activeDid);
-          return createAndSubmitConfirmation(
-            identity,
-            record.claim as GenericVerifiableCredential,
-            record.id,
-            record.handleId,
-            this.apiServer,
-            axios,
-          );
-        }),
-      );
-      // check for any rejected confirmations
-      const confirmsSucceeded = confirmResults.filter(
-        (result) =>
-          result.status === "fulfilled" && result.value.type === "success",
-      );
-      if (confirmsSucceeded.length < this.claimsToConfirmSelected.length) {
-        console.error("Error sending confirmations:", confirmResults);
-        const howMany = confirmsSucceeded.length === 0 ? "all" : "some";
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: `There was an error sending ${howMany} of the confirmations.`,
-          },
-          -1,
-        );
-      }
-
-      // now send the give for the description
-      let giveSucceeded = false;
-      if (this.someoneGave) {
-        const giveResult = await createAndSubmitGive(
-          axios,
-          this.apiServer,
-          identity,
-          undefined,
-          this.activeDid,
-          this.description,
-          undefined,
-          undefined,
-          BVC_MEETUPS_PROJECT_CLAIM_ID,
-        );
-        giveSucceeded = giveResult.type === "success";
-        if (!giveSucceeded) {
-          console.error("Error sending give:", giveResult);
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error",
-              text:
-                (giveResult as ErrorResult)?.error?.userMessage ||
-                "There was an error sending the give.",
-            },
-            -1,
-          );
-        }
-      }
-
-      if (confirmsSucceeded.length > 0 || giveSucceeded) {
-        const confirms =
-          confirmsSucceeded.length === 1 ? "confirmation" : "confirmations";
-        const actions =
-          confirmsSucceeded.length > 0 && giveSucceeded
-            ? `${confirms} and give have been`
-            : giveSucceeded
-              ? "give has been"
-              : confirms +
-                " " +
-                (confirmsSucceeded.length === 1 ? "has" : "have") +
-                " been";
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: `Your ${actions} recorded.`,
-          },
-          -1,
-        );
-      }
-
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Error sending claims.", error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: error.userMessage || "There was an error sending claims.",
-        },
-        -1,
-      );
-    }
-  }
-}
-</script>

src/views/QuickActionBvcView.vue

@@ -1,52 +0,0 @@
-<template>
-  <QuickNav />
-  <TopMessage />
-
-  <!-- CONTENT -->
-  <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 px-4 mb-4">
-      Bountiful Voluntaryist Community Actions
-    </h1>
-
-    <div>
-      <router-link
-        :to="{ name: 'quick-action-bvc-begin' }"
-        class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
-      >
-        Beginning of Meeting
-      </router-link>
-      <router-link
-        :to="{ name: 'quick-action-bvc-end' }"
-        class="block text-center text-md font-bold uppercase bg-blue-500 text-white mt-2 px-2 py-3 rounded-md"
-      >
-        End of Meeting
-      </router-link>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-
-import QuickNav from "@/components/QuickNav.vue";
-import TopMessage from "@/components/TopMessage.vue";
-
-@Component({
-  components: {
-    QuickNav,
-    TopMessage,
-  },
-})
-export default class QuickActionBvcView extends Vue {}
-</script>

src/views/SearchAreaView.vue

@@ -2,7 +2,7 @@
   <QuickNav />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <!-- Back -->
@@ -105,15 +105,21 @@ import {
   LTileLayer,
 } from "@vue-leaflet/vue-leaflet";
 
-import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
 import { db } from "@/db/index";
 import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import QuickNav from "@/components/QuickNav.vue";
 
 const DEFAULT_LAT_LONG_DIFF = 0.01;
 const WORLD_ZOOM = 2;
 const DEFAULT_ZOOM = 2;
 
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
+
 @Component({
   components: {
     QuickNav,
@@ -124,7 +130,7 @@ const DEFAULT_ZOOM = 2;
   },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   isChoosingSearchBox = false;
   isNewMarkerSet = false;

src/views/SeedBackupView.vue

@@ -1,17 +1,7 @@
 <template>
-  <QuickNav selected="Profile" />
+  <QuickNav selected="Profile"></QuickNav>
   <!-- CONTENT -->
-  <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>
-
+  <section id="Content" class="p-6 pb-24">
     <!-- Heading -->
     <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
       Seed Backup
@@ -39,10 +29,10 @@
       </p>
 
       <p v-if="numAccounts > 1">
-        <b class="text-orange-600">Note:</b> You have more than one identifier
+        <b class="text-orange-600">Note:</b> You have more than one identity
         stored in this browser. If they are all based on the same seed as the
-        current identifier, this one backup is sufficient; however, if you have
-        different seeds for other identifiers, you will have to back them up
+        current identity, this one backup is sufficient; however, if you have
+        different seeds for other identities, you will have to back them up
         separately.
       </p>
 
@@ -59,26 +49,31 @@
         </p>
       </div>
     </div>
-    <div v-else>You do not have an active identifier.</div>
+    <div v-else>You do not have an active identity.</div>
   </section>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import * as R from "ramda";
-
-import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
 import { accountsDB, db } from "@/db/index";
+import * as R from "ramda";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import QuickNav from "@/components/QuickNav.vue";
 
 interface Account {
   mnemonic: string;
 }
 
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
+
 @Component({ components: { QuickNav } })
 export default class SeedBackupView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   activeAccount: Account | null | undefined = null;
   numAccounts = 0;
@@ -96,7 +91,7 @@ export default class SeedBackupView extends Vue {
       this.numAccounts = accounts.length;
       this.activeAccount = R.find((acc) => acc.did === activeDid, accounts);
     } catch (err: unknown) {
-      console.error("Got an error loading an identifier:", err);
+      console.error("Got an error loading an identity:", err);
       this.$notify(
         {
           group: "alert",

src/views/StartView.vue

@@ -4,7 +4,7 @@
     class="p-6 pb-24 min-h-screen flex flex-col justify-center"
   >
     <!-- Breadcrumb -->
-    <div>
+    <div class="mb-8">
       <!-- Back -->
       <div class="text-lg text-center font-light relative px-7">
         <h1
@@ -23,35 +23,27 @@
 
     <!-- id used by puppeteer test script -->
     <div id="start-question" class="mt-8">
-      <p class="text-center text-xl font-light">
-        Do you want a new identifier of your own?
-      </p>
-      <p class="text-center font-light">
-        If you haven't used this before, click "Yes" to generate a new
-        identifier.
-      </p>
-      <p class="text-center mb-4 font-light">
-        Only click "No" if you have a seed of 12 or 24 words generated
-        elsewhere.
+      <p class="text-center text-xl mb-4 font-light">
+        Do you have an identity to import?
       </p>
       <a
         @click="onClickYes()"
         class="block w-full text-center text-lg uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
       >
-        Yes, generate one
+        No
       </a>
       <a
         @click="onClickNo()"
         class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
       >
-        No, I have a seed
+        Yes
       </a>
       <a
         v-if="numAccounts > 0"
         @click="onClickDerive()"
         class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mt-2"
       >
-        Derive new address from existing seed
+        Derive New Address from Seed Imported Previously
       </a>
     </div>
   </section>

src/views/StatisticsView.vue

@@ -2,7 +2,7 @@
   <QuickNav />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <!-- Back -->
@@ -23,7 +23,7 @@
 
     <div>
       Here is a view of the activity you can see.
-      <ul class="list-disc outside ml-4">
+      <ul class="list-disc list-inside">
         <li>Each identity and claim has a unique position.</li>
         <!-- eslint-disable prettier/prettier --><!-- If we format prettier then there is extra space at the start of the line. -->
         <li>Each will show at their time of appearance relative to all others.</li>
@@ -53,10 +53,8 @@
 <script lang="ts">
 import { SVGRenderer } from "three/examples/jsm/renderers/SVGRenderer.js";
 import { Component, Vue } from "vue-facing-decorator";
-
 import { World } from "@/components/World/World.js";
 import QuickNav from "@/components/QuickNav.vue";
-import { NotificationIface } from "@/constants/app";
 
 interface RendererSVGType {
   domElement: Element;
@@ -66,9 +64,16 @@ interface Dictionary<T> {
   [key: string]: T;
 }
 
+interface Notification {
+  group: string;
+  type: string;
+  title: string;
+  text: string;
+}
+
 @Component({ components: { World, QuickNav } })
 export default class StatisticsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
+  $notify!: (notification: Notification, timeout?: number) => void;
 
   world: World;
   worldProperties: Dictionary<number> = {};

src/views/TestView.vue

@@ -2,7 +2,7 @@
   <QuickNav />
 
   <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24 max-w-3xl mx-auto">
+  <section id="Content" class="p-6 pb-24">
     <!-- Breadcrumb -->
     <div class="mb-8">
       <!-- Back -->

sw_combine.js

@@ -1,29 +0,0 @@
-/**
- * We've seen cases where the functions inside safari-notifications.js are not found.
- * This is our attempt to ensure that all the functions are available.
- */
-
-const fs = require("fs");
-const path = require("path");
-
-const swScriptsDir = path.resolve(__dirname, "sw_scripts");
-const outputFile = path.resolve(__dirname, "sw_scripts-combined.js");
-
-// Read all files in the sw_scripts directory
-fs.readdir(swScriptsDir, (err, files) => {
-  if (err) {
-    console.error("Error reading directory:", err);
-    return;
-  }
-
-  // Combine files content into one script
-  const combinedContent = files
-    .filter((file) => path.extname(file) === ".js")
-    .map((file) => fs.readFileSync(path.join(swScriptsDir, file), "utf8"))
-    .join("\n");
-
-  // Write the combined content to the output file
-  fs.writeFileSync(outputFile, combinedContent, "utf8");
-
-  console.log("Service worker files combined.");
-});

sw_scripts/additional-scripts.js

@@ -1,125 +1,65 @@
 /* eslint-env serviceworker */
 /* global workbox */
-/* eslint-disable */ /* ... because old-browser-compatible files in this directory are combined into a single script during `npm run build` */
 importScripts(
   "https://storage.googleapis.com/workbox-cdn/releases/6.4.1/workbox-sw.js",
 );
 
-function logConsoleAndDb(message, arg1, arg2) {
-  // in chrome://serviceworker-internals note that the arg1 and arg2 here will show as "[object Object]" in that page but will show as expandable objects in the console
-  console.log(`${new Date().toISOString()} ${message}`, arg1, arg2);
-  // appendDailyLog is injected at build time by the vue.config.js configureWebpack apply plugin
-  // eslint-disable-next-line no-undef
-  if (appendDailyLog) {
-    let fullMessage = `${new Date().toISOString()} ${message}`;
-    if (arg1) {
-      fullMessage += `\n${JSON.stringify(arg1)}`;
-    }
-    if (arg2) {
-      fullMessage += `\n${JSON.stringify(arg2)}`;
-    }
-    // appendDailyLog is injected from safari-notifications.js at build time by the vue.config.js configureWebpack apply plugin
-    // eslint-disable-next-line no-undef
-    appendDailyLog(fullMessage);
-  } else {
-    // sometimes we get the error: "Uncaught TypeError: appendDailyLog is not a function"
-    console.log(
-      "Not logging to DB (often because appendDailyLog doesn't exist).",
-    );
-  }
-}
-
-self.addEventListener("install", async (/* event */) => {
-  logConsoleAndDb("Service worker finished installation.");
-});
-
-self.addEventListener("activate", (event) => {
-  logConsoleAndDb("Service worker is activating...", event);
-  // see https://developer.mozilla.org/en-US/docs/Web/API/Clients/claim
-  // and https://web.dev/articles/service-worker-lifecycle#clientsclaim
-  event.waitUntil(clients.claim());
-  logConsoleAndDb("Service worker is activated.");
+self.addEventListener("install", (event) => {
+  console.error("Adding event listener for:", event);
+  importScripts(
+    "safari-notifications.js",
+    "nacl.js",
+    "noble-curves.js",
+    "noble-hashes.js",
+  );
 });
 
 self.addEventListener("push", function (event) {
-  let text = null;
-  if (event.data) {
-    text = event.data.text();
-  }
-  logConsoleAndDb("Service worker received a push event.", text, event);
   event.waitUntil(
     (async () => {
       try {
         let payload;
-        if (text) {
-          try {
-            payload = JSON.parse(text);
-          } catch (e) {
-            // don't use payload since it is not JSON
-          }
-        }
-
-        // This is a special value that tells the service worker to trigger its daily check.
-        // See https://gitea.anomalistdesign.com/trent_larson/py-push-server/src/commit/c1ed026662e754348a5f91542680bd4f57e5b81e/app.py#L217
-        const DAILY_UPDATE_TITLE = "DAILY_CHECK";
-
-        // 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 notification-test code and should be a constant. Look for the same name in HelpNotificationsView.vue
-        // Make sure it is something other than the DAILY_UPDATE_TITLE.
-        const DIRECT_PUSH_TITLE = "DIRECT_NOTIFICATION";
-
-        let title;
-        let message = "Got some empty message.";
-        if (payload && payload.title == DIRECT_PUSH_TITLE) {
-          // skip any search logic and show the message directly
-          title = "Direct Notification";
-          message = payload.message || "No details were provided.";
-        } else {
-          // any other title will run through regular filtering logic
-          if (payload && payload.title === DAILY_UPDATE_TITLE) {
-            title = "Daily Update";
-          } else {
-            title = payload.title || "Update";
-          }
-          // getNotificationCount is injected from safari-notifications.js at build time by the vue.config.js configureWebpack apply plugin
-          // eslint-disable-next-line no-undef
-          message = await getNotificationCount();
+        if (event.data) {
+          payload = JSON.parse(event.data.text());
         }
+        const message = await self.getNotificationCount();
         if (message) {
+          console.log("Will notify user:", message);
+          const title = payload ? payload.title : "Custom Title";
           const options = {
             body: message,
             icon: payload ? payload.icon : "icon.png",
             badge: payload ? payload.badge : "badge.png",
           };
           await self.registration.showNotification(title, options);
-          logConsoleAndDb("Notified user:", options);
         } else {
-          logConsoleAndDb("No notification message.");
+          console.log("No notification message, so will not tell the user.");
         }
       } catch (error) {
-        logConsoleAndDb("Error with push event", event, error);
+        console.error("Error processing the push event:", error);
       }
     })(),
   );
 });
 
 self.addEventListener("message", (event) => {
-  logConsoleAndDb("Service worker got a message...", event);
   if (event.data && event.data.type === "SEND_LOCAL_DATA") {
     self.secret = event.data.data;
     event.ports[0].postMessage({ success: true });
   }
-  logConsoleAndDb("Service worker posted a message.");
+});
+
+self.addEventListener("activate", (event) => {
+  event.waitUntil(clients.claim());
+  console.log("Service worker activated", event);
 });
 
 self.addEventListener("fetch", (event) => {
-  logConsoleAndDb("Service worker got fetch event.", event);
+  console.log("Got fetch event", event.request);
 });
 
 self.addEventListener("error", (event) => {
-  logConsoleAndDb("Service worker error", event);
-  console.error("Full Error:", event);
-  console.error("Message:", event.message);
+  console.error("Error in Service Worker:", event.message);
   console.error("File:", event.filename);
   console.error("Line:", event.lineno);
   console.error("Column:", event.colno);

sw_scripts/safari-notifications.js

@@ -395,42 +395,12 @@ async function setMostRecentNotified(id) {
       data["lastNotifiedClaimId"] = id;
       await updateRecord(store, data);
     } else {
-      console.error(
-        "safari-notifications setMostRecentNotified IndexedDB settings record not found",
-      );
+      console.error("Record not found");
     }
 
     transaction.oncomplete = () => db.close();
   } catch (error) {
-    console.error(
-      "safari-notifications setMostRecentNotified IndexedDB error",
-      error,
-    );
-  }
-}
-
-async function appendDailyLog(message) {
-  try {
-    const db = await openIndexedDB("TimeSafari");
-    const transaction = db.transaction("logs", "readwrite");
-    const store = transaction.objectStore("logs");
-    // only keep one day's worth of logs
-    const todayKey = new Date().toDateString();
-    const previous = await getRecord(store, todayKey);
-    if (!previous) {
-      await store.clear(); // clear out everything previous when this is today's first log
-    }
-    let fullMessage = (previous && previous.message) || "";
-    if (fullMessage) {
-      fullMessage += "\n";
-    }
-    fullMessage += message;
-    await updateRecord(store, { date: todayKey, message: fullMessage });
-    transaction.oncomplete = () => db.close();
-    return true;
-  } catch (error) {
-    console.error("safari-notifications logMessage IndexedDB error", error);
-    return false;
+    console.error("Database error: " + error.message);
   }
 }
 
@@ -450,7 +420,6 @@ function getRecord(store, key) {
   });
 }
 
-// Note that this assumes there is only one record in the store.
 function updateRecord(store, data) {
   return new Promise((resolve, reject) => {
     const request = store.put(data);
@@ -461,20 +430,20 @@ function updateRecord(store, data) {
 
 async function fetchAllAccounts() {
   return new Promise((resolve, reject) => {
-    const openRequest = indexedDB.open("TimeSafariAccounts");
+    let openRequest = indexedDB.open("TimeSafariAccounts");
 
     openRequest.onupgradeneeded = function (event) {
-      const db = event.target.result;
+      let db = event.target.result;
       if (!db.objectStoreNames.contains("accounts")) {
         db.createObjectStore("accounts", { keyPath: "id" });
       }
     };
 
     openRequest.onsuccess = function (event) {
-      const db = event.target.result;
-      const transaction = db.transaction("accounts", "readonly");
-      const objectStore = transaction.objectStore("accounts");
-      const getAllRequest = objectStore.getAll();
+      let db = event.target.result;
+      let transaction = db.transaction("accounts", "readonly");
+      let objectStore = transaction.objectStore("accounts");
+      let getAllRequest = objectStore.getAll();
 
       getAllRequest.onsuccess = function () {
         resolve(getAllRequest.result);
@@ -491,81 +460,74 @@ async function fetchAllAccounts() {
 }
 
 async function getNotificationCount() {
+  let secret = null;
   let accounts = [];
   let result = null;
-  // 1 is our master settings ID; see MASTER_SETTINGS_KEY
-  const settings = await getSettingById(1);
-  let lastNotifiedClaimId = null;
-  if ("lastNotifiedClaimId" in settings) {
-    lastNotifiedClaimId = settings["lastNotifiedClaimId"];
-  }
-  const activeDid = settings["activeDid"];
-  accounts = await fetchAllAccounts();
-  let activeAccount = null;
-  for (let i = 0; i < accounts.length; i++) {
-    if (accounts[i]["did"] == activeDid) {
-      activeAccount = accounts[i];
-      break;
-    }
-  }
-
-  const headers = {
-    "Content-Type": "application/json",
-  };
-
-  const identity = activeAccount && activeAccount["identity"];
-  if (identity && "secret" in self) {
-    const secret = self.secret;
+  if ("secret" in self) {
+    secret = self.secret;
     const secretUint8Array = self.decodeBase64(secret);
-    const messageWithNonceAsUint8Array = self.decodeBase64(identity);
-    const nonce = messageWithNonceAsUint8Array.slice(0, 24);
-    const message = messageWithNonceAsUint8Array.slice(24, identity.length);
-    const decoder = new TextDecoder("utf-8");
-    const decrypted = self.secretbox.open(message, nonce, secretUint8Array);
-    const msg = decoder.decode(decrypted);
-    const identifier = JSON.parse(JSON.parse(msg));
+    // 1 is our master settings ID; see MASTER_SETTINGS_KEY
+    const settings = await getSettingById(1);
+    let lastNotifiedClaimId = null;
+    if ("lastNotifiedClaimId" in settings) {
+      lastNotifiedClaimId = settings["lastNotifiedClaimId"];
+    }
+    const activeDid = settings["activeDid"];
+    accounts = await fetchAllAccounts();
+    let did = null;
+    for (var i = 0; i < accounts.length; i++) {
+      let account = accounts[i];
+      let did = account["did"];
+      if (did == activeDid) {
+        let publicKeyHex = account["publicKeyHex"];
+        let identity = account["identity"];
+        const messageWithNonceAsUint8Array = self.decodeBase64(identity);
+        const nonce = messageWithNonceAsUint8Array.slice(0, 24);
+        const message = messageWithNonceAsUint8Array.slice(24, identity.length);
+        const decoder = new TextDecoder("utf-8");
+        const decrypted = self.secretbox.open(message, nonce, secretUint8Array);
 
-    headers["Authorization"] = "Bearer " + (await accessToken(identifier));
-  }
+        const msg = decoder.decode(decrypted);
+        const identifier = JSON.parse(JSON.parse(msg));
 
-  const response = await fetch(
-    settings["apiServer"] + "/api/v2/report/claims",
-    {
-      method: "GET",
-      headers: headers,
-    },
-  );
-  if (response.status == 200) {
-    const json = await response.json();
-    const claims = json["data"];
-    let newClaims = 0;
-    for (let i = 0; i < claims.length; i++) {
-      const claim = claims[i];
-      if (claim["id"] === lastNotifiedClaimId) {
+        const headers = {
+          "Content-Type": "application/json",
+        };
+
+        headers["Authorization"] = "Bearer " + (await accessToken(identifier));
+
+        let response = await fetch(
+          settings["apiServer"] + "/api/v2/report/claims",
+          {
+            method: "GET",
+            headers: headers,
+          },
+        );
+        if (response.status == 200) {
+          let json = await response.json();
+          let claims = json["data"];
+          let newClaims = 0;
+          for (var i = 0; i < claims.length; i++) {
+            let claim = claims[i];
+            if (claim["id"] === lastNotifiedClaimId) {
+              break;
+            }
+            newClaims++;
+          }
+          if (newClaims > 0) {
+            result = `There are ${newClaims} new activities on TimeSafari`;
+          }
+          const most_recent_notified = claims[0]["id"];
+          await setMostRecentNotified(most_recent_notified);
+        } else {
+          console.error("The service worker got a bad response status when fetching claims:", response.status, response);
+        }
         break;
       }
-      newClaims++;
     }
-    if (newClaims > 0) {
-      if (newClaims === 1) {
-        result = "There is 1 new activity on Time Safari";
-      } else {
-        result = `There are ${newClaims} new activities on Time Safari`;
-      }
-    }
-    const most_recent_notified = claims[0]["id"];
-    await setMostRecentNotified(most_recent_notified);
-  } else {
-    console.error(
-      "safari-notifications getNotificationsCount got a bad response status when fetching claims",
-      response.status,
-      response,
-    );
   }
-
   return result;
 }
 
-self.appendDailyLog = appendDailyLog;
 self.getNotificationCount = getNotificationCount;
 self.decodeBase64 = decodeBase64;

vue.config.js

@@ -1,9 +1,4 @@
 const { defineConfig } = require("@vue/cli-service");
-const { gitDescribeSync } = require("git-describe");
-const { exec } = require("child_process");
-
-process.env.VUE_APP_GIT_HASH = gitDescribeSync().hash;
-
 module.exports = defineConfig({
   transpileDependencies: true,
   configureWebpack: {
@@ -11,23 +6,6 @@ module.exports = defineConfig({
     experiments: {
       topLevelAwait: true,
     },
-    plugins: [
-      {
-        // Still don't know why this runs three times.
-        apply: (compiler) => {
-          compiler.hooks.beforeCompile.tap("BeforeCompile", () => {
-            // Execute combine-sw.js script
-            exec("node sw_combine.js", (error, stdout, stderr) => {
-              if (error || stderr) {
-                console.error("Service worker files error:", error || stderr);
-              } else {
-                console.log("Finished combining service worker files.", stdout);
-              }
-            });
-          });
-        },
-      },
-    ],
   },
   pwa: {
     iconPaths: {
@@ -35,8 +13,7 @@ module.exports = defineConfig({
     },
     workboxPluginMode: "InjectManifest",
     workboxOptions: {
-      // this script will be checked for linting (sw_scripts/* files generate about 1000 linting errors)
-      swSrc: "./sw_scripts-combined.js",
+      swSrc: "./sw_scripts/additional-scripts.js",
     },
   },
 });

web-push.md

@@ -400,22 +400,3 @@ While notifications are turned on, the user can tap on the App Notifications tog
   * Active. (User can change to Muted when the user mutes notifications.)
   * Muted. (User can change to Active when the user toggles it.)
     (Turning mute off automatically after some amount of time is not planned in version 1.)
-
-
-# TROUBLESHOOTING
-
-## Desktop
-
-#### Firefox
-
-Go to `about:debugging` and click on `Inspect` for the service worker.
-
-#### Chrome
-
-Go to `chrome://inspect/#service-workers` and click on `Inspect` for the service worker.
-
-## Mobile
-
-#### Android
-
-#### iOS