fix syntax & unused code warnings

2023-07-10 19:19:53 -06:00
54 changed files with 8127 additions and 17148 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,13 @@
 .DS_Store
 node_modules
 /dist
-signature.bin
-*.pem
-verified.txt
-myenv

 *~
 # local env files
 .env.local
 .env.*.local

-# Log filesopenssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature") "$signing_input"
+# Log files
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,23 +0,0 @@
-# Changelog
-
-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]
-
-
-## [0.1.3] - 2023.11
-### Added
- Contact name editing
-### Changed
- Don't show actions on front page if not registered.
-### Removed
- Home page Notiwind test buttons
-
-
-## [0.1.2] - 2023.11.01 - 7f6c93802911a030a89fe3706e18b5c17151e5bb
-### Added
- Basics: create ID, record a give, declare a project, search, and get notifications.
--- a/README.md
+++ b/README.md
@@ -1,9 +1,6 @@
 # kickstart-for-time-pwa

 ## Project setup
-
-We have pkgx.dev set up in package.json, so you can use `dev` to set up the dev environment.
-
 ```
 npm install
 ```
@@ -14,9 +11,6 @@ npm run serve
 ```

 ### Compiles and minifies for production
-
-If you are deploying in a subdirectory, add it to `publicPath` in vue.config.js, eg: `publicPath: "/app/time-tracker/",`
-
 ```
 npm run build
 ```
@@ -26,12 +20,6 @@ npm run build
 npm run lint
 ```

-## Tests
-
-### Web-push
-
-For your own web-push tests, change the 'vapid' URL in App.vue, and install apps on the same domain.
-
 ### Test key contents

 See [this page](openssl_signing_console.rst)
@@ -54,8 +42,8 @@ by an existing user:
 On the test server, User #0 has rights to register others, so you can start
 playing one of two ways:

- Import the keys for the test User `did:ethr:0x0000694B58C2cC69658993A90D3840C560f2F51F` by importing this seed phrase:
-  `rigid shrug mobile smart veteran half all pond toilet brave review universe ship congress found yard skate elite apology jar uniform subway slender luggage`
+- Import the keys for the test User `did:ethr:0x000Ee5654b9742f6Fe18ea970e32b97ee2247B51` by importing this seed phrase:
+  `seminar accuse mystery assist delay law thing deal image undo guard initial shallow wrestle list fragile borrow velvet tomorrow awake explain test offer control`
  (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:
@@ -95,13 +83,19 @@ Clear cache for localhost, then go to http://localhost:8080/start



+## Dependencies
+
+See https://tea.xyz
+
+| Project    | Version   |
+| ---------- | --------- |
+| nodejs.org | ^16.0.0   |
+| npmjs.com  | ^8.0.0    |
+
 ## Other

 ### Reference Material

-* Notifications can be type of `toast` (self-dismiss), `info`, `success`, `warning`, and `danger`.
-  They are done via [notiwind](https://www.npmjs.com/package/notiwind) and set up in App.vue.
-
 ```
 // reference material from https://github.com/trentlarson/endorser-mobile/blob/8dc8e0353e0cc80ffa7ed89ded15c8b0da92726b/src/utility/idUtility.ts#L83

--- a/openssl_signing_console.rst
+++ b/openssl_signing_console.rst
@@ -1,11 +1,4 @@
-JWT Creation & Verification
-
-To run this in a script, see ./openssl_signing_console.sh
-
-Prerequisites: openssl, jq
-
-You can create a JWT using a library or by encoding the header and payload base64Url and signing it with a secret using
-a ES256K algorithm. Here is an example of how you can create a JWT using the jq and openssl command line utilities:
+You can create a JWT using a library or by encoding the header and payload base64Url and signing it with a secret using a ES256K algorithm. Here is an example of how you can create a JWT using the jq and openssl command line utilities:

 Here is an example of how you can use openssl to sign a JWT with the ES256K algorithm:

@@ -18,22 +11,20 @@ openssl ec -in private.pem -pubout -out public.pem

 header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'

-    Next, create a payload object as a JSON object containing the claims you want to include in the JWT.
-    For example schema.org :
+    Next, create a payload object as a JSON object containing the claims you want to include in the JWT. For example schema.org :

 payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'

    Encode the header and payload objects as base64Url strings. You can use the jq command line utility to do this:

-header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
+header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n')
+payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n')

    Concatenate the encoded header, payload, and a secret to create the signing input:

 signing_input="$header_b64.$payload_b64"

-    Create the signature by signing the signing input with a ES256K algorithm and your secret.
-    You can use the openssl command line utility to do this:
+    Create the signature by signing the signing input with a ES256K algorithm and your secret. You can use the openssl command line utility to do this:

 signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem)

@@ -48,7 +39,7 @@ Authorization: Bearer $jwt

    To verify the JWT, you can use the openssl utility with the public key:

-echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature")
+openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature") "$signing_input"
+
+    This will verify the signature and output Verified OK if the signature is valid. If the signature is not valid, it will output an error.

-    This will verify the signature and output "Verified OK" if the signature is valid.
-    If the signature is not valid, it will give an error response and output "Verification failure".
--- a/openssl_signing_console.sh
+++ b/openssl_signing_console.sh
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Generate a JWT, with signature verified using OpenSSL
-#
-# Prerequisites: openssl, jq
-#
-# Usage: source ./openssl_signing_console.sh
-#
-# For a more complete explanation, see ./openssl_signing_console.rst
-#
-# It's crazy that raw execution only works about 20% of the time!
-# See https://stackoverflow.com/questions/77505582/why-would-openssl-verify-succeed-every-time-with-source-but-fail-80-of-the
-
-
-openssl ecparam -name secp256k1 -genkey -noout -out private.pem
-openssl ec -in private.pem -pubout -out public.pem
-
-header='{"alg":"ES256K", "issuer": "", "typ":"JWT"}'
-
-payload='{"@context": "http://schema.org", "@type": "PlanAction", "identifier": "did:ethr:0xb86913f83A867b5Ef04902419614A6FF67466c12", "name": "Test", "description": "Me"}'
-
-header_b64=$(echo -n "$header" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n' | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-
-signing_input="$header_b64.$payload_b64"
-
-signature=$(echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem)
-
-echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature <(echo -n "$signature")
-
-# Also tested this, to no avail.
-#echo -n "$signature" > sig.out
-#echo -n "$signing_input" | openssl dgst -sha256 -verify public.pem -signature sig.out
-
-
-
-# Read binary signature and encode it to Base64 URL-Safe format
-signature_b64=$(echo -n "$signature" | base64 | tr -d '=' | tr '+' '-' | tr '/' '_')
-
-# Construct the JWT
-jwt="$signing_input.$signature_b64"
-
-echo Resulting JWT: $jwt
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "kickstart-for-time-pwa",
-  "version": "0.1.3",
+  "version": "0.1.0",
  "private": true,
  "scripts": {
    "serve": "vue-cli-service serve",
@@ -9,60 +9,56 @@
  },
  "dependencies": {
    "@ethersproject/hdnode": "^5.7.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.2",
-    "@fortawesome/free-solid-svg-icons": "^6.4.2",
+    "@fortawesome/fontawesome-svg-core": "^6.4.0",
+    "@fortawesome/free-solid-svg-icons": "^6.4.0",
    "@fortawesome/vue-fontawesome": "^3.0.3",
    "@pvermeer/dexie-encrypted-addon": "^3.0.0",
    "@tweenjs/tween.js": "^21.0.0",
-    "@veramo/core": "^5.4.1",
-    "@veramo/credential-w3c": "^5.4.1",
-    "@veramo/data-store": "^5.4.1",
-    "@veramo/did-manager": "^5.4.1",
-    "@veramo/did-provider-ethr": "^5.4.1",
-    "@veramo/did-resolver": "^5.4.1",
-    "@veramo/key-manager": "^5.4.1",
-    "@vueuse/core": "^10.4.1",
+    "@veramo/core": "^5.2.0",
+    "@veramo/credential-w3c": "^5.2.0",
+    "@veramo/data-store": "^5.2.0",
+    "@veramo/did-manager": "^5.1.2",
+    "@veramo/did-provider-ethr": "^5.1.2",
+    "@veramo/did-resolver": "^5.2.0",
+    "@veramo/key-manager": "^5.1.2",
+    "@vueuse/core": "^10.2.1",
    "@zxing/text-encoding": "^0.9.0",
-    "axios": "^1.5.0",
+    "axios": "^1.4.0",
    "buffer": "^6.0.3",
    "class-transformer": "^0.5.1",
-    "core-js": "^3.32.1",
+    "core-js": "^3.31.1",
    "dexie": "^3.2.4",
    "dexie-export-import": "^4.0.7",
-    "did-jwt": "^7.2.7",
-    "ethereum-cryptography": "^2.1.2",
+    "did-jwt": "^7.2.4",
+    "ethereum-cryptography": "^2.0.0",
    "ethereumjs-util": "^7.1.5",
-    "ethr-did-resolver": "^8.1.2",
-    "jdenticon": "^3.2.0",
+    "ethr-did-resolver": "^8.0.0",
    "js-generate-password": "^0.1.9",
-    "localstorage-slim": "^2.5.0",
-    "luxon": "^3.4.3",
+    "localstorage-slim": "^2.4.0",
+    "luxon": "^3.3.0",
    "merkletreejs": "^0.3.10",
    "moment": "^2.29.4",
-    "notiwind": "^2.0.2",
    "papaparse": "^5.4.1",
    "pina": "^0.20.2204228",
-    "pinia-plugin-persistedstate": "^3.2.0",
+    "pinia-plugin-persistedstate": "^3.1.0",
    "qr-code-generator-vue3": "^1.4.21",
    "ramda": "^0.29.0",
    "readable-stream": "^4.4.2",
    "reflect-metadata": "^0.1.13",
    "register-service-worker": "^1.7.2",
-    "three": "^0.156.1",
+    "three": "^0.154.0",
    "vue": "^3.3.4",
    "vue-axios": "^3.5.2",
-    "vue-facing-decorator": "^3.0.2",
-    "vue-qrcode-reader": "^5.4.1",
-    "vue-router": "^4.2.4",
+    "vue-facing-decorator": "^2.1.20",
+    "vue-property-decorator": "^9.1.2",
+    "vue-router": "^4.2.3",
    "web-did-resolver": "^2.0.27"
  },
  "devDependencies": {
-    "@types/leaflet": "^1.9.4",
    "@types/ramda": "^0.29.3",
-    "@types/three": "^0.155.1",
-    "@typescript-eslint/eslint-plugin": "^6.6.0",
-    "@typescript-eslint/parser": "^6.6.0",
-    "@vue-leaflet/vue-leaflet": "^0.10.1",
+    "@types/three": "^0.152.1",
+    "@typescript-eslint/eslint-plugin": "^5.61.0",
+    "@typescript-eslint/parser": "^5.61.0",
    "@vue/cli-plugin-babel": "~5.0.8",
    "@vue/cli-plugin-eslint": "~5.0.8",
    "@vue/cli-plugin-pwa": "~5.0.8",
@@ -71,15 +67,14 @@
    "@vue/cli-plugin-vuex": "~5.0.8",
    "@vue/cli-service": "~5.0.8",
    "@vue/eslint-config-typescript": "^11.0.3",
-    "autoprefixer": "^10.4.15",
-    "eslint": "^8.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.0.3",
-    "tailwindcss": "^3.3.3",
-    "typescript": "~5.2.2"
+    "autoprefixer": "^10.4.14",
+    "eslint": "^8.44.0",
+    "eslint-config-prettier": "^8.8.0",
+    "eslint-plugin-prettier": "^5.0.0-alpha.1",
+    "eslint-plugin-vue": "^9.15.1",
+    "postcss": "^8.4.24",
+    "prettier": "^3.0.0",
+    "tailwindcss": "^3.3.2",
+    "typescript": "~5.1.6"
  }
 }
--- a/project.task.yaml
+++ b/project.task.yaml
@@ -1,77 +1,73 @@

 tasks:
+- .5 audit all console.log calls
+- 01 design ideas for simple gives on the Home page
+- 01 add list of 'give' records for a project on ProjectView UI
+- 02 Discover page - display results (currently in console.log) & link, spin when searching
+- 08 search by location, endpoint, etc assignee:trent
+- 01 add a location for a project via map pin (see API by clicking on "Nearby")
+- 01 remove all the "form" fields (or at least investigate to see if that page refresh is desired)
+- .2 change "errorMessage" to "alertMessage" on ProjectViewView.vue

- in endorser-push-server - mount folder for persistent sqlite DB outside of container
- 40 notifications :
-  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
+- 08 Scan QR code to import into contacts.

- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s)
-
- Home Feed & Quick Give screen :
-  - 01 save the feed-viewed status in settings storage ("afterQuery")
-  - 01 quick action - send action, maybe choose via canvas tool 
-    - SEE: https://github.com/konvajs/vue-konva
-
- 24 Move to Vite assignee:matthew
-
- .3 fix the Project-location-selection map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
- .5 switch so DiscoverView shows anywhere by default, and no number unless search is done (and maybe a better filter UI, including "mine" to consolidate with ProjectsView)
- .5 Add infinite scroll to gifts on the home page
- .5 bug - search for "Safari" does not find the project, but if already on the "Anywhere" tab it shows all
- .2 figure out why endorser-mobile search doesn't find recently created PlanAction
- .1 when creating a plan, select location and then make sure you can deselect on Android
- .5 add link to further project / people when a project pays ahead
- .5 add project ID to the URL of the project-view, to make a project publicly-accessible
- .5 fix where user 0 sees no txns from user 1 on contacts page but sees them on list page
- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist
- .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
- .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
- .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
- .1 Make give description text box into something that expands as they type
- .1 Make contact info specific to Time Safari - rather pointing at CommunityCred.org
-
- Discuss whether the remaining tasks are worthwhile before MVP release.
-
- 04 allow user to download claims, mine + ones I can see about me from others
- 02 allow user to create new DIDs from the same seed phrase (ie. increment derivation path)
- .5 on ProjectView page, show immediate feedback when a gift is given (on list?) -- and consider the same for Home & Contacts pages
- .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 make a VC details page
- .1 Add units or different icon to the coins (to distinguish $, BTC, hours, etc)
- .5 include the hash of the latest commit on help page next to version
- .5 remove references to localStorage for projectId (now that it's pulling from the path)
+- contacts v1 :
+  - 01 Import contact info a la QR code.
+  - 01 Import all the non-sensitive data (ie. contacts & settings).
+  - .2 move all "identity" references to temporary account access assignee:trent

 - 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)

+- refactor UI :
+  - .5 Alerts show at the top and can be missed, eg. account data download
+  - .5 Fix how icons show on top of bottom bar on ContactAmounts page
+  - .2 Hide "Advanced" section in Account page by default
+
+- show pop-up confirming that settings & contacts have been downloaded
+
+- Ensure each action sent to the server has a confirmation - registration
+
+- Home Feed & Quick Give screen :
+  - 01 save the feed-viewed status in settings storage ("afterQuery")
+  - 01 quick action - send action, maybe choose via canvas tool https://github.com/konvajs/vue-konva
+
+- .5 customize favicon
+- 04 allow user to download claims, mine + ones I can see about me from others
+
+- 24 Move to Vite
+
+- 40 notifications :
+  - push
+
+- Discuss whether the remaining tasks are worthwhile before MVP release.
+
+- 01 fix images on project page, on discovery page
+- .2 fix "Rotary" and static icon to the right on project page
+
 - stats v1 :
  - 01 show numeric stats
-  - 04 show different graphic for projects vs people on world
  - 01 link to world for specific stats
  - .5 don't load another instance of a bush if it already exists
  - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")
  - 08 convert to cleaner implementation (maybe Drie -- https://github.com/janvorisek/drie)

+- Do we want split first name & last name?
+
 - Release Minimum Viable Product :
  - 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.
+  - Rename DB to TimeSafari.
  - 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

- .5 show seed phrase in a QR code for transfer to another device
-
- 32 accept images for projects
- 32 accept images for contacts
+- 40 notifications v+ :
+  - pull, w/ scheduled runs

 - linking between projects or plans :
  - show total time given to & from a project
@@ -79,10 +75,6 @@ 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
-
 - Stats :
  - 01 point out user's location on the world
  - 01 present a credential selected from the stats
@@ -105,12 +97,6 @@ tasks:

 - Write to or read from a different ledger (eg. private ACDC, 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.

 log:
 - videos for multiple identities https://youtu.be/p8L87AeD76w and for adding time to contacts https://youtu.be/7Yylczevp10 done:2023-03-29
--- a/sample.txt
+++ b/sample.txt
@@ -1,177 +0,0 @@
-
-> kickstart-for-time-pwa@0.1.0 build
-> vue-cli-service build
-
-All browser targets in the browserslist configuration have supported ES module.
-Therefore we don't build two separate bundles for differential loading.
-
-
- WARNING  Compiled with 5 warnings6:06:43 PM
-
-[eslint] 
-/home/matthew/projects/kick-starter-for-time-pwa/src/components/World/components/objects/landmarks.js
-   98:11  warning  Unexpected console statement  no-console
-  133:7   warning  Unexpected console statement  no-console
-  144:5   warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/router/index.ts
-  210:3  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/AccountViewView.vue
-  362:7  warning  Unexpected console statement  no-console
-  375:7  warning  Unexpected console statement  no-console
-  404:7  warning  Unexpected console statement  no-console
-  516:7  warning  Unexpected console statement  no-console
-  536:7  warning  Unexpected console statement  no-console
-  630:5  warning  Unexpected console statement  no-console
-  682:7  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/ContactAmountsView.vue
-  206:9  warning  Unexpected console statement  no-console
-  233:9  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/ContactGiftingView.vue
-  244:9  warning  Unexpected console statement  no-console
-  267:7  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/ContactsView.vue
-  340:9  warning  Unexpected console statement  no-console
-  577:9  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/DiscoverView.vue
-  315:9  warning  Unexpected console statement  no-console
-  343:7  warning  Unexpected console statement  no-console
-  390:9  warning  Unexpected console statement  no-console
-  423:7  warning  Unexpected console statement  no-console
-  532:9  warning  Unexpected console statement  no-console
-  575:7  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/HomeView.vue
-  349:9  warning  Unexpected console statement  no-console
-  498:9  warning  Unexpected console statement  no-console
-  521:7  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/IdentitySwitcherView.vue
-  142:7  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/ImportAccountView.vue
-  123:9  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/ImportDerivedAccountView.vue
-  159:7  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/NewEditProjectView.vue
-  183:9   warning  Unexpected console statement  no-console
-  215:7   warning  Unexpected console statement  no-console
-  297:13  warning  Unexpected console statement  no-console
-  320:11  warning  Unexpected console statement  no-console
-  345:7   warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/ProjectViewView.vue
-  387:9   warning  Unexpected console statement  no-console
-  421:7   warning  Unexpected console statement  no-console
-  457:7   warning  Unexpected console statement  no-console
-  552:9   warning  Unexpected console statement  no-console
-  554:11  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/ProjectsView.vue
-  131:9  warning  Unexpected console statement  no-console
-  144:7  warning  Unexpected console statement  no-console
-  221:9  warning  Unexpected console statement  no-console
-  237:7  warning  Unexpected console statement  no-console
-
-/home/matthew/projects/kick-starter-for-time-pwa/src/views/SeedBackupView.vue
-  94:7  warning  Unexpected console statement  no-console
-
-✖ 44 problems (0 errors, 44 warnings)
-
-
-You may use special comments to disable some warnings.
-Use // eslint-disable-next-line to ignore the next line.
-Use /* eslint-disable */ to ignore all warnings in a file.
- warning  
-
-/models/lupine_plant/textures/lambert2SG_baseColor.png is 3.75 MB, and won't be precached. Configure maximumFileSizeToCacheInBytes to change this limit.
-
- warning  
-
-/models/lupine_plant/textures/lambert2SG_normal.png is 4.91 MB, and won't be precached. Configure maximumFileSizeToCacheInBytes to change this limit.
-
- warning  
-
-asset size limit: The following asset(s) exceed the recommended size limit (244 KiB).
-This can impact web performance.
-Assets: 
-  js/project.44f30c9f.js (318 KiB)
-  js/statistics.8a97010a.js (586 KiB)
-  js/chunk-vendors.a4845bfb.js (411 KiB)
-  js/705.f6a6ce2a.js (252 KiB)
-  img/textures/leafy-autumn-forest-floor.jpg (705 KiB)
-  models/lupine_plant/textures/lambert2SG_baseColor.png (3.58 MiB)
-  models/lupine_plant/textures/lambert2SG_normal.png (4.69 MiB)
-
- warning  
-
-entrypoint size limit: The following entrypoint(s) combined asset size exceeds the recommended limit (244 KiB). This can impact web performance.
-Entrypoints:
-  app (447 KiB)
-      js/chunk-vendors.a4845bfb.js
-      css/app.8f21529c.css
-      js/app.8833cebc.js
-
-
-  File                                      Size             Gzipped
-
-  dist/js/statistics.8a97010a.js            585.72 KiB       148.80 KiB
-  dist/js/chunk-vendors.a4845bfb.js         411.44 KiB       137.82 KiB
-  dist/js/project.44f30c9f.js               317.61 KiB       78.67 KiB
-  dist/js/705.f6a6ce2a.js                   251.66 KiB       87.12 KiB
-  dist/js/891.33615e4f.js                   147.32 KiB       42.09 KiB
-  dist/js/153.e2c8e249.js                   146.26 KiB       42.21 KiB
-  dist/js/820.13565d16.js                   66.10 KiB        18.33 KiB
-  dist/js/contact-qr.e170ec33.js            54.85 KiB        15.63 KiB
-  dist/js/772.7b4c53a7.js                   30.29 KiB        7.21 KiB
-  dist/js/361.898a4525.js                   27.40 KiB        8.19 KiB
-  dist/js/account.77d86130.js               17.51 KiB        5.93 KiB
-  dist/js/app.8833cebc.js                   17.31 KiB        5.84 KiB
-  dist/js/contacts.3fc90ff8.js              16.94 KiB        5.52 KiB
-  dist/js/discover.24106939.js              15.30 KiB        5.22 KiB
-  dist/js/536.3bb13201.js                   15.23 KiB        4.84 KiB
-  dist/workbox-5b385ed2.js                  14.11 KiB        4.93 KiB
-  dist/js/home.218b99dd.js                  13.89 KiB        4.97 KiB
-  dist/js/help.50d3117b.js                  12.49 KiB        4.38 KiB
-  dist/js/projects.417a6cb7.js              8.71 KiB         3.00 KiB
-  dist/js/contact-amounts.a32b0ccd.js       8.44 KiB         3.25 KiB
-  dist/js/229.120e09bf.js                   7.99 KiB         2.72 KiB
-  dist/js/identity-switcher.c7937333.js     7.44 KiB         2.52 KiB
-  dist/js/new-edit-project.0552181b.js      7.36 KiB         3.11 KiB
-  dist/js/300.dcaeb2a3.js                   6.56 KiB         3.24 KiB
-  dist/js/seed-backup.76a0f7b3.js           3.99 KiB         1.97 KiB
-  dist/js/import-derive.c688d4b8.js         3.81 KiB         1.82 KiB
-  dist/js/import-account.c3fa35fd.js        3.54 KiB         1.66 KiB
-  dist/js/new-edit-account.bb763be2.js      3.39 KiB         1.51 KiB
-  dist/js/431.5a6d64e0.js                   3.38 KiB         2.56 KiB
-  dist/service-worker.js                    3.37 KiB         1.38 KiB
-  dist/js/scan-contact.46be989a.js          2.79 KiB         1.18 KiB
-  dist/js/start.091a7740.js                 2.70 KiB         1.30 KiB
-  dist/js/new-identifier.bb379420.js        2.12 KiB         1.18 KiB
-  dist/js/93.b873dbbf.js                    2.08 KiB         1.61 KiB
-  dist/js/new-edit-commitment.9248d367.j    1.96 KiB         1.05 KiB
-  s
-  dist/js/confirm-contact.02004d1d.js       1.89 KiB         1.04 KiB
-  dist/js/858.ae4c08ec.js                   0.97 KiB         0.78 KiB
-  dist/css/app.8f21529c.css                 18.41 KiB        4.39 KiB
-  dist/css/discover.73ee9bd3.css            14.77 KiB        6.25 KiB
-  dist/css/new-edit-project.73ee9bd3.css    14.77 KiB        6.25 KiB
-  dist/css/contacts.abb5e493.css            0.40 KiB         0.23 KiB
-  dist/css/contact-amounts.5b26ccd4.css     0.31 KiB         0.20 KiB
-  dist/css/home.828bc66e.css                0.25 KiB         0.19 KiB
-  dist/css/project.828bc66e.css             0.25 KiB         0.19 KiB
-  dist/css/statistics.828bc66e.css          0.25 KiB         0.19 KiB
-
-  Images and other types of assets omitted.
-  Build at: 2023-09-07T10:06:43.972Z - Hash: 2b39fcd4d0e78263 - Time: 32016ms
-
- DONE  Build complete. The dist directory is ready to be deployed.
- INFO  Check out deployment instructions at https://cli.vuejs.org/guide/deployment.html
-       
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,426 +1,7 @@
 <template>
  <router-view />
-
-  <!-- https://github.com/emmanuelsw/notiwind -->
-  <NotificationGroup group="alert">
-    <div
-      class="fixed top-4 right-4 w-full max-w-sm flex flex-col items-start justify-end"
-    >
-      <Notification
-        v-slot="{ notifications, close }"
-        enter="transform ease-out duration-300 transition"
-        enter-from="translate-y-2 opacity-0 sm:translate-y-0 sm:translate-x-4"
-        enter-to="translate-y-0 opacity-100 sm:translate-x-0"
-        leave="transition ease-in duration-500"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-        move="transition duration-500"
-        move-delay="delay-300"
-      >
-        <div
-          v-for="notification in notifications"
-          :key="notification.id"
-          class="w-full"
-          role="alert"
-        >
-          <div
-            v-if="notification.type === 'toast'"
-            class="w-full max-w-sm mx-auto mb-3 overflow-hidden bg-slate-900/90 text-white rounded-lg shadow-md"
-          >
-            <div class="w-full px-4 py-3">
-              <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ notification.text }}</p>
-            </div>
-          </div>
-
-          <div
-            v-if="notification.type === 'info'"
-            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-slate-100 rounded-lg shadow-md"
-          >
-            <div
-              class="flex items-center justify-center w-12 bg-slate-600 text-slate-100"
-            >
-              <fa icon="circle-info" class="fa-fw fa-xl"></fa>
-            </div>
-
-            <div class="relative w-full pl-4 pr-8 py-2 text-slate-900">
-              <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ notification.text }}</p>
-
-              <button
-                @click="close(notification.id)"
-                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-slate-200 text-slate-600"
-              >
-                <fa icon="xmark" class="fa-fw"></fa>
-              </button>
-            </div>
-          </div>
-
-          <div
-            v-if="notification.type === 'success'"
-            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-emerald-100 rounded-lg shadow-md"
-          >
-            <div
-              class="flex items-center justify-center w-12 bg-emerald-600 text-emerald-100"
-            >
-              <fa icon="circle-info" class="fa-fw fa-xl"></fa>
-            </div>
-
-            <div class="relative w-full pl-4 pr-8 py-2 text-emerald-900">
-              <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ notification.text }}</p>
-
-              <button
-                @click="close(notification.id)"
-                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-emerald-200 text-emerald-600"
-              >
-                <fa icon="xmark" class="fa-fw"></fa>
-              </button>
-            </div>
-          </div>
-
-          <div
-            v-if="notification.type === 'warning'"
-            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-amber-100 rounded-lg shadow-md"
-          >
-            <div
-              class="flex items-center justify-center w-12 bg-amber-600 text-amber-100"
-            >
-              <fa icon="triangle-exclamation" class="fa-fw fa-xl"></fa>
-            </div>
-
-            <div class="relative w-full pl-4 pr-8 py-2 text-amber-900">
-              <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ notification.text }}</p>
-
-              <button
-                @click="close(notification.id)"
-                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-amber-200 text-amber-600"
-              >
-                <fa icon="xmark" class="fa-fw"></fa>
-              </button>
-            </div>
-          </div>
-
-          <div
-            v-if="notification.type === 'danger'"
-            class="flex w-full max-w-sm mx-auto mb-3 overflow-hidden bg-rose-100 rounded-lg shadow-md"
-          >
-            <div
-              class="flex items-center justify-center w-12 bg-rose-600 text-rose-100"
-            >
-              <fa icon="triangle-exclamation" class="fa-fw fa-xl"></fa>
-            </div>
-
-            <div class="relative w-full pl-4 pr-8 py-2 text-rose-900">
-              <span class="font-semibold">{{ notification.title }}</span>
-              <p class="text-sm">{{ notification.text }}</p>
-
-              <button
-                @click="close(notification.id)"
-                class="absolute top-2 right-2 px-0.5 py-0 rounded-full bg-rose-200 text-rose-600"
-              >
-                <fa icon="xmark" class="fa-fw"></fa>
-              </button>
-            </div>
-          </div>
-        </div>
-      </Notification>
-    </div>
-  </NotificationGroup>
-
-  <NotificationGroup group="modal">
-    <div class="fixed z-[100] top-0 inset-x-0 w-full">
-      <Notification
-        v-slot="{ notifications, close }"
-        enter="transform ease-out duration-300 transition"
-        enter-from="translate-y-2 opacity-0 sm:translate-y-4"
-        enter-to="translate-y-0 opacity-100 sm:translate-y-0"
-        leave="transition ease-in duration-500"
-        leave-from="opacity-100"
-        leave-to="opacity-0"
-        move="transition duration-500"
-        move-delay="delay-300"
-      >
-        <div
-          v-for="notification in notifications"
-          :key="notification.id"
-          class="w-full"
-          role="alert"
-        >
-          <div
-            v-if="notification.type === 'notification-permission'"
-            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-          >
-            <div
-              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-            >
-              <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <p class="text-lg mb-4">
-                  Would you like to <b>turn on</b> notifications for this app?
-                </p>
-
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                  @click="
-                    close(notification.id);
-                    turnOnNotifications();
-                  "
-                >
-                  Turn on Notifications
-                </button>
-                <div class="grid grid-cols-2 gap-2">
-                  <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>
-          <div
-            v-if="notification.type === 'notification-mute'"
-            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-          >
-            <div
-              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-            >
-              <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <p class="text-lg mb-4">Mute app notifications:</p>
-
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  For 1 Hour
-                </button>
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  For 8 Hours
-                </button>
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  For 24 Hours
-                </button>
-                <button
-                  class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
-                >
-                  Until I turn it back on
-                </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"
-                >
-                  Cancel
-                </button>
-              </div>
-            </div>
-          </div>
-          <div
-            v-if="notification.type === 'notification-off'"
-            class="absolute inset-0 h-screen flex flex-col items-center justify-center bg-slate-900/50"
-          >
-            <div
-              class="flex w-11/12 max-w-sm mx-auto mb-3 overflow-hidden bg-white rounded-lg shadow-lg"
-            >
-              <div class="w-full px-6 py-6 text-slate-900 text-center">
-                <p class="text-lg mb-4">
-                  Would you like to <b>turn off</b> notifications for this app?
-                </p>
-
-                <button
-                  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
-                </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"
-                >
-                  Leave it On
-                </button>
-              </div>
-            </div>
-          </div>
-        </div>
-      </Notification>
-    </div>
-  </NotificationGroup>
 </template>

 <style></style>

-<script lang="ts">
-import { Vue, Component } from "vue-facing-decorator";
-import axios from "axios";
-
-@Component
-export default class App extends Vue {
-  b64 = "";
-  mounted() {
-    axios
-      .get("https://timesafari-pwa.anomalistlabs.com/web-push/vapid")
-      .then((response) => {
-        this.b64 = response.data.vapidKey;
-        console.log(this.b64);
-      })
-      .catch((error) => {
-        console.error("API error", error);
-      });
-  }
-
-  private askPermission(): Promise<NotificationPermission> {
-    // Check if Notifications are supported
-    if (!("Notification" in window)) {
-      alert("This browser does not support notifications.");
-      return Promise.reject("This browser does not support notifications.");
-    }
-
-    // Check existing permissions
-    if (Notification.permission === "granted") {
-      return Promise.resolve("granted");
-    }
-
-    // Request permission
-    return new Promise((resolve, reject) => {
-      const permissionResult = Notification.requestPermission((result) => {
-        resolve(result);
-      });
-
-      if (permissionResult) {
-        permissionResult.then(resolve, reject);
-      }
-    }).then((permissionResult) => {
-      console.log("Permission result:", permissionResult);
-
-      if (permissionResult !== "granted") {
-        alert("We need notification permission to provide certain features.");
-        return Promise.reject("We weren't granted permission.");
-      }
-
-      return permissionResult;
-    });
-  }
-
-  async turnOnNotifications() {
-    return this.askPermission()
-      .then((permission) => {
-        console.log("Permission granted:", permission);
-
-        // Call the function and handle promises
-        this.subscribeToPush()
-          .then(() => {
-            console.log("Subscribed successfully.");
-            // Assuming the subscription object is available
-            return navigator.serviceWorker.ready;
-          })
-          .then((registration) => {
-            // Fetch the existing subscription object from the registration
-            return registration.pushManager.getSubscription();
-          })
-          .then((subscription) => {
-            if (subscription) {
-              console.log(subscription);
-              return this.sendSubscriptionToServer(subscription);
-            } else {
-              throw new Error("Subscription object is not available.");
-            }
-          })
-          .then(() => {
-            console.log("Subscription data sent to server.");
-          })
-          .catch((error) => {
-            console.error(
-              "Subscription or server communication failed:",
-              error,
-            );
-          });
-      })
-      .catch((error) => {
-        console.error("An error occurred:", error);
-        // Handle error appropriately here
-      });
-  }
-
-  // Function to convert URL base64 to Uint8Array
-  private urlBase64ToUint8Array(base64String: string): Uint8Array {
-    const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
-    const base64 = (base64String + padding)
-      .replace(/-/g, "+")
-      .replace(/_/g, "/");
-    const rawData = window.atob(base64);
-    const outputArray = new Uint8Array(rawData.length);
-
-    for (let i = 0; i < rawData.length; ++i) {
-      outputArray[i] = rawData.charCodeAt(i);
-    }
-    return outputArray;
-  }
-
-  // The subscribeToPush method
-  private subscribeToPush(): Promise<void> {
-    return new Promise<void>((resolve, reject) => {
-      if ("serviceWorker" in navigator && "PushManager" in window) {
-        const applicationServerKey = this.urlBase64ToUint8Array(this.b64);
-        const options: PushSubscriptionOptions = {
-          userVisibleOnly: true,
-          applicationServerKey: applicationServerKey,
-        };
-        console.log(options);
-
-        navigator.serviceWorker.ready
-          .then((registration) => {
-            return registration.pushManager.subscribe(options);
-          })
-          .then((subscription) => {
-            console.log("Push subscription successful:", subscription);
-            resolve();
-          })
-          .catch((error) => {
-            console.error("Push subscription failed:", error, options);
-            reject(error);
-          });
-      } else {
-        const errorMsg = "Push messaging is not supported";
-        console.warn(errorMsg);
-        reject(new Error(errorMsg));
-      }
-    });
-  }
-
-  private sendSubscriptionToServer(
-    subscription: PushSubscription,
-  ): Promise<void> {
-    console.log(subscription);
-    return fetch("/web-push/subscribe", {
-      method: "POST",
-      headers: {
-        "Content-Type": "application/json",
-      },
-      body: JSON.stringify(subscription),
-    }).then((response) => {
-      if (!response.ok) {
-        throw new Error("Failed to send subscription to server");
-      }
-      console.log("Subscription sent to server successfully.");
-    });
-  }
-
-  never(ID: string) {
-    alert(ID);
-  }
-
-  maybeLater(ID: string) {
-    alert(ID);
-  }
-}
-</script>
+<script lang="ts"></script>
--- a/src/components/AlertMessage.vue
+++ b/src/components/AlertMessage.vue
@@ -0,0 +1,47 @@
+<template>
+  <div v-bind:class="computedAlertClassNames()">
+    <button
+      class="close-button bg-slate-200 w-8 leading-loose rounded-full absolute top-2 right-2"
+      @click="onClickClose()"
+    >
+      <fa icon="xmark"></fa>
+    </button>
+    <h4 class="font-bold pr-5">{{ alertTitle }}</h4>
+    <p>{{ alertMessage }}</p>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-facing-decorator";
+
+@Component
+export default class AlertMessage extends Vue {
+  @Prop alertTitle = "";
+  @Prop alertMessage = "";
+  isAlertVisible = this.alertMessage;
+
+  public onClickClose() {
+    this.isAlertVisible = false;
+  }
+
+  public computedAlertClassNames() {
+    return {
+      hidden: !this.isAlertVisible,
+      "dismissable-alert": true,
+      "bg-slate-100": true,
+      "p-5": true,
+      rounded: true,
+      "drop-shadow-lg": true,
+      fixed: true,
+      "top-3": true,
+      "inset-x-3": true,
+      "transition-transform": true,
+      "ease-in": true,
+      "duration-300": true,
+    };
+  }
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped></style>
--- a/src/components/EntityIcon.vue
+++ b/src/components/EntityIcon.vue
@@ -1,32 +0,0 @@
-<template>
-  <div v-html="generateIdenticon()" class="w-fit"></div>
-</template>
-<script lang="ts">
-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;
-
-  generateIdenticon() {
-    const config = this.entityId ? undefined : BLANK_CONFIG;
-    const svgString = toSvg(this.entityId, this.iconSize, config);
-    return svgString;
-  }
-}
-</script>
-<style scoped></style>
--- a/src/components/GiftedDialog.vue
+++ b/src/components/GiftedDialog.vue
@@ -1,108 +1,59 @@
 <template>
  <div v-if="visible" class="dialog-overlay">
    <div class="dialog">
-      <h1 class="text-xl font-bold text-center mb-4">
-        {{ message }} {{ giver?.name || "somebody not named" }}
+      <h1 class="text-lg text-center">
+        {{ message }} {{ giver?.name || "somebody not specified" }}
      </h1>
      <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"
        placeholder="What was received"
        v-model="description"
      />
-      <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 px-2 py-2"
-          >Hours</span
-        >
-        <div
-          class="border border-r-0 border-slate-400 bg-slate-200 px-4 py-2"
-          @click="decrement()"
-        >
-          <fa icon="chevron-left" />
-        </div>
+      <div class="flex flex-row">
+        <span class="py-4">Hours</span>
        <input
          type="text"
-          class="w-full border border-r-0 border-slate-400 px-2 py-2 text-center"
+          class="block w-8 rounded border border-slate-400 ml-4 text-center"
          v-model="hours"
        />
-        <div
-          class="rounded-r border border-slate-400 bg-slate-200 px-4 py-2"
-          @click="increment()"
-        >
-          <fa icon="chevron-right" />
+        <div class="flex flex-col px-1">
+          <div>
+            <fa icon="square-caret-up" size="2xl" @click="increment()" />
+          </div>
+          <div>
+            <fa icon="square-caret-down" size="2xl" @click="decrement()" />
+          </div>
        </div>
      </div>
-      <p class="text-center mb-2 italic">Sign & Send to publish to the world</p>
-      <button
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        @click="confirm"
-      >
-        Sign &amp; Send
-      </button>
-      <button
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-        @click="cancel"
-      >
-        Cancel
-      </button>
+      <p class="text-right">Sign & Send to publish to the world</p>
+      <div class="text-right">
+        <button class="rounded border border-slate-400" @click="confirm">
+          <span class="m-2">Sign & Send</span>
+        </button>
+        &nbsp;
+        <button class="rounded border border-slate-400" @click="cancel">
+          <span class="m-2">Cancel</span>
+        </button>
+      </div>
    </div>
  </div>
 </template>

 <script lang="ts">
-import { Vue, Component, Prop } from "vue-facing-decorator";
-import { createAndSubmitGive, GiverInputInfo } from "@/libs/endorserServer";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { Vue, Component, Prop, Emit } from "vue-facing-decorator";

@Component
 export default class GiftedDialog extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  @Prop message = "";
-  @Prop projectId = "";

-  activeDid = "";
-  apiServer = "";
-
-  giver?: GiverInputInfo;
+  giver = null;
  description = "";
  hours = "0";
  visible = false;

-  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 || "";
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      console.log("Error retrieving settings from database:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text:
-            err.message ||
-            "There was an error retrieving the latest sweet, sweet action.",
-        },
-        -1,
-      );
-    }
-  }
-
-  open(giver: GiverInputInfo) {
+  open(giver) {
+    // giver: GiverInputInfo
    this.giver = giver;
    this.visible = true;
  }
@@ -119,169 +70,27 @@ export default class GiftedDialog extends Vue {
    this.hours = `${Math.max(0, (parseFloat(this.hours) || 1) - 1)}`;
  }

-  cancel() {
+  @Emit("dialog-result")
+  confirm() {
+    const result = {
+      action: "confirm",
+      giver: this.giver,
+      hours: parseFloat(this.hours),
+      description: this.description,
+    };
    this.close();
    this.description = "";
-    this.giver = undefined;
+    this.giver = null;
    this.hours = "0";
+
+    return result;
  }

-  async confirm() {
+  @Emit("dialog-result")
+  cancel() {
+    const result = { action: "cancel" };
    this.close();
-    this.$notify(
-      {
-        group: "alert",
-        type: "toast",
-        text: "Recording the give...",
-        title: "",
-      },
-      1000,
-    );
-    // this is asynchronous, but we don't need to wait for it to complete
-    this.recordGive(
-      this.giver?.did as string | undefined,
-      this.description,
-      parseFloat(this.hours),
-    ).then(() => {
-      this.description = "";
-      this.giver = undefined;
-      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 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 hours may be 0
-   */
-  public async recordGive(
-    giverDid?: string,
-    description?: string,
-    hours?: number,
-  ) {
-    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identity before you can record a give.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    if (!description && !hours) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must enter a description or some number of hours.",
-        },
-        -1,
-      );
-      return;
-    }
-
-    try {
-      const identity = await this.getIdentity(this.activeDid);
-      const result = await createAndSubmitGive(
-        this.axios,
-        this.apiServer,
-        identity,
-        giverDid,
-        this.activeDid,
-        description,
-        hours,
-        this.projectId,
-      );
-
-      if (
-        result.type === "error" ||
-        this.isGiveCreationError(result.response)
-      ) {
-        const errorMessage = this.getGiveCreationErrorMessage(result);
-        console.log("Error with give creation result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error creating the give.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "That gift was recorded.",
-          },
-          10000,
-        );
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.log("Error with give recordation caught:", error);
-      const message =
-        error.userMessage ||
-        error.response?.data?.error?.message ||
-        "There was an error recording the give.";
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: message,
-        },
-        -1,
-      );
-    }
-  }
-
-  // Helper functions for readability
-
-  /**
-   * @param result response "data" from the server
-   * @returns true if the result indicates an error
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isGiveCreationError(result: any) {
-    return result.status !== 201 || result.data?.error;
-  }
-
-  /**
-   * @param result direct response eg. ErrorResult or SuccessResult (potentially with embedded "data")
-   * @returns best guess at an error message
-   */
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getGiveCreationErrorMessage(result: any) {
-    return (
-      result.error?.userMessage ||
-      result.error?.error ||
-      result.response?.data?.error?.message
-    );
+    return result;
  }
 }
 </script>
@@ -297,14 +106,12 @@ export default class GiftedDialog extends Vue {
  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;
+  width: 50%;
 }
 </style>
--- a/src/components/HelloWorld.vue
+++ b/src/components/HelloWorld.vue
@@ -0,0 +1,146 @@
+<template>
+  <div class="hello">
+    <h1>{{ msg }}</h1>
+    <p>
+      For a guide and recipes on how to configure / customize this project,<br />
+      check out the
+      <a href="https://cli.vuejs.org" target="_blank" rel="noopener"
+        >vue-cli documentation</a
+      >.
+    </p>
+    <h3>Installed CLI Plugins</h3>
+    <ul>
+      <li>
+        <a
+          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-babel"
+          target="_blank"
+          rel="noopener"
+          >babel</a
+        >
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-pwa"
+          target="_blank"
+          rel="noopener"
+          >pwa</a
+        >
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-router"
+          target="_blank"
+          rel="noopener"
+          >router</a
+        >
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-vuex"
+          target="_blank"
+          rel="noopener"
+          >vuex</a
+        >
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-eslint"
+          target="_blank"
+          rel="noopener"
+          >eslint</a
+        >
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/vue-cli/tree/dev/packages/%40vue/cli-plugin-typescript"
+          target="_blank"
+          rel="noopener"
+          >typescript</a
+        >
+      </li>
+    </ul>
+    <h3>Essential Links</h3>
+    <ul>
+      <li>
+        <a href="https://vuejs.org" target="_blank" rel="noopener">Core Docs</a>
+      </li>
+      <li>
+        <a href="https://forum.vuejs.org" target="_blank" rel="noopener"
+          >Forum</a
+        >
+      </li>
+      <li>
+        <a href="https://chat.vuejs.org" target="_blank" rel="noopener"
+          >Community Chat</a
+        >
+      </li>
+      <li>
+        <a href="https://twitter.com/vuejs" target="_blank" rel="noopener"
+          >Twitter</a
+        >
+      </li>
+      <li>
+        <a href="https://news.vuejs.org" target="_blank" rel="noopener">News</a>
+      </li>
+    </ul>
+    <h3>Ecosystem</h3>
+    <ul>
+      <li>
+        <a href="https://router.vuejs.org" target="_blank" rel="noopener"
+          >vue-router</a
+        >
+      </li>
+      <li>
+        <a href="https://vuex.vuejs.org" target="_blank" rel="noopener">vuex</a>
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/vue-devtools#vue-devtools"
+          target="_blank"
+          rel="noopener"
+          >vue-devtools</a
+        >
+      </li>
+      <li>
+        <a href="https://vue-loader.vuejs.org" target="_blank" rel="noopener"
+          >vue-loader</a
+        >
+      </li>
+      <li>
+        <a
+          href="https://github.com/vuejs/awesome-vue"
+          target="_blank"
+          rel="noopener"
+          >awesome-vue</a
+        >
+      </li>
+    </ul>
+  </div>
+</template>
+
+<script lang="ts">
+import { Component, Prop, Vue } from "vue-facing-decorator";
+
+@Component
+export default class HelloWorld extends Vue {
+  @Prop msg!: string;
+}
+</script>
+
+<!-- Add "scoped" attribute to limit CSS to this component only -->
+<style scoped>
+h3 {
+  margin: 40px 0 0;
+}
+ul {
+  list-style-type: none;
+  padding: 0;
+}
+li {
+  display: inline-block;
+  margin: 0 10px;
+}
+a {
+  color: #42b983;
+}
+</style>
--- a/src/constants/app.ts
+++ b/src/constants/app.ts
@@ -1,24 +1,12 @@
 /**
 * Generic strings that could be used throughout the app.
- *
- * See also ../libs/veramo/setup.ts
 */
 export enum AppString {
-  APP_NAME = "TimeSafari",
+  APP_NAME = "Kick-Start with Time",

-  PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
-  TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",
+  PROD_ENDORSER_API_SERVER = "https://endorser.ch:3000",
+  TEST_ENDORSER_API_SERVER = "https://test.endorser.ch:8000",
  LOCAL_ENDORSER_API_SERVER = "http://localhost:3000",

  DEFAULT_ENDORSER_API_SERVER = TEST_ENDORSER_API_SERVER,
 }
-
-/**
- * See notiwind package
- */
-export interface NotificationIface {
-  group: string;
-  type: string; // "toast" | "info" | "success" | "warning" | "danger"
-  title: string;
-  text: string;
-}
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -9,39 +9,60 @@ import {
 } from "./tables/settings";
 import { AppString } from "@/constants/app";

-// Define types for tables that hold sensitive and non-sensitive data
-type SensitiveTables = { accounts: Table<Account> };
+// a separate DB because the seed is super-sensitive data
+type SensitiveTables = {
+  accounts: Table<Account>;
+};
+
 type NonsensitiveTables = {
  contacts: Table<Contact>;
  settings: Table<Settings>;
 };

-// Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
+/**
+ * In order to make the next line be acceptable, the program needs to have its linter suppress a rule:
+ *   https://typescript-eslint.io/rules/no-unnecessary-type-constraint/
+ *
+ * and change *any* to *unknown*
+ *
+ *   https://9to5answer.com/how-to-bypass-warning-unexpected-any-specify-a-different-type-typescript-eslint-no-explicit-any
+ */
 export type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
+export const accountsDB = new BaseDexie("KickStartAccounts") as SensitiveDexie;
+const SensitiveSchemas = Object.assign({}, AccountsSchema);
+
 export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
  BaseDexie & T;
+export const db = new BaseDexie("KickStart") as NonsensitiveDexie;
+const NonsensitiveSchemas = Object.assign({}, ContactsSchema, SettingsSchema);

-// Initialize Dexie databases for sensitive and non-sensitive data
-export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
-const SensitiveSchemas = { ...AccountsSchema };
+/**
+ * Needed to enable a special webpack setting to allow *await* below:
+ *   https://stackoverflow.com/questions/72474803/error-the-top-level-await-experiment-is-not-enabled-set-experiments-toplevelaw
+ */

-export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
-const NonsensitiveSchemas = { ...ContactsSchema, ...SettingsSchema };
-
-// Manage the encryption key. If not present in localStorage, create and store it.
+/**
+ * Create password and place password in localStorage.
+ *
+ * It's good practice to keep the data encrypted at rest, so we'll do that even
+ * if the secret is stored right next to the app.
+ */
 const secret =
  localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
-if (!localStorage.getItem("secret")) localStorage.setItem("secret", secret);

-// Apply encryption to the sensitive database using the secret key
+if (localStorage.getItem("secret") == null) {
+  localStorage.setItem("secret", secret);
+}
+
+//console.log("IndexedDB Encryption Secret:", secret);
 encrypted(accountsDB, { secretKey: secret });
-
-// Define the schema for our databases
 accountsDB.version(1).stores(SensitiveSchemas);
+
 db.version(1).stores(NonsensitiveSchemas);

-// Event handler to initialize the non-sensitive database with default settings
-db.on("populate", () => {
+// initialize, a la https://dexie.org/docs/Tutorial/Design#the-populate-event
+db.on("populate", function () {
+  // ensure there's an initial entry for settings
  db.settings.add({
    id: MASTER_SETTINGS_KEY,
    apiServer: AppString.DEFAULT_ENDORSER_API_SERVER,
--- a/src/db/tables/accounts.ts
+++ b/src/db/tables/accounts.ts
@@ -1,50 +1,17 @@
-/**
- * Represents an account stored in the database.
- */
 export type Account = {
-  /**
-   * Auto-generated ID by Dexie.
-   */
-  id?: number;
-
-  /**
-   * The date the account was created.
-   */
+  id?: number; // auto-generated by Dexie
  dateCreated: string;
-
-  /**
-   * The derivation path for the account.
-   */
  derivationPath: string;
-
-  /**
-   * Decentralized Identifier (DID) for the account.
-   */
  did: string;
-
-  /**
-   * Stringified JSON containing underlying key material.
-   * Based on the IIdentifier type from Veramo.
-   * @see {@link https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts}
-   */
+  // stringified JSON containing underlying key material of type IIdentifier
+  // https://github.com/uport-project/veramo/blob/next/packages/core-types/src/types/IIdentifier.ts
  identity: string;
-
-  /**
-   * The public key in hexadecimal format.
-   */
  publicKeyHex: string;
-
-  /**
-   * The mnemonic passphrase for the account.
-   */
  mnemonic: string;
 };

-/**
- * Schema for the accounts table in the database.
- * Fields starting with a $ character are encrypted.
- * @see {@link https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon}
- */
+// mark encrypted field by starting with a $ character
+// see https://github.com/PVermeer/dexie-addon-suite-monorepo/tree/master/packages/dexie-encrypted-addon
 export const AccountsSchema = {
  accounts:
    "++id, dateCreated, derivationPath, did, $identity, $mnemonic, publicKeyHex",
--- a/src/db/tables/contacts.ts
+++ b/src/db/tables/contacts.ts
@@ -7,5 +7,5 @@ export interface Contact {
 }

 export const ContactsSchema = {
-  contacts: "&did, name, publicKeyBase64, registered, seesMe",
+  contacts: "++did, name, publicKeyBase64, registered, seesMe",
 };
--- a/src/db/tables/settings.ts
+++ b/src/db/tables/settings.ts
@@ -1,47 +1,17 @@
-/**
- * BoundingBox type describes the geographical bounding box coordinates.
- */
-export type BoundingBox = {
-  eastLong: number; // Eastern longitude
-  maxLat: number; // Maximum (Northernmost) latitude
-  minLat: number; // Minimum (Southernmost) latitude
-  westLong: number; // Western longitude
-};
-
-/**
- * Settings type encompasses user-specific configuration details.
- */
+// a singleton
 export type Settings = {
-  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
-  lastName?: string; // User's last name
-  lastViewedClaimId?: string; // Last viewed claim ID
-  lastNotifiedClaimId?: string; // Last notified claim ID
-  isRegistered?: boolean;
+  id: number; // there's only one entry: MASTER_SETTINGS_KEY

-  // Array of named search boxes defined by bounding boxes
-
-  searchBoxes?: Array<{
-    name: string;
-    bbox: BoundingBox;
-  }>;
-
-  showContactGivesInline?: boolean; // Display contact inline or not
-  vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
-  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
-  reminderOn?: boolean; // Toggle to enable or disable reminders
+  activeDid?: string;
+  apiServer?: string;
+  firstName?: string;
+  lastName?: string;
+  lastViewedClaimId?: string;
+  showContactGivesInline?: boolean;
 };

-/**
- * Schema for the Settings table in the database.
- */
 export const SettingsSchema = {
  settings: "id",
 };

-/**
- * Constants.
- */
 export const MASTER_SETTINGS_KEY = 1;
--- a/src/libs/crypto/index.ts
+++ b/src/libs/crypto/index.ts
@@ -1,4 +1,5 @@
 import { IIdentifier } from "@veramo/core";
+import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
 import { getRandomBytesSync } from "ethereum-cryptography/random";
 import { entropyToMnemonic } from "ethereum-cryptography/bip39";
 import { wordlist } from "ethereum-cryptography/bip39/wordlists/english";
@@ -6,11 +7,6 @@ import { HDNode } from "@ethersproject/hdnode";
 import * as didJwt from "did-jwt";
 import * as u8a from "uint8arrays";

-import { ENDORSER_JWT_URL_LOCATION } from "@/libs/endorserServer";
-import { DEFAULT_DID_PROVIDER_NAME } from "../veramo/setup";
-
-export const DEFAULT_ROOT_DERIVATION_PATH = "m/84737769'/0'/0'/0'";
-
 /**
 *
 *
@@ -51,17 +47,17 @@ export const newIdentifier = (
 */
 export const deriveAddress = (
  mnemonic: string,
-  derivationPath: string = DEFAULT_ROOT_DERIVATION_PATH,
 ): [string, string, string, string] => {
+  const UPORT_ROOT_DERIVATION_PATH = "m/7696500'/0'/0'/0'";
  mnemonic = mnemonic.trim().toLowerCase();

  const hdnode: HDNode = HDNode.fromMnemonic(mnemonic);
-  const rootNode: HDNode = hdnode.derivePath(derivationPath);
+  const rootNode: HDNode = hdnode.derivePath(UPORT_ROOT_DERIVATION_PATH);
  const privateHex = rootNode.privateKey.substring(2); // original starts with '0x'
  const publicHex = rootNode.publicKey.substring(2); // original starts with '0x'
  const address = rootNode.address;

-  return [address, privateHex, publicHex, derivationPath];
+  return [address, privateHex, publicHex, UPORT_ROOT_DERIVATION_PATH];
 };

 /**
@@ -152,24 +148,3 @@ export function fromJose(signature: string): {
 export function bytesToHex(b: Uint8Array): string {
  return u8a.toString(b, "base16");
 }
-
-/**
- @return results of uportJwtPayload:
- { iat: number, iss: string (DID), own: { name, publicEncKey (base64-encoded key) } }
-
- Note that similar code is also contained in time-safari
- */
-export const getContactPayloadFromJwtUrl = (jwtUrlText: string) => {
-  let jwtText = jwtUrlText;
-  const endorserContextLoc = jwtText.indexOf(ENDORSER_JWT_URL_LOCATION);
-  if (endorserContextLoc > -1) {
-    jwtText = jwtText.substring(
-      endorserContextLoc + ENDORSER_JWT_URL_LOCATION.length,
-    );
-  }
-
-  // JWT format: { header, payload, signature, data }
-  const jwt = didJwt.decodeJWT(jwtText);
-
-  return jwt.payload;
-};
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -6,12 +6,7 @@ import { Axios, AxiosResponse } from "axios";
 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 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=";

 export interface AgreeVerifiableCredential {
  "@context": string;
@@ -26,13 +21,6 @@ export interface GiverInputInfo {
  name?: string;
 }

-export interface GiverOutputInfo {
-  action: string;
-  giver?: GiverInputInfo;
-  description?: string;
-  hours?: number;
-}
-
 export interface ClaimResult {
  success: { claimId: string; handleId: string };
  error: { code: string; message: string };
@@ -67,30 +55,7 @@ export interface GiveVerifiableCredential {
  fulfills?: { "@type": string; identifier: string };
  identifier?: string;
  object?: { amountOfThisGood: number; unitCode: string };
-  recipient?: { identifier: string };
-}
-
-export interface PlanVerifiableCredential {
-  "@context": "https://schema.org";
-  "@type": "PlanAction";
-  name: string;
-  description: string;
-  identifier?: string;
-  location?: {
-    geo: { "@type": "GeoCoordinates"; latitude: number; longitude: number };
-  };
-}
-
-export interface PlanServerRecord {
-  agentDid?: string; // optional, if the issuer wants someone else to manage as well
-  description: string;
-  endTime?: string;
-  issuerDid: string;
-  handleId: string;
-  locLat?: number;
-  locLon?: number;
-  startTime?: string;
-  url?: string;
+  recipient: { identifier: string };
 }

 export interface RegisterVerifiableCredential {
@@ -98,7 +63,7 @@ export interface RegisterVerifiableCredential {
  "@type": string;
  agent: { identifier: string };
  object: string;
-  participant: { identifier: string };
+  recipient: { identifier: string };
 }

 export interface InternalError {
@@ -110,52 +75,36 @@ export interface InternalError {
 // 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) {
+export function isHiddenDid(did) {
  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 function didInfo(did, activeDid, identifiers, contacts) {
+  const myId: IIdentifier | undefined = R.find(
+    (i) => i.did === did,
+    identifiers,
+  );
+  if (myId) {
+    return "You" + (myId.did !== activeDid ? " (Alt ID)" : "");
+  } else {
+    const contact: Contact | undefined = R.find((c) => c.did === did, contacts);
+    if (contact) {
+      return contact.name || "Someone Unnamed in Contacts";
+    } else if (!did) {
+      return "Unspecified Person";
+    } else if (isHiddenDid(did)) {
+      return "Someone Not In Network";
+    } else {
+      return "Someone Not In Contacts";
+    }
+  }
 }

-export interface ResultWithType {
-  type: string;
-}
-
-export interface SuccessResult extends ResultWithType {
-  type: "success";
-  response: AxiosResponse<ClaimResult>;
-}
-
-export interface ErrorResult {
-  type: "error";
-  error: InternalError;
-}
-
-export type CreateAndSubmitGiveResult = SuccessResult | ErrorResult;
-
 /**
- * For result, see https://api.endorser.ch/api-docs/#/claims/post_api_v2_claim
+ * For result, see https://endorser.ch:3000/api-docs/#/claims/post_api_v2_claim
 *
 * @param identity
 * @param fromDid may be null
@@ -167,83 +116,76 @@ export async function createAndSubmitGive(
  axios: Axios,
  apiServer: string,
  identity: IIdentifier,
-  fromDid?: string,
-  toDid?: string,
-  description?: string,
-  hours?: number,
+  fromDid: string,
+  toDid: string,
+  description: string,
+  hours: number,
  fulfillsProjectHandleId?: string,
-): Promise<CreateAndSubmitGiveResult> {
-  try {
-    const vcClaim: GiveVerifiableCredential = {
-      "@context": "https://schema.org",
-      "@type": "GiveAction",
-      recipient: toDid ? { identifier: toDid } : undefined,
-      agent: fromDid ? { identifier: fromDid } : undefined,
-      description: description || undefined,
-      object: hours ? { amountOfThisGood: hours, unitCode: "HUR" } : undefined,
-      fulfills: fulfillsProjectHandleId
-        ? { "@type": "PlanAction", identifier: fulfillsProjectHandleId }
-        : undefined,
-    };
-
-    const vcPayload = {
-      vc: {
-        "@context": ["https://www.w3.org/2018/credentials/v1"],
-        type: ["VerifiableCredential"],
-        credentialSubject: vcClaim,
-      },
-    };
-
-    // Create a signature using private key of identity
-    const firstKey = identity.keys[0];
-    const privateKeyHex = firstKey?.privateKeyHex;
-
-    if (!privateKeyHex) {
-      throw {
-        error: "No private key",
-        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
-      };
-    }
-
-    const signer = await SimpleSigner(privateKeyHex);
-
-    // Create a JWT for the request
-    const vcJwt: string = await didJwt.createJWT(vcPayload, {
-      issuer: identity.did,
-      signer,
-    });
-
-    // Make the xhr request payload
-    const payload = JSON.stringify({ jwtEncoded: vcJwt });
-    const url = `${apiServer}/api/v2/claim`;
-    const token = await accessToken(identity);
-
-    const response = await axios.post(url, payload, {
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`,
-      },
-    });
-
-    return { type: "success", response };
-  } catch (error: unknown) {
-    const errorMessage: string =
-      error === null
-        ? "Null error"
-        : error instanceof Error
-        ? error.message
-        : typeof error === "object" && error !== null && "message" in error
-        ? (error as { message: string }).message
-        : "Unknown error";
-
-    return {
-      type: "error",
-      error: {
-        error: errorMessage,
-        userMessage: "Failed to create and submit the claim.",
-      },
+): Promise<AxiosResponse<ClaimResult> | InternalError> {
+  // Make a claim
+  const vcClaim: GiveVerifiableCredential = {
+    "@context": "https://schema.org",
+    "@type": "GiveAction",
+    recipient: { identifier: toDid },
+  };
+  if (fromDid) {
+    vcClaim.agent = { identifier: fromDid };
+  }
+  if (description) {
+    vcClaim.description = description;
+  }
+  if (hours) {
+    vcClaim.object = { amountOfThisGood: hours, unitCode: "HUR" };
+  }
+  if (fulfillsProjectHandleId) {
+    vcClaim.fulfills = {
+      "@type": "PlanAction",
+      identifier: fulfillsProjectHandleId,
    };
  }
+  // Make a payload for the claim
+  const vcPayload = {
+    vc: {
+      "@context": ["https://www.w3.org/2018/credentials/v1"],
+      type: ["VerifiableCredential"],
+      credentialSubject: vcClaim,
+    },
+  };
+  // Create a signature using private key of identity
+  if (identity.keys[0].privateKeyHex == null) {
+    return new Promise<InternalError>((resolve, reject) => {
+      reject({
+        error: "No private key",
+        message:
+          "Your identifier " +
+          identity.did +
+          " is not configured correctly. Use a different identifier.",
+      });
+    });
+  }
+
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  const privateKeyHex: string = identity.keys[0].privateKeyHex!;
+  const signer = await SimpleSigner(privateKeyHex);
+  const alg = undefined;
+  // Create a JWT for the request
+  const vcJwt: string = await didJwt.createJWT(vcPayload, {
+    alg: alg,
+    issuer: identity.did,
+    signer: signer,
+  });
+
+  // Make the xhr request payload
+
+  const payload = JSON.stringify({ jwtEncoded: vcJwt });
+  const url = apiServer + "/api/v2/claim";
+  const token = await accessToken(identity);
+  const headers = {
+    "Content-Type": "application/json",
+    Authorization: "Bearer " + token,
+  };
+
+  return axios.post(url, payload, { headers });
 }

 // from https://stackoverflow.com/a/175787/845494
@@ -255,53 +197,3 @@ export function isNumeric(str: string): boolean {
 export function numberOrZero(str: string): number {
  return isNumeric(str) ? +str : 0;
 }
-
-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;
-}
--- a/src/libs/veramo/setup.ts
+++ b/src/libs/veramo/setup.ts
@@ -1,7 +1,151 @@
-// see also ../constants/app.ts and
+// Created from the setup in https://veramo.io/docs/guides/react_native

+// Core interfaces
+/* import {
+  createAgent,
+  IDIDManager,
+  IResolver,
+  IDataStore,
+  IKeyManager,
+} from "@veramo/core";
+ */
+// Core identity manager plugin
+//import { DIDManager } from "@veramo/did-manager";
+
+// Ethr did identity provider
+//import { EthrDIDProvider } from "@veramo/did-provider-ethr";
+
+// Core key manager plugin
+//import { KeyManager } from "@veramo/key-manager";
+
+// Custom key management system for RN
+//import { KeyManagementSystem } from '@veramo/kms-local-react-native'
+
+// Custom resolver
+// Custom resolvers
+//import { DIDResolverPlugin } from "@veramo/did-resolver";
+/* import { Resolver } from "did-resolver";
+import { getResolver as ethrDidResolver } from "ethr-did-resolver";
+import { getResolver as webDidResolver } from "web-did-resolver";
+ */
+// for VCs and VPs https://veramo.io/docs/api/credential-w3c
+//import { CredentialIssuer } from '@veramo/credential-w3c'
+
+// Storage plugin using TypeOrm
+/* import {
+  Entities,
+  KeyStore,
+  DIDStore,
+  IDataStoreORM,
+} from "@veramo/data-store";
+ */
+// TypeORM is installed with @veramo/typeorm
+//import { createConnection } from 'typeorm'
+
+//import * as R from "ramda";
+
+/*
+import { Contact } from '../entity/contact'
+import { Settings } from '../entity/settings'
+import { PrivateData } from '../entity/privateData'
+
+import { Initial1616938713828 }          from '../migration/1616938713828-initial'
+import { SettingsContacts1616967972293 } from '../migration/1616967972293-settings-contacts'
+import { EncryptedSeed1637856484788 }    from '../migration/1637856484788-EncryptedSeed'
+import { HomeScreenConfig1639947962124 } from '../migration/1639947962124-HomeScreenConfig'
+import { HandlePublicKeys1652142819353 } from '../migration/1652142819353-HandlePublicKeys'
+import { LastClaimsSeen1656811846836 }   from '../migration/1656811846836-LastClaimsSeen'
+import { ContactRegistered1662256903367 }from '../migration/1662256903367-ContactRegistered'
+import { PrivateData1663080623479 }      from '../migration/1663080623479-PrivateData'
+
+const ALL_ENTITIES = Entities.concat([Contact, Settings, PrivateData])
+
+// Create react native DB connection configured by ormconfig.js
+
+export const dbConnection = createConnection({
+  database: 'endorser-mobile.sqlite',
+  entities: ALL_ENTITIES,
+  location: 'default',
+  logging: ['error', 'info', 'warn'],
+  migrations: [ Initial1616938713828, SettingsContacts1616967972293, EncryptedSeed1637856484788, HomeScreenConfig1639947962124, HandlePublicKeys1652142819353, LastClaimsSeen1656811846836, ContactRegistered1662256903367, PrivateData1663080623479 ],
+  migrationsRun: true,
+  type: 'react-native',
+})
+*/
 function didProviderName(netName: string) {
  return "did:ethr" + (netName === "mainnet" ? "" : ":" + netName);
 }

-export const DEFAULT_DID_PROVIDER_NAME = didProviderName("mainnet");
+//const NETWORK_NAMES = ["mainnet", "rinkeby"];
+
+const DEFAULT_DID_PROVIDER_NETWORK_NAME = "mainnet";
+
+export const DEFAULT_DID_PROVIDER_NAME = didProviderName(
+  DEFAULT_DID_PROVIDER_NETWORK_NAME,
+);
+
+export const HANDY_APP = false;
+
+// this is used as the object in RegisterAction claims
+export const SERVICE_ID = "endorser.ch";
+
+//const INFURA_PROJECT_ID = "INFURA_PROJECT_ID";
+/*
+const providers = {}
+NETWORK_NAMES.forEach((networkName) => {
+  providers[didProviderName(networkName)] = new EthrDIDProvider({
+    defaultKms: 'local',
+    network: networkName,
+    rpcUrl: 'https://' + networkName + '.infura.io/v3/' + INFURA_PROJECT_ID,
+    gas: 1000001,
+    ttl: 60 * 60 * 24 * 30 * 12 + 1,
+  })
+})
+
+
+const didManager = new DIDManager({
+  store: new DIDStore(dbConnection),
+  defaultProvider: DEFAULT_DID_PROVIDER_NAME,
+  providers: providers,
+})
+*/
+
+/* const basicDidResolvers = NETWORK_NAMES.map((networkName) => [
+  networkName,
+  new Resolver({
+    ethr: ethrDidResolver({
+      networks: [
+        {
+          name: networkName,
+          rpcUrl:
+            "https://" + networkName + ".infura.io/v3/" + INFURA_PROJECT_ID,
+        },
+      ],
+    }).ethr,
+    web: webDidResolver().web,
+  }),
+]);
+
+const basicResolverMap = R.fromPairs(basicDidResolvers)
+
+export const DEFAULT_BASIC_RESOLVER = basicResolverMap[DEFAULT_DID_PROVIDER_NETWORK_NAME]
+
+const agentDidResolvers = NETWORK_NAMES.map((networkName) => {
+  return new DIDResolverPlugin({
+    resolver: basicResolverMap[networkName],
+  })
+})
+
+let allPlugins = [
+  new CredentialIssuer(),
+  new KeyManager({
+    store: new KeyStore(dbConnection),
+    kms: {
+      local: new KeyManagementSystem(),
+    },
+  }),
+  didManager,
+].concat(agentDidResolvers)
+*/
+
+//export const agent = createAgent<IDIDManager & IKeyManager & IDataStore & IDataStoreORM & IResolver>({ plugins: allPlugins })
--- a/src/main.ts
+++ b/src/main.ts
@@ -5,22 +5,16 @@ import "./registerServiceWorker";
 import router from "./router";
 import axios from "axios";
 import VueAxios from "vue-axios";
-import Notifications from "notiwind";

 import "./assets/styles/tailwind.css";

 import { library } from "@fortawesome/fontawesome-svg-core";
 import {
-  faArrowLeft,
-  faArrowRight,
-  faBan,
  faBurst,
  faCalendar,
  faChevronLeft,
-  faChevronRight,
  faCircle,
  faCircleCheck,
-  faCircleInfo,
  faCircleQuestion,
  faCircleUser,
  faClock,
@@ -36,7 +30,6 @@ import {
  faGift,
  faHand,
  faHouseChimney,
-  faLocationDot,
  faLongArrowAltLeft,
  faLongArrowAltRight,
  faMagnifyingGlass,
@@ -51,23 +44,17 @@ import {
  faSquareCaretDown,
  faSquareCaretUp,
  faTrashCan,
-  faTriangleExclamation,
  faUser,
  faUsers,
  faXmark,
 } from "@fortawesome/free-solid-svg-icons";

 library.add(
-  faArrowLeft,
-  faArrowRight,
-  faBan,
  faBurst,
  faCalendar,
  faChevronLeft,
-  faChevronRight,
  faCircle,
  faCircleCheck,
-  faCircleInfo,
  faCircleQuestion,
  faCircleUser,
  faClock,
@@ -83,7 +70,6 @@ library.add(
  faGift,
  faHand,
  faHouseChimney,
-  faLocationDot,
  faLongArrowAltLeft,
  faLongArrowAltRight,
  faMagnifyingGlass,
@@ -98,7 +84,6 @@ library.add(
  faSquareCaretDown,
  faSquareCaretUp,
  faTrashCan,
-  faTriangleExclamation,
  faUser,
  faUsers,
  faXmark,
@@ -111,5 +96,4 @@ createApp(App)
  .use(createPinia())
  .use(VueAxios, axios)
  .use(router)
-  .use(Notifications)
  .mount("#app");
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -1,11 +1,5 @@
-import {
-  createRouter,
-  createWebHistory,
-  NavigationGuardNext,
-  RouteLocationNormalized,
-  RouteRecordRaw,
-} from "vue-router";
-import { accountsDB } from "@/db/index";
+import { createRouter, createWebHistory, RouteRecordRaw } from "vue-router";
+import { accountsDB } from "@/db";

 /**
 *
@@ -13,11 +7,7 @@ import { accountsDB } from "@/db/index";
 * @param from :RouteLocationNormalized
 * @param next :NavigationGuardNext
 */
-const enterOrStart = async (
-  to: RouteLocationNormalized,
-  from: RouteLocationNormalized,
-  next: NavigationGuardNext,
-) => {
+const enterOrStart = async (to, from, next) => {
  await accountsDB.open();
  const num_accounts = await accountsDB.accounts.count();
  if (num_accounts > 0) {
@@ -33,6 +23,7 @@ const routes: Array<RouteRecordRaw> = [
    name: "home",
    component: () =>
      import(/* webpackChunkName: "home" */ "../views/HomeView.vue"),
+    beforeEnter: enterOrStart,
  },
  {
    path: "/account",
@@ -57,14 +48,6 @@ const routes: Array<RouteRecordRaw> = [
        /* webpackChunkName: "contact-amounts" */ "../views/ContactAmountsView.vue"
      ),
  },
-  {
-    path: "/contact-gives",
-    name: "contact-gives",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-gives" */ "../views/ContactGiftingView.vue"
-      ),
-  },
  {
    path: "/contact-qr",
    name: "contact-qr",
@@ -78,6 +61,15 @@ const routes: Array<RouteRecordRaw> = [
    name: "contacts",
    component: () =>
      import(/* webpackChunkName: "contacts" */ "../views/ContactsView.vue"),
+    beforeEnter: enterOrStart,
+  },
+  {
+    path: "/scan-contact",
+    name: "scan-contact",
+    component: () =>
+      import(
+        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
+      ),
  },
  {
    path: "/discover",
@@ -91,14 +83,6 @@ const routes: Array<RouteRecordRaw> = [
    component: () =>
      import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
  },
-  {
-    path: "/identity-switcher",
-    name: "identity-switcher",
-    component: () =>
-      import(
-        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
-      ),
-  },
  {
    path: "/import-account",
    name: "import-account",
@@ -107,14 +91,6 @@ const routes: Array<RouteRecordRaw> = [
        /* webpackChunkName: "import-account" */ "../views/ImportAccountView.vue"
      ),
  },
-  {
-    path: "/import-derive",
-    name: "import-derive",
-    component: () =>
-      import(
-        /* webpackChunkName: "import-derive" */ "../views/ImportDerivedAccountView.vue"
-      ),
-  },
  {
    path: "/new-edit-account",
    name: "new-edit-account",
@@ -148,7 +124,7 @@ const routes: Array<RouteRecordRaw> = [
      ),
  },
  {
-    path: "/project/:id?",
+    path: "/project",
    name: "project",
    component: () =>
      import(/* webpackChunkName: "project" */ "../views/ProjectViewView.vue"),
@@ -160,22 +136,6 @@ const routes: Array<RouteRecordRaw> = [
      import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
    beforeEnter: enterOrStart,
  },
-  {
-    path: "/scan-contact",
-    name: "scan-contact",
-    component: () =>
-      import(
-        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
-      ),
-  },
-  {
-    path: "/search-area",
-    name: "search-area",
-    component: () =>
-      import(
-        /* webpackChunkName: "search-area" */ "../views/SearchAreaView.vue"
-      ),
-  },
  {
    path: "/seed-backup",
    name: "seed-backup",
@@ -198,12 +158,6 @@ const routes: Array<RouteRecordRaw> = [
        /* webpackChunkName: "statistics" */ "../views/StatisticsView.vue"
      ),
  },
-  {
-    path: "/test",
-    name: "test",
-    component: () =>
-      import(/* webpackChunkName: "test" */ "../views/TestView.vue"),
-  },
 ];

 /** @type {*} */
@@ -212,18 +166,4 @@ const router = createRouter({
  routes,
 });

-const errorHandler = (
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  error: any,
-  to: RouteLocationNormalized,
-  from: RouteLocationNormalized,
-) => {
-  // Handle the error here
-  console.error("Caught in top level error handler:", error, to, from);
-
-  // You can also perform additional actions, such as displaying an error message or redirecting the user to a specific page
-};
-
-router.onError(errorHandler); // Assign the error handler to the router instance
-
 export default router;
--- a/src/test/index.ts
+++ b/src/test/index.ts
@@ -2,7 +2,7 @@ import axios from "axios";
 import * as didJwt from "did-jwt";
 import { AppString } from "@/constants/app";
 import { db } from "../db";
-import { SERVICE_ID } from "../libs/endorserServer";
+import { SERVICE_ID } from "../libs/veramo/setup";
 import { deriveAddress, newIdentifier } from "../libs/crypto";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";

--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
--- a/src/views/ConfirmContactView.vue
+++ b/src/views/ConfirmContactView.vue
@@ -15,33 +15,35 @@
      </h1>
    </div>

-    <p class="text-center text-xl mb-4 font-light">
-      Would you like to add <i>Firstname</i> to your network?
-    </p>
+    <form>
+      <p class="text-center text-xl mb-4 font-light">
+        Would you like to add <i>Firstname</i> to your network?
+      </p>

-    <!-- Account Details -->
-    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
-      <h2 class="text-xl font-semibold mb-2">Firstname Lastname</h2>
+      <!-- Account Details -->
+      <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
+        <h2 class="text-xl font-semibold mb-2">Firstname Lastname</h2>

-      <div class="text-slate-500 text-sm font-bold">ID</div>
-      <div class="text-sm text-slate-500 mb-1">
-        <span><code>did:peer:kl45kj41lk451kl3</code></span>
+        <div class="text-slate-500 text-sm font-bold">ID</div>
+        <div class="text-sm text-slate-500 mb-1">
+          <span><code>did:peer:kl45kj41lk451kl3</code></span>
+        </div>
      </div>
-    </div>

-    <div class="mt-8">
-      <input
-        type="submit"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-        value="Add Contact"
-      />
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
-    </div>
+      <div class="mt-8">
+        <input
+          type="submit"
+          class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
+          value="Add Contact"
+        />
+        <button
+          type="button"
+          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        >
+          Cancel
+        </button>
+      </div>
+    </form>
  </section>
 </template>

--- a/src/views/ContactAmountsView.vue
+++ b/src/views/ContactAmountsView.vue
@@ -1,99 +1,118 @@
 <template>
-  <QuickNav selected="Contacts"></QuickNav>
-  <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <h1
-        id="ViewBreadcrumb"
-        class="text-lg text-center font-light relative px-7"
-      >
-        <!-- Back -->
+  <!-- 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">
+      <!-- Home Feed -->
+      <li class="basis-1/5 rounded-md text-slate-500">
+        <router-link :to="{ name: 'home' }" class="block text-center py-3 px-1"
+          ><fa icon="house-chimney" class="fa-fw"></fa
+        ></router-link>
+      </li>
+      <!-- Search -->
+      <li class="basis-1/5 rounded-md text-slate-500">
+        <router-link
+          :to="{ name: 'discover' }"
+          class="block text-center py-3 px-1"
+          ><fa icon="magnifying-glass" class="fa-fw"></fa
+        ></router-link>
+      </li>
+      <!-- Contacts -->
+      <li class="basis-1/5 rounded-md text-slate-500">
+        <router-link
+          :to="{ name: 'projects' }"
+          class="block text-center py-3 px-1"
+          ><fa icon="folder-open" class="fa-fw"></fa
+        ></router-link>
+      </li>
+      <!-- Contacts -->
+      <li class="basis-1/5 rounded-md text-slate-500">
        <router-link
          :to="{ name: 'contacts' }"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          ><fa icon="chevron-left" class="fa-fw"></fa
+          class="block text-center py-3 px-1"
+          ><fa icon="users" class="fa-fw"></fa
        ></router-link>
-      </h1>
+      </li>
+      <!-- Profile -->
+      <li class="basis-1/5 rounded-md text-slate-500">
+        <router-link
+          :to="{ name: 'account' }"
+          class="block text-center py-3 px-1"
+          ><fa icon="circle-user" class="fa-fw"></fa
+        ></router-link>
+      </li>
+    </ul>
+  </nav>

-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
-        Given with {{ contact?.name }}
-      </h1>
-    </div>
-
-    <div class="flex justify-around">
-      <span />
-      <span class="justify-around">(Only 50 most recent)</span>
-      <span />
-    </div>
+  <section id="Content" class="p-6 pb-24">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
+      Given with {{ contact?.name }}
+    </h1>

    <!-- Results List -->
-    <table
-      class="table-auto w-full border-t border-slate-300 text-sm sm:text-base text-center"
-    >
-      <thead class="bg-slate-100">
-        <tr class="border-b border-slate-300">
-          <th></th>
-          <th class="px-1 py-2">From Them</th>
-          <th></th>
-          <th class="px-1 py-2">To Them</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr
-          v-for="record in giveRecords"
-          :key="record.id"
-          class="border-b border-slate-300"
-        >
-          <td class="p-1 text-xs sm:text-sm text-left text-slate-500">
-            {{ new Date(record.issuedAt).toLocaleString() }}
-          </td>
-          <td class="p-1">
-            <span v-if="record.agentDid == contact.did">
-              <div class="font-bold">
-                {{ record.amount }} {{ record.unit }}
-                <span v-if="record.amountConfirmed" title="Confirmed">
-                  <fa icon="circle-check" class="text-green-600 fa-fw" />
-                </span>
-                <button v-else @click="confirm(record)" title="Unconfirmed">
-                  <fa icon="circle" class="text-blue-600 fa-fw" />
-                </button>
-              </div>
-              <div class="italic text-xs sm:text-sm text-slate-500">
-                {{ record.description }}
-              </div>
-            </span>
-          </td>
-          <td class="p-1">
-            <span v-if="record.agentDid == contact.did">
-              <fa icon="arrow-left" class="text-slate-400 fa-fw" />
-            </span>
-            <span v-else>
-              <fa icon="arrow-right" class="text-slate-400 fa-fw" />
-            </span>
-          </td>
-          <td class="p-1">
-            <span v-if="record.agentDid != contact.did">
-              <div class="font-bold">
-                {{ record.amount }} {{ record.unit }}
-                <span v-if="record.amountConfirmed" title="Confirmed">
-                  <fa icon="circle-check" class="text-green-600 fa-fw" />
-                </span>
-                <button
-                  v-else
-                  @click="cannotConfirmMessage()"
-                  title="Unconfirmed"
-                >
-                  <fa icon="circle" class="text-slate-600 fa-fw" />
-                </button>
-              </div>
-              <div class="italic text-xs sm:text-sm text-slate-500">
-                {{ record.description }}
-              </div>
-            </span>
-          </td>
-        </tr>
-      </tbody>
-    </table>
+    <div>
+      <div class="border-b border-slate-300 flex">
+        <div class="w-1/4"></div>
+        <div class="w-1/4">from them</div>
+        <div class="w-1/4"></div>
+        <div class="w-1/4">to them</div>
+      </div>
+      <div
+        class="border-b border-slate-300 flex"
+        v-for="record in giveRecords"
+        :key="record.id"
+      >
+        <div class="w-1/4">
+          {{ new Date(record.issuedAt).toLocaleString() }}
+        </div>
+        <div class="w-1/4">
+          <span v-if="record.agentDid == contact.did">
+            <div class="font-bold">
+              {{ record.amount }} {{ record.unit }}
+              <span v-if="record.amountConfirmed" class="tooltip">
+                <fa icon="circle-check" class="text-green-600 fa-fw ml-1" />
+                <span class="tooltiptext">Confirmed</span>
+              </span>
+              <button v-else class="tooltip" @click="confirm(record)">
+                <fa icon="circle" class="text-blue-600 fa-fw ml-1" />
+                <span class="tooltiptext">Unconfirmed</span>
+              </button>
+            </div>
+            <br />
+            {{ record.description }}
+          </span>
+        </div>
+        <div class="w-1/8">
+          <span v-if="record.agentDid == contact.did">
+            <fa icon="long-arrow-alt-left" class="text-slate-900 fa-fw ml-1" />
+          </span>
+          <span v-else>
+            &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+            <fa icon="long-arrow-alt-right" class="text-slate-900 fa-fw ml-1" />
+          </span>
+        </div>
+        <div class="w-1/4">
+          <span v-if="record.agentDid != contact.did">
+            <div class="font-bold">
+              {{ record.amount }} {{ record.unit }}
+              <span v-if="record.amountConfirmed" class="tooltip">
+                <fa icon="circle-check" class="text-green-600 fa-fw ml-1" />
+                <span class="tooltiptext">Confirmed</span>
+              </span>
+              <button v-else class="tooltip" @click="cannotConfirmMessage()">
+                <fa icon="circle" class="text-slate-600 fa-fw ml-1" />
+                <span class="tooltiptext">Unconfirmed</span>
+              </button>
+            </div>
+            <br />
+            {{ record.description }}
+          </span>
+        </div>
+      </div>
+    </div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

@@ -101,7 +120,8 @@
 import * as R from "ramda";

 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
@@ -113,32 +133,26 @@ import {
 } from "@/libs/endorserServer";
 import * as didJwt from "did-jwt";
 import { AxiosError } from "axios";
-import QuickNav from "@/components/QuickNav.vue";
-import { IIdentifier } from "@veramo/core";
+import AlertMessage from "@/components/AlertMessage";

-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { QuickNav } })
+@Component({ components: { AlertMessage } })
 export default class ContactsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  activeDid = "";
  apiServer = "";
  contact: Contact | null = null;
  giveRecords: Array<GiveServerRecord> = [];
+  alertTitle = "";
+  alertMessage = "";
+  accounts: AccountsSchema;
  numAccounts = 0;

  async beforeCreate() {
-    await accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
+    accountsDB.open();
+    this.accounts = accountsDB.accounts;
+    this.numAccounts = await this.accounts.count();
  }

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
    const account = await accountsDB.accounts
      .where("did")
@@ -154,7 +168,7 @@ export default class ContactsView extends Vue {
    return identity;
  }

-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
    const token = await accessToken(identity);
    const headers = {
      "Content-Type": "application/json",
@@ -176,33 +190,29 @@ export default class ContactsView extends Vue {
      if (this.activeDid && this.contact) {
        this.loadGives(this.activeDid, this.contact);
      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text:
-            err.userMessage ||
-            "There was an error retrieving the latest sweet, sweet action.",
-        },
-        -1,
-      );
+    } catch (err) {
+      this.alertTitle = "Error";
+      this.alertMessage =
+        err.userMessage ||
+        "There was an error retrieving the latest sweet, sweet action.";
    }
  }

  async loadGives(activeDid: string, contact: Contact) {
    try {
      const identity = await this.getIdentity(this.activeDid);
-      let result: Array<GiveServerRecord> = [];
+      let result = [];
      const url =
        this.apiServer +
        "/api/v2/report/gives?agentDid=" +
        encodeURIComponent(identity.did) +
        "&recipientDid=" +
        encodeURIComponent(contact.did);
-      const headers = await this.getHeaders(identity);
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };
      const resp = await this.axios.get(url, { headers });
      if (resp.status === 200) {
        result = resp.data.data;
@@ -212,15 +222,9 @@ export default class ContactsView extends Vue {
          resp.status,
          resp.data,
        );
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error With Server",
-            text: "Got an error retrieving your given time from the server.",
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        this.alertMessage =
+          "Got an error retrieving your given time from the server.";
      }

      const url2 =
@@ -229,7 +233,11 @@ export default class ContactsView extends Vue {
        encodeURIComponent(contact.did) +
        "&recipientDid=" +
        encodeURIComponent(identity.did);
-      const headers2 = await this.getHeaders(identity);
+      const token2 = await accessToken(identity);
+      const headers2 = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token2,
+      };
      const resp2 = await this.axios.get(url2, { headers: headers2 });
      if (resp2.status === 200) {
        result = R.concat(result, resp2.data.data);
@@ -239,15 +247,9 @@ export default class ContactsView extends Vue {
          resp2.status,
          resp2.data,
        );
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error With Server",
-            text: "Got an error retrieving your given time from the server.",
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        this.alertMessage =
+          "Got an error retrieving your given time from the server.";
      }

      const sortedResult: Array<GiveServerRecord> = R.sort(
@@ -257,15 +259,8 @@ export default class ContactsView extends Vue {
      );
      this.giveRecords = sortedResult;
    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error With Server",
-          text: error as string,
-        },
-        -1,
-      );
+      this.alertTitle = "Error With Server";
+      this.alertMessage = error as string;
    }
  }

@@ -318,6 +313,7 @@ export default class ContactsView extends Vue {

      try {
        const resp = await this.axios.post(url, payload, { headers });
+        //console.log("Got resp data:", resp.data);
        if (resp.data?.success) {
          record.amountConfirmed = origClaim.object?.amountOfThisGood || 1;
        }
@@ -334,38 +330,21 @@ export default class ContactsView extends Vue {
          userMessage = error as string;
        }
        // Now set that error for the user to see.
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error With Server",
-            text: userMessage,
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        this.alertMessage = userMessage;
      }
    }
  }

  cannotConfirmMessage() {
-    this.$notify(
-      {
-        group: "alert",
-        type: "danger",
-        title: "Not Allowed",
-        text: "Only the recipient can confirm final receipt.",
-      },
-      -1,
-    );
+    this.alertTitle = "Not Allowed";
+    this.alertMessage = "Only the recipient can confirm final receipt.";
  }
 }
 </script>

 <style>
-/*
-  Tooltip, generated on "title" attributes on "fa" icons
-  Kudos to https://www.w3schools.com/css/css_tooltip.asp
-*/
+/* Tooltip from https://www.w3schools.com/css/css_tooltip.asp */
 /* Tooltip container */
 .tooltip {
  position: relative;
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -1,162 +0,0 @@
-<template>
-  <QuickNav selected="Home"></QuickNav>
-  <!-- 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">
-        <!-- Back -->
-        <router-link
-          :to="{ name: 'home' }"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          ><fa icon="chevron-left" class="fa-fw"></fa
-        ></router-link>
-
-        Give to Contacts
-      </h1>
-    </div>
-
-    <!-- Results List -->
-    <ul class="border-t border-slate-300">
-      <li class="border-b border-slate-300 py-3">
-        <h2 class="text-base flex gap-4 items-center">
-          <span class="grow italic text-slate-500"
-            ><EntityIcon
-              :entityId="null"
-              :iconSize="32"
-              class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-            ></EntityIcon>
-            Anonymous
-          </span>
-          <span class="text-right">
-            <button
-              type="button"
-              @click="openDialog()"
-              class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
-            >
-              <fa icon="gift" class="fa-fw"></fa>
-            </button>
-          </span>
-        </h2>
-      </li>
-      <li
-        v-for="contact in allContacts"
-        :key="contact.did"
-        class="border-b border-slate-300 py-3"
-      >
-        <h2 class="text-base flex gap-4 items-center">
-          <span class="grow font-semibold"
-            ><EntityIcon
-              :entityId="contact.did"
-              :iconSize="32"
-              class="inline-block align-middle border border-slate-300 rounded-md mr-1"
-            ></EntityIcon>
-            {{ contact.name || "(no name)" }}
-          </span>
-          <span class="text-right">
-            <button
-              type="button"
-              @click="openDialog(contact)"
-              class="block w-full text-center text-sm uppercase bg-blue-600 text-white px-3 py-1.5 rounded-md"
-            >
-              <fa icon="gift" class="fa-fw"></fa>
-            </button>
-          </span>
-        </h2>
-      </li>
-    </ul>
-
-    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import GiftedDialog from "@/components/GiftedDialog.vue";
-import { db, accountsDB } from "@/db/index";
-import { Account, AccountsSchema } from "@/db/tables/accounts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import { GiverInputInfo } from "@/libs/endorserServer";
-import { Contact } from "@/db/tables/contacts";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({
-  components: { GiftedDialog, QuickNav, EntityIcon },
-})
-export default class ContactGiftingView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  activeDid = "";
-  allContacts: Array<Contact> = [];
-  apiServer = "";
-  accounts: typeof AccountsSchema;
-  numAccounts = 0;
-
-  async beforeCreate() {
-    accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
-  }
-
-  public async getIdentity(activeDid: string) {
-    await accountsDB.open();
-    const account = (await accountsDB.accounts
-      .where("did")
-      .equals(activeDid)
-      .first()) as Account;
-    const identity = JSON.parse(account?.identity || "null");
-
-    if (!identity) {
-      throw new Error(
-        "Attempted to load Give records with no identity available.",
-      );
-    }
-    return identity;
-  }
-
-  public async getHeaders(identity: IIdentifier) {
-    const token = await accessToken(identity);
-    const headers = {
-      "Content-Type": "application/json",
-      Authorization: "Bearer " + token,
-    };
-    return headers;
-  }
-
-  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);
-  }
-}
-</script>
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -3,7 +3,7 @@
  <!-- CONTENT -->
  <section id="Content" class="p-6 pb-24">
    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
      Your Contact Info
    </h1>

@@ -17,60 +17,43 @@
      :dotsOptions="{ type: 'square' }"
      class="flex justify-center"
    />
-
-    <h1 class="text-4xl text-center font-light pt-4">Scan Contact Info</h1>
-    <qrcode-stream @detect="onScanDetect" @error="onScanError" />
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
 import QRCodeVue3 from "qr-code-generator-vue3";
 import { Component, Vue } from "vue-facing-decorator";
-import { QrcodeStream } from "vue-qrcode-reader";
-
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 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 {
-  CONTACT_URL_PREFIX,
-  ENDORSER_JWT_URL_LOCATION,
-} from "@/libs/endorserServer";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

 // 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,
    QRCodeVue3,
+    AlertMessage,
    QuickNav,
  },
 })
 export default class ContactQRScanShow extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  activeDid = "";
  apiServer = "";
  qrValue = "";

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
    const accounts = await accountsDB.accounts.toArray();
-    const account: Account | undefined = R.find(
-      (acc) => acc.did === activeDid,
-      accounts,
-    );
+    const account = R.find((acc) => acc.did === activeDid, accounts);
    const identity = JSON.parse(account?.identity || "null");

    if (!identity) {
@@ -81,6 +64,15 @@ export default class ContactQRScanShow extends Vue {
    return identity;
  }

+  public async getHeaders(identity) {
+    const token = await accessToken(identity);
+    const headers = {
+      "Content-Type": "application/json",
+      Authorization: "Bearer " + token,
+    };
+    return headers;
+  }
+
  async created() {
    await db.open();
    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
@@ -91,15 +83,7 @@ export default class ContactQRScanShow extends Vue {
    const accounts = await accountsDB.accounts.toArray();
    const account = R.find((acc) => acc.did === this.activeDid, accounts);
    if (!account) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "",
-          text: "You have no identity yet.",
-        },
-        -1,
-      );
+      this.alertMessage = "You have no identity yet.";
    } else {
      const identity = await this.getIdentity(this.activeDid);
      const publicKeyHex = identity.keys[0].publicKeyHex;
@@ -108,9 +92,7 @@ export default class ContactQRScanShow extends Vue {
        iat: Date.now(),
        iss: this.activeDid,
        own: {
-          name:
-            (settings?.firstName || "") +
-            (settings?.lastName ? ` ${settings.lastName}` : ""), // deprecated, pre v 0.1.3
+          name: (settings?.firstName || "") + " " + (settings?.lastName || ""),
          publicEncKey,
        },
      };
@@ -124,47 +106,13 @@ export default class ContactQRScanShow extends Vue {
        issuer: identity.did,
        signer: signer,
      });
-      const viewPrefix = CONTACT_URL_PREFIX + ENDORSER_JWT_URL_LOCATION;
+      const viewPrefix = "https://endorser.ch/contact?jwt=";
      this.qrValue = viewPrefix + vcJwt;
    }
  }

-  /**
-   *
-   * @param content is the result of a QR scan, an array with one item with a rawValue property
-   */
-  // Unfortunately, there are not typescript definitions for the qrcode-stream component yet.
-  // 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 {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "Invalid Contact QR Code",
-          text: "No QR code detected with contact information.",
-        },
-        -1,
-      );
-    }
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  onScanError(error: any) {
-    console.log("Scan was invalid:", error);
-    this.$notify(
-      {
-        group: "alert",
-        type: "warning",
-        title: "Invalid Scan",
-        text: "The scan was invalid.",
-      },
-      -1,
-    );
-  }
+  // This same popup code is in many files.
+  alertTitle = "";
+  alertMessage = "";
 }
 </script>
--- a/src/views/ContactScanView.vue
+++ b/src/views/ContactScanView.vue
@@ -14,69 +14,75 @@
      </h1>
    </div>

-    <h3 class="text-sm uppercase font-semibold mb-2">Scan a QR Code…</h3>
-    <div class="bg-black rounded overflow-hidden relative mb-4">
-      <img src="https://picsum.photos/400/400?random=1" class="w-full" />
+    <form>
+      <h3 class="text-sm uppercase font-semibold mb-2">Scan a QR Code…</h3>
+      <div class="bg-black rounded overflow-hidden relative mb-4">
+        <img src="https://picsum.photos/400/400?random=1" class="w-full" />

-      <!-- Darken overlay -->
-      <!-- Top -->
-      <div class="absolute top-0 left-0 right-0 bg-black/50 h-1/4"></div>
-      <!-- Reft -->
-      <div class="absolute top-1/4 bottom-1/4 left-0 bg-black/50 w-1/4"></div>
-      <!-- Right -->
-      <div class="absolute top-1/4 bottom-1/4 right-0 bg-black/50 w-1/4"></div>
-      <!-- Bottom -->
-      <div class="absolute bottom-0 left-0 right-0 bg-black/50 h-1/4"></div>
+        <!-- Darken overlay -->
+        <!-- Top -->
+        <div class="absolute top-0 left-0 right-0 bg-black/50 h-1/4"></div>
+        <!-- Reft -->
+        <div class="absolute top-1/4 bottom-1/4 left-0 bg-black/50 w-1/4"></div>
+        <!-- Right -->
+        <div
+          class="absolute top-1/4 bottom-1/4 right-0 bg-black/50 w-1/4"
+        ></div>
+        <!-- Bottom -->
+        <div class="absolute bottom-0 left-0 right-0 bg-black/50 h-1/4"></div>

-      <!-- Reticle overlay -->
-      <!-- Top-left -->
-      <div
-        class="absolute top-1/4 left-1/4 h-6 w-6 border-white border-t-4 border-l-4 drop-shadow"
-      ></div>
-      <!-- Top-right -->
-      <div
-        class="absolute top-1/4 right-1/4 h-6 w-6 border-white border-t-4 border-r-4 drop-shadow"
-      ></div>
-      <!-- Bottom-left -->
-      <div
-        class="absolute bottom-1/4 left-1/4 h-6 w-6 border-white border-b-4 border-l-4 drop-shadow"
-      ></div>
-      <!-- Bottom-right -->
-      <div
-        class="absolute bottom-1/4 right-1/4 h-6 w-6 border-white border-b-4 border-r-4 drop-shadow"
-      ></div>
-    </div>
+        <!-- Reticle overlay -->
+        <!-- Top-left -->
+        <div
+          class="absolute top-1/4 left-1/4 h-6 w-6 border-white border-t-4 border-l-4 drop-shadow"
+        ></div>
+        <!-- Top-right -->
+        <div
+          class="absolute top-1/4 right-1/4 h-6 w-6 border-white border-t-4 border-r-4 drop-shadow"
+        ></div>
+        <!-- Bottom-left -->
+        <div
+          class="absolute bottom-1/4 left-1/4 h-6 w-6 border-white border-b-4 border-l-4 drop-shadow"
+        ></div>
+        <!-- Bottom-right -->
+        <div
+          class="absolute bottom-1/4 right-1/4 h-6 w-6 border-white border-b-4 border-r-4 drop-shadow"
+        ></div>
+      </div>

-    <h3 class="text-sm uppercase font-semibold mb-2">…or Enter Contact Data</h3>
-    <input
-      type="text"
-      placeholder="Name (optional)"
-      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-    />
-    <input
-      type="text"
-      placeholder="ID"
-      class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-    />
-    <input
-      type="text"
-      placeholder="Public Key (optional)"
-      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-    />
-
-    <div class="mt-8">
+      <h3 class="text-sm uppercase font-semibold mb-2">
+        …or Enter Contact Data
+      </h3>
      <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="Look Up Contact"
+        type="text"
+        placeholder="Name (optional)"
+        class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
      />
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
-    </div>
+      <input
+        type="text"
+        placeholder="ID"
+        class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
+      />
+      <input
+        type="text"
+        placeholder="Public Key (optional)"
+        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+      />
+
+      <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="Look Up Contact"
+        />
+        <button
+          type="button"
+          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        >
+          Cancel
+        </button>
+      </div>
+    </form>
  </section>
 </template>

--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -20,11 +20,6 @@

    <!-- New Contact -->
    <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="DID, Name, Public Key"
@@ -71,125 +66,89 @@
              : "Unconfirmed"
          }}
        </button>
-        <br />
-        (Only hours shown)
-        <br />
-        (Only recent shown)
      </div>
    </div>

    <!-- Results List -->
-    <ul v-if="contacts.length > 0" class="border-t border-slate-300">
+    <ul v-if="contacts.length > 0">
      <li
-        class="border-b border-slate-300 pt-2.5 pb-4"
+        class="border-b border-slate-300"
        v-for="contact in contacts"
        :key="contact.did"
      >
        <div class="grow overflow-hidden">
          <h2 class="text-base font-semibold">
-            <EntityIcon
-              :entityId="contact.did"
-              :iconSize="24"
-              class="inline-block align-text-bottom border border-slate-300 rounded"
-            ></EntityIcon>
            {{ contact.name || "(no name)" }}
-            <button
-              class="text-sm uppercase bg-slate-500 text-white px-1 rounded-md"
-              @click="
-                contactEdit = contact;
-                contactNewName = contact.name;
-              "
-              title="Edit"
-            >
-              <fa icon="pen" class="fa-fw" />
-            </button>
          </h2>
          <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 id="ContactActions" class="flex gap-1.5 mt-2">
-            <button
-              v-if="contact.seesMe"
-              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-              @click="setVisibility(contact, false)"
-              title="They can see you"
-            >
-              <fa icon="eye" class="fa-fw" />
-            </button>
-            <button
-              v-else
-              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-              @click="setVisibility(contact, true)"
-              title="They cannot see you"
-            >
-              <fa icon="eye-slash" class="fa-fw" />
-            </button>
+          <button
+            v-if="contact.seesMe"
+            class="tooltip"
+            @click="setVisibility(contact, false)"
+          >
+            <fa icon="eye" class="text-slate-900 fa-fw ml-1" />
+            <span class="tooltiptext">They can see you</span>
+          </button>
+          <button v-else class="tooltip" @click="setVisibility(contact, true)">
+            <span class="tooltiptext">They cannot see you</span>
+            <fa icon="eye-slash" class="text-slate-900 fa-fw ml-1" />
+          </button>

-            <button
-              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-              @click="checkVisibility(contact)"
-              title="Check Visibility"
-            >
-              <fa icon="rotate" class="fa-fw" />
-            </button>
+          <button class="tooltip" @click="checkVisibility(contact)">
+            <span class="tooltiptext">Check Visibility</span>
+            <fa icon="rotate" class="text-slate-900 fa-fw ml-1" />
+          </button>

-            <button
-              @click="register(contact)"
-              class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-            >
-              <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"
-              />
-            </button>
+          <button v-if="contact.registered" class="tooltip">
+            <span class="tooltiptext">Registered</span>
+            <fa icon="person-circle-check" class="text-slate-900 fa-fw ml-1" />
+          </button>
+          <button v-else @click="register(contact)" class="tooltip">
+            <span class="tooltiptext">Registration Unknown</span>
+            <fa
+              icon="person-circle-question"
+              class="text-slate-900 fa-fw ml-1"
+            />
+          </button>

-            <button
-              @click="deleteContact(contact)"
-              class="text-sm uppercase bg-red-600 text-white px-2 py-1.5 rounded-md"
-              title="Delete"
-            >
-              <fa icon="trash-can" class="fa-fw" />
-            </button>
+          <button @click="deleteContact(contact)" class="px-9 tooltip">
+            <span class="tooltiptext">Delete!</span>
+            <fa icon="trash-can" class="text-red-600 fa-fw ml-1" />
+          </button>

-            <div
-              v-if="showGiveNumbers && contact.did != activeDid"
-              class="ml-auto flex gap-1.5"
-            >
-              <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]"
-              >
-                To:
+          <div v-if="showGiveNumbers" class="float-right">
+            <div class="float-right">
+              <div class="tooltip">
+                to:
                {{
                  /* eslint-disable prettier/prettier */
                  this.showGiveTotals
                    ? ((givenByMeConfirmed[contact.did] || 0)
-                      + (givenByMeUnconfirmed[contact.did] || 0))
+                       + (givenByMeUnconfirmed[contact.did] || 0))
                    : this.showGiveConfirmed
                        ? (givenByMeConfirmed[contact.did] || 0)
                        : (givenByMeUnconfirmed[contact.did] || 0)
                  /* eslint-enable prettier/prettier */
                }}
-                <fa icon="plus" />
-              </button>
-
-              <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]"
-              >
-                From:
+                <span
+                  v-if="givenByMeDescriptions[contact.did]"
+                  class="tooltiptext-left"
+                >
+                  {{ givenByMeDescriptions[contact.did] }}
+                </span>
+                <button
+                  class="text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-6"
+                  @click="onClickAddGive(activeDid, contact.did)"
+                >
+                  +
+                </button>
+              </div>
+              <div class="tooltip px-2">
+                from:
                {{
                  /* eslint-disable prettier/prettier */
                  this.showGiveTotals
@@ -200,50 +159,39 @@
                        : (givenToMeUnconfirmed[contact.did] || 0)
                  /* eslint-enable prettier/prettier */
                }}
-                <fa icon="plus" />
-              </button>
-
+                <span
+                  v-if="givenToMeDescriptions[contact.did]"
+                  class="tooltiptext-left"
+                >
+                  {{ givenToMeDescriptions[contact.did] }}
+                </span>
+                <button
+                  class="text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-6"
+                  @click="onClickAddGive(contact.did, activeDid)"
+                >
+                  +
+                </button>
+              </div>
              <router-link
                :to="{
                  name: 'contact-amounts',
                  query: { contactDid: contact.did },
                }"
-                class="text-sm uppercase bg-slate-500 text-white px-2 py-1.5 rounded-md"
-                title="See all given activity"
+                class="tooltip"
              >
-                <fa icon="file-lines" class="fa-fw" />
+                <fa icon="file-lines" class="text-slate-600 fa-fw ml-1" />
+                <span class="tooltiptext-left">See All Given Activity</span>
              </router-link>
            </div>
          </div>
        </div>
      </li>
    </ul>
-    <p v-else>There are no contacts.</p>
-
-    <div v-if="contactEdit !== null" class="dialog-overlay">
-      <div class="dialog">
-        <h1 class="text-xl font-bold text-center mb-4">Edit Name</h1>
-        <input
-          type="text"
-          class="block w-full rounded border border-slate-400 mb-2 px-3 py-2"
-          placeholder="Name"
-          v-model="contactNewName"
-        />
-        <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>
+    <p v-else>This identity has no contacts.</p>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

@@ -251,44 +199,31 @@
 import { AxiosError } from "axios";
 import * as didJwt from "did-jwt";
 import * as R from "ramda";
-
-import { NotificationIface } from "@/constants/app";
 import { IIdentifier } from "@veramo/core";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accessToken, SimpleSigner } from "@/libs/crypto";
 import {
-  accessToken,
-  getContactPayloadFromJwtUrl,
-  SimpleSigner,
-} from "@/libs/crypto";
-import {
-  GiveServerRecord,
  GiveVerifiableCredential,
  RegisterVerifiableCredential,
  SERVICE_ID,
 } from "@/libs/endorserServer";
 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";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const Buffer = require("buffer/").Buffer;

@Component({
-  components: { QuickNav, EntityIcon },
+  components: { AlertMessage, QuickNav },
 })
 export default class ContactsView extends Vue {
-  $notify!: (notification: NotificationIface, timeout?: number) => void;
-
  activeDid = "";
  apiServer = "";
  contacts: Array<Contact> = [];
-  contactEndorserUrl = localStorage.getItem("contactEndorserUrl") || "";
  contactInput = "";
-  contactEdit: Contact | null = null;
-  contactNewName = "";
  // { "did:...": concatenated-descriptions } entry for each contact
  givenByMeDescriptions: Record<string, string> = {};
  // { "did:...": amount } entry for each contact
@@ -306,10 +241,12 @@ export default class ContactsView extends Vue {
  showGiveNumbers = false;
  showGiveTotals = true;
  showGiveConfirmed = true;
+  alertTitle = "";
+  alertMessage = "";

  async created() {
    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
    this.activeDid = settings?.activeDid || "";
    this.apiServer = settings?.apiServer || "";

@@ -322,18 +259,12 @@ export default class ContactsView extends Vue {
      (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
      allContacts,
    );
-
-    if (this.contactEndorserUrl) {
-      await this.newContactFromScan(this.contactEndorserUrl);
-      localStorage.removeItem("contactEndorserUrl");
-      this.contactEndorserUrl = "";
-    }
  }

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
    const accounts = await accountsDB.accounts.toArray();
-    const account = R.find((acc) => acc.did === activeDid, accounts) as Account;
+    const account = R.find((acc) => acc.did === activeDid, accounts);
    const identity = JSON.parse(account?.identity || "null");

    if (!identity) {
@@ -344,7 +275,7 @@ export default class ContactsView extends Vue {
    return identity;
  }

-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
    const token = await accessToken(identity);
    const headers = {
      "Content-Type": "application/json",
@@ -353,7 +284,7 @@ export default class ContactsView extends Vue {
    return headers;
  }

-  public async getHeadersAndIdentity(activeDid: string) {
+  public async getHeadersAndIdentity(activeDid) {
    const identity = await this.getIdentity(activeDid);
    const headers = await this.getHeaders(identity);

@@ -361,27 +292,20 @@ export default class ContactsView extends Vue {
  }

  async loadGives() {
-    const handleResponse = (
-      resp: { status: number; data: { data: GiveServerRecord[] } },
-      descriptions: Record<string, string>,
-      confirmed: Record<string, number>,
-      unconfirmed: Record<string, number>,
-      useRecipient: boolean,
-    ) => {
+    const handleResponse = (resp, descriptions, confirmed, unconfirmed) => {
      if (resp.status === 200) {
        const allData = resp.data.data;
        for (const give of allData) {
-          const otherDid = useRecipient ? give.recipientDid : give.agentDid;
          if (give.unit === "HUR") {
            if (give.amountConfirmed) {
-              const prevAmount = confirmed[otherDid] || 0;
-              confirmed[otherDid] = prevAmount + give.amount;
+              const prevAmount = confirmed[give.agentDid] || 0;
+              confirmed[give.agentDid] = prevAmount + give.amount;
            } else {
-              const prevAmount = unconfirmed[otherDid] || 0;
-              unconfirmed[otherDid] = prevAmount + give.amount;
+              const prevAmount = unconfirmed[give.agentDid] || 0;
+              unconfirmed[give.agentDid] = prevAmount + give.amount;
            }
-            if (!descriptions[otherDid] && give.description) {
-              descriptions[otherDid] = give.description;
+            if (!descriptions[give.agentDid] && give.description) {
+              descriptions[give.agentDid] = give.description;
            }
          }
        }
@@ -391,31 +315,27 @@ export default class ContactsView extends Vue {
          resp.status,
          resp.data,
        );
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Server Error",
-            text:
-              "Got an error retrieving your " +
-              (useRecipient ? "given" : "received") +
-              " time from the server.",
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        this.alertMessage =
+          "Got an error retrieving your " +
+          resp.config.url.includes("recipientDid")
+            ? "received"
+            : "given" + " time from the server.";
      }
    };

    try {
-      const { headers } = await this.getHeadersAndIdentity(this.activeDid);
+      const { headers, identity } = await this.getHeadersAndIdentity(
+        this.activeDid,
+      );
      const givenByUrl =
        this.apiServer +
        "/api/v2/report/gives?agentDid=" +
-        encodeURIComponent(this.activeDid);
+        encodeURIComponent(identity.did);
      const givenToUrl =
        this.apiServer +
        "/api/v2/report/gives?recipientDid=" +
-        encodeURIComponent(this.activeDid);
+        encodeURIComponent(identity.did);

      const [givenByMeResp, givenToMeResp] = await Promise.all([
        this.axios.get(givenByUrl, { headers }),
@@ -430,7 +350,6 @@ export default class ContactsView extends Vue {
        givenByMeDescriptions,
        givenByMeConfirmed,
        givenByMeUnconfirmed,
-        true,
      );
      this.givenByMeDescriptions = givenByMeDescriptions;
      this.givenByMeConfirmed = givenByMeConfirmed;
@@ -444,37 +363,17 @@ export default class ContactsView extends Vue {
        givenToMeDescriptions,
        givenToMeConfirmed,
        givenToMeUnconfirmed,
-        false,
      );
      this.givenToMeDescriptions = givenToMeDescriptions;
      this.givenToMeConfirmed = givenToMeConfirmed;
      this.givenToMeUnconfirmed = givenToMeUnconfirmed;
    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Server Error",
-          text: error as string,
-        },
-        -1,
-      );
+      this.alertTitle = "Error With Server";
+      this.alertMessage = error as string;
    }
  }

  async onClickNewContact(): Promise<void> {
-    if (!this.contactInput) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "No Contact",
-          text: "There was no contact info to add.",
-        },
-        -1,
-      );
-      return;
-    }
    let did = this.contactInput;
    let name, publicKeyBase64;
    const commaPos1 = this.contactInput.indexOf(",");
@@ -493,74 +392,12 @@ export default class ContactsView extends Vue {
      publicKeyBase64 = Buffer.from(publicKeyBase64, "hex").toString("base64");
    }
    const newContact = { did, name, publicKeyBase64 };
-    return this.addContact(newContact);
-  }
-
-  async newContactFromScan(url: string): Promise<void> {
-    const payload = getContactPayloadFromJwtUrl(url);
-    if (!payload) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "No Contact Info",
-          text: "The contact info could not be parsed.",
-        },
-        -1,
-      );
-      return;
-    } else {
-      return this.addContact({
-        did: payload.iss,
-        name: payload.own.name,
-        publicKeyBase64: payload.own.publicEncKey,
-      } as Contact);
-    }
-  }
-
-  async addContact(newContact: Contact) {
-    if (!newContact.did) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Incomplete Contact",
-          text: "Cannot add a contact without a DID.",
-        },
-        -1,
-      );
-      return;
-    }
-    return db.contacts
-      .add(newContact)
-      .then(() => {
-        const allContacts = this.contacts.concat([newContact]);
-        this.contacts = R.sort(
-          (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
-          allContacts,
-        );
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Contact added",
-            text: newContact.name + " was added.",
-          },
-          -1,
-        );
-      })
-      .catch((err) => {
-        console.error("Error when adding contact to storage:", err);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Contact Not Added",
-            text: "An error prevented importing.",
-          },
-          -1,
-        );
-      });
+    await db.contacts.add(newContact);
+    const allContacts = this.contacts.concat([newContact]);
+    this.contacts = R.sort(
+      (a: Contact, b) => (a.name || "").localeCompare(b.name || ""),
+      allContacts,
+    );
  }

  async deleteContact(contact: Contact) {
@@ -584,22 +421,9 @@ export default class ContactsView extends Vue {
      confirm(
        "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"
-            : "") +
          "?",
      )
    ) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "toast",
-          text: "",
-          title: "Registration submitted...",
-        },
-        1000,
-      );
-
      const identity = await this.getIdentity(this.activeDid);

      const vcClaim: RegisterVerifiableCredential = {
@@ -633,37 +457,28 @@ export default class ContactsView extends Vue {
        // Make the xhr request payload
        const payload = JSON.stringify({ jwtEncoded: vcJwt });
        const url = this.apiServer + "/api/v2/claim";
-        const headers = await this.getHeaders(identity);
+        const token = await accessToken(identity);
+        const headers = {
+          "Content-Type": "application/json",
+          Authorization: "Bearer " + token,
+        };

        try {
          const resp = await this.axios.post(url, payload, { headers });
+          //console.log("Got resp data:", resp.data);
          if (resp.data?.success?.embeddedRecordError) {
+            this.alertTitle = "Registration Still Unknown";
            let message = "There was some problem with the registration.";
            if (typeof resp.data.success.embeddedRecordError == "string") {
              message += " " + resp.data.success.embeddedRecordError;
            }
-            this.$notify(
-              {
-                group: "alert",
-                type: "danger",
-                title: "Registration Still Unknown",
-                text: message,
-              },
-              -1,
-            );
+            this.alertMessage = message;
          } else if (resp.data?.success?.handleId) {
            contact.registered = true;
            db.contacts.update(contact.did, { registered: true });

-            this.$notify(
-              {
-                group: "alert",
-                type: "info",
-                title: "Registration Success",
-                text: contact.name + " has been registered.",
-              },
-              -1,
-            );
+            this.alertTitle = "Registration Success";
+            this.alertMessage = contact.name + " has been registered.";
          }
        } catch (error) {
          let userMessage = "There was an error. See logs for more info.";
@@ -678,15 +493,8 @@ export default class ContactsView extends Vue {
            userMessage = error as string;
          }
          // Now set that error for the user to see.
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Server Error",
-              text: userMessage,
-            },
-            -1,
-          );
+          this.alertTitle = "Error With Server";
+          this.alertMessage = userMessage;
        }
      }
    }
@@ -707,33 +515,17 @@ export default class ContactsView extends Vue {
        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: "Server Error",
-            text: message,
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        console.error("Bad response setting visibility: ", resp.data);
+        if (resp.data.error?.message) {
+          this.alertMessage = resp.data.error?.message;
+        } else {
+          this.alertMessage = "Bad server response of " + resp.status;
+        }
      }
    } 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,
-      );
+      this.alertTitle = "Error With Server";
+      this.alertMessage = err as string;
    }
  }

@@ -742,8 +534,6 @@ export default class ContactsView extends Vue {
      this.apiServer +
      "/api/report/canDidExplicitlySeeMe?did=" +
      encodeURIComponent(contact.did);
-    const identity = await this.getIdentity(this.activeDid);
-    const headers = await this.getHeaders(identity);

    try {
      const resp = await this.axios.get(url, { headers });
@@ -752,43 +542,23 @@ export default class ContactsView extends Vue {
        contact.seesMe = visibility;
        db.contacts.update(contact.did, { seesMe: visibility });

-        this.$notify(
-          {
-            group: "alert",
-            type: "info",
-            title: "Refreshed",
-            text:
-              this.nameForContact(contact, true) +
-              " can " +
-              (visibility ? "" : "not ") +
-              "see your activity.",
-          },
-          -1,
-        );
+        this.alertTitle = "Refreshed";
+        this.alertMessage =
+          this.nameForContact(contact, true) +
+          " can " +
+          (visibility ? "" : "not ") +
+          "see your activity.";
      } else {
-        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: "Server Error",
-            text: message,
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        if (resp.data.error?.message) {
+          this.alertMessage = resp.data.error?.message;
+        } else {
+          this.alertMessage = "Bad server response of " + resp.status;
+        }
      }
    } catch (err) {
-      console.log("Caught error from server request to check visibility:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Server Error",
-          text: "Check connectivity and try again.",
-        },
-        -1,
-      );
+      this.alertTitle = "Error With Server";
+      this.alertMessage = err as string;
    }
  }

@@ -812,17 +582,11 @@ export default class ContactsView extends Vue {

    // if they have unconfirmed amounts, ask to confirm those first
    if (toDid == identity?.did && this.givenToMeUnconfirmed[fromDid] > 0) {
-      const isare = this.givenToMeUnconfirmed[fromDid] == 1 ? "is" : "are";
-      const hours = this.givenToMeUnconfirmed[fromDid] == 1 ? "hour" : "hours";
      if (
        confirm(
-          "There " +
-            isare +
-            " " +
+          "There are " +
            this.givenToMeUnconfirmed[fromDid] +
-            " unconfirmed " +
-            hours +
-            " from them." +
+            " unconfirmed hours from them." +
            " Would you like to confirm some of those hours?",
        )
      ) {
@@ -830,39 +594,18 @@ export default class ContactsView extends Vue {
          name: "contact-amounts",
          query: { contactDid: fromDid },
        });
-        return;
      }
    }
    if (!this.isNumeric(this.hourInput)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Input Error",
-          text: "This is not a valid number of hours: " + this.hourInput,
-        },
-        -1,
-      );
+      this.alertTitle = "Input Error";
+      this.alertMessage =
+        "This is not a valid number of hours: " + this.hourInput;
    } else if (!parseFloat(this.hourInput)) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Input Error",
-          text: "Giving 0 hours does nothing.",
-        },
-        -1,
-      );
+      this.alertTitle = "Input Error";
+      this.alertMessage = "Giving 0 hours does nothing.";
    } else if (!identity) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Status Error",
-          text: "No identity is available.",
-        },
-        -1,
-      );
+      this.alertTitle = "Status Error";
+      this.alertMessage = "No identity is available.";
    } else {
      // ask to confirm amount
      let toFrom;
@@ -881,9 +624,7 @@ export default class ContactsView extends Vue {
        confirm(
          "Are you sure you want to record " +
            this.hourInput +
-            " hour" +
-            (this.hourInput == "1" ? "" : "s") +
-            " " +
+            " hours " +
            toFrom +
            description +
            "?",
@@ -943,20 +684,18 @@ export default class ContactsView extends Vue {

      const payload = JSON.stringify({ jwtEncoded: vcJwt });
      const url = this.apiServer + "/api/v2/claim";
-      const headers = await this.getHeaders(identity);
+      const token = await accessToken(identity);
+      const headers = {
+        "Content-Type": "application/json",
+        Authorization: "Bearer " + token,
+      };

      try {
        const resp = await this.axios.post(url, payload, { headers });
+        //console.log("Got resp data:", resp.data);
        if (resp.data?.success?.handleId) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "success",
-              title: "Done",
-              text: "Successfully logged time to the server.",
-            },
-            -1,
-          );
+          this.alertTitle = "Done";
+          this.alertMessage = "Successfully logged time to the server.";

          if (fromDid === identity.did) {
            const newList = R.clone(this.givenByMeUnconfirmed);
@@ -981,31 +720,12 @@ export default class ContactsView extends Vue {
          userMessage = error as string;
        }
        // Now set that error for the user to see.
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Server Error",
-            text: userMessage,
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        this.alertMessage = userMessage;
      }
    }
  }

-  private async onClickCancelName() {
-    this.contactEdit = null;
-    this.contactNewName = "";
-  }
-
-  private async onClickSaveName(contact: Contact, newName: string) {
-    contact.name = newName;
-    return db.contacts
-      .update(contact.did, { name: newName })
-      .then(() => (this.contactEdit = null));
-  }
-
  public toggleShowGiveTotals() {
    if (this.showGiveTotals) {
      this.showGiveTotals = false;
@@ -1030,36 +750,14 @@ export default class ContactsView extends Vue {
 </script>

 <style>
-.dialog-overlay {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: rgba(0, 0, 0, 0.5);
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  padding: 1.5rem;
-}
-.dialog {
-  background-color: white;
-  padding: 1rem;
-  border-radius: 0.5rem;
-  width: 100%;
-  max-width: 500px;
-}
-
-/*
-  Tooltip, generated on "title" attributes on "fa" icons
-  Kudos to https://www.w3schools.com/css/css_tooltip.asp
-*/
+/* Tooltip from https://www.w3schools.com/css/css_tooltip.asp */
 /* Tooltip container */
 .tooltip {
  position: relative;
  display: inline-block;
  border-bottom: 1px dotted black; /* If you want dots under the hoverable text */
 }
+
 /* Tooltip text */
 .tooltip .tooltiptext {
  visibility: hidden;
--- a/src/views/DiscoverView.vue
+++ b/src/views/DiscoverView.vue
@@ -9,7 +9,7 @@
    </h1>

    <!-- Quick Search -->
-    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="searchAll()">
+    <div id="QuickSearch" class="mb-4 flex" v-on:keyup.enter="search()">
      <input
        type="text"
        v-model="searchTerms"
@@ -17,7 +17,7 @@
        class="block w-full rounded-l border border-r-0 border-slate-400 px-3 py-2"
      />
      <button
-        @click="searchAll()"
+        @click="search()"
        class="px-4 rounded-r bg-slate-200 border border-l-0 border-slate-400"
      >
        <fa icon="magnifying-glass" class="fa-fw"></fa>
@@ -30,163 +30,144 @@
        <li>
          <a
            href="#"
-            @click="
-              projects = [];
-              isLocalActive = true;
-              isRemoteActive = false;
-              searchLocal();
-            "
-            v-bind:class="computedLocalTabClassNames()"
+            @click="searchLocal()"
+            class="inline-block py-3 rounded-t-lg border-b-2 active text-blue-600 border-blue-600 font-semibold"
          >
            Nearby
            <span
              class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              >{{ localCount }}</span
+              >20+</span
            >
          </a>
        </li>
        <li>
          <a
            href="#"
-            v-bind:class="computedRemoteTabClassNames()"
-            @click="
-              projects = [];
-              isRemoteActive = true;
-              isLocalActive = false;
-              searchAll();
-            "
+            class="inline-block py-3 rounded-t-lg border-b-2 border-transparent hover:text-slate-600 hover:border-slate-300"
          >
-            Anywhere
+            Remote
            <span
              class="font-semibold text-sm bg-slate-200 px-1.5 py-0.5 rounded-md"
-              >{{ remoteCount }}</span
+              >13</span
            >
          </a>
        </li>
      </ul>
    </div>

-    <div v-if="isLocalActive">
-      <div>
-        <button
-          class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-          @click="$router.push({ name: 'search-area' })"
-        >
-          Select a {{ searchBox ? "Different" : "" }} Location for Nearby Search
-        </button>
-      </div>
-    </div>
-
-    <!-- Loading Animation -->
-    <div
-      class="fixed left-6 bottom-24 text-center text-4xl leading-none bg-slate-400 text-white w-14 py-2.5 rounded-full"
-      v-if="isLoading"
-    >
-      <fa icon="spinner" class="fa-spin-pulse"></fa>
-    </div>
-
    <!-- Results List -->
-    <InfiniteScroll @reached-bottom="loadMoreData" v-if="!isChoosingSearchBox">
-      <ul>
-        <li
-          class="border-b border-slate-300"
-          v-for="project in projects"
-          :key="project.handleId"
+    <ul class="">
+      <li class="border-b border-slate-300">
+        <a
+          @click="
+            onClickLoadProject(
+              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
+            )
+          "
+          class="block py-4 flex gap-4"
        >
-          <a
-            @click="onClickLoadProject(project.handleId)"
-            class="block py-4 flex gap-4"
-          >
-            <div class="w-12">
-              <EntityIcon
-                :entityId="project.handleId"
-                :iconSize="48"
-                class="block border border-slate-300 rounded-md"
-              ></EntityIcon>
-            </div>
+          <div class="w-12">
+            <img
+              src="https://picsum.photos/200/200?random=1"
+              class="w-full rounded"
+            />
+          </div>

-            <div class="grow">
-              <h2 class="text-base font-semibold">{{ project.name }}</h2>
-              <div class="text-sm">
-                <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{
-                  didInfo(project.issuerDid, activeDid, allMyDids, allContacts)
-                }}
-              </div>
+          <div class="grow">
+            <h2 class="text-base font-semibold">Canyon cleanup</h2>
+            <div class="text-sm">
+              <fa icon="user" class="fa-fw text-slate-400"></fa> Rotary
            </div>
-          </a>
-        </li>
-      </ul>
-    </InfiniteScroll>
+          </div>
+        </a>
+      </li>
+
+      <li class="border-b border-slate-300">
+        <a
+          @click="
+            onClickLoadProject(
+              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
+            )
+          "
+          class="block py-4 flex gap-4"
+        >
+          <div class="w-12">
+            <img
+              src="https://picsum.photos/200/200?random=2"
+              class="w-full rounded"
+            />
+          </div>
+
+          <div class="grow">
+            <h2 class="text-base font-semibold">Potluck with neighbors</h2>
+            <div class="text-sm">
+              <fa icon="user" class="fa-fw text-slate-400"></fa> Andrew A.
+            </div>
+          </div>
+        </a>
+      </li>
+
+      <li class="border-b border-slate-300">
+        <a
+          @click="
+            onClickLoadProject(
+              'https://endorser.ch/entity/01H3HER4DTNCR6ZC4VXA3VPWVQ',
+            )
+          "
+          class="block py-4 flex gap-4"
+        >
+          <div class="w-12">
+            <img
+              src="https://picsum.photos/200/200?random=3"
+              class="w-full rounded"
+            />
+          </div>
+
+          <div class="grow">
+            <h2 class="text-base font-semibold">Historical site</h2>
+            <div class="text-sm">
+              <fa icon="user" class="fa-fw text-slate-400 mr-1"></fa>
+              <em>Unknown</em>
+            </div>
+          </div>
+        </a>
+      </li>
+    </ul>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";

-import { accountsDB, db } from "@/db/index";
-import { Contact } from "@/db/tables/contacts";
-import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
+import { accountsDB, db } from "@/db";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-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;
-}
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

@Component({
-  components: {
-    QuickNav,
-    InfiniteScroll,
-    EntityIcon,
-  },
+  components: { AlertMessage, QuickNav },
 })
 export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  activeDid = "";
-  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
  apiServer = "";
  searchTerms = "";
-  projects: ProjectData[] = [];
-  isChoosingSearchBox = false;
-  isLocalActive = true;
-  isRemoteActive = false;
-  localCount = 0;
-  remoteCount = 0;
-  searchBox: { name: string; bbox: BoundingBox } | null = null;
-  isLoading = false;
-
-  // make this function available to the Vue template
-  didInfo = didInfo;
+  alertMessage = "";
+  alertTitle = "";

  async mounted() {
    await db.open();
    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
    this.activeDid = settings?.activeDid || "";
    this.apiServer = settings?.apiServer || "";
-    this.searchBox = settings?.searchBoxes?.[0] || null;
-
-    this.allContacts = await db.contacts.toArray();
-
-    await accountsDB.open();
-    const allAccounts = await accountsDB.accounts.toArray();
-    this.allMyDids = allAccounts.map((acc) => acc.did);
-
-    this.searchLocal();
  }

-  public async buildHeaders(): Promise<HeadersInit> {
-    const headers: HeadersInit = {
-      "Content-Type": "application/json",
-    };
+  public async buildHeaders() {
+    const headers = { "Content-Type": "application/json" };

    if (this.activeDid) {
      await accountsDB.open();
@@ -207,17 +188,15 @@ export default class DiscoverView extends Vue {
    return headers;
  }

-  public async searchAll(beforeId?: string) {
-    let queryParams = "claimContents=" + encodeURIComponent(this.searchTerms);
-
-    if (beforeId) {
-      queryParams = queryParams + `&beforeId=${beforeId}`;
-    }
+  public async search() {
+    const claimContents =
+      "claimContents=" + encodeURIComponent(this.searchTerms);
+    const claimType = "claimType=PlanAction";
+    const queryParams = [claimContents, claimType].join("&");

    try {
-      this.isLoading = true;
      const response = await fetch(
-        this.apiServer + "/api/v2/report/plans?" + queryParams,
+        this.apiServer + "/api/v2/report/claims?" + queryParams,
        {
          method: "GET",
          headers: await this.buildHeaders(),
@@ -226,71 +205,36 @@ export default class DiscoverView extends Vue {

      if (response.status !== 200) {
        const details = await response.text();
-        console.log("Problem with full search:", details);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: `There was a problem accessing the server. Try again later.`,
-          },
-          -1,
-        );
-
        throw details;
      }

      const results = await response.json();

-      const plans: ProjectData[] = results.data;
-      if (plans) {
-        for (const plan of plans) {
-          const { name, description, handleId, rowid } = plan;
-          this.projects.push({ name, description, handleId, rowid });
-        }
-        this.remoteCount = this.projects.length;
+      if (results.data) {
+        console.log("Plans found in that search:", results.data);
      } else {
        throw JSON.stringify(results);
      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (e: any) {
+    } catch (e) {
      console.log("Error with feed load:", e);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: e.userMessage || "There was a problem retrieving projects.",
-        },
-        -1,
-      );
-    } finally {
-      this.isLoading = false;
+      this.alertMessage =
+        e.userMessage || "There was an error retrieving projects.";
+      this.alertTitle = "Error";
    }
  }

-  public async searchLocal(beforeId?: string) {
-    if (!this.searchBox) {
-      this.projects = [];
-      return;
-    }
-
+  public async searchLocal() {
    const claimContents =
      "claimContents=" + encodeURIComponent(this.searchTerms);
-    let queryParams = [
+    const queryParams = [
      claimContents,
-      "minLocLat=" + this.searchBox.bbox.minLat,
-      "maxLocLat=" + this.searchBox.bbox.maxLat,
-      "westLocLon=" + this.searchBox.bbox.westLong,
-      "eastLocLon=" + this.searchBox.bbox.eastLong,
+      "minLocLat=40.901000",
+      "maxLocLat=40.904000",
+      "westLocLon=-111.914000",
+      "eastLocLon=-111.909000",
    ].join("&");

-    if (beforeId) {
-      queryParams = queryParams + `&beforeId=${beforeId}`;
-    }
-
    try {
-      this.isLoading = true;
      const response = await fetch(
        this.apiServer + "/api/v2/report/plansByLocation?" + queryParams,
        {
@@ -300,67 +244,21 @@ export default class DiscoverView extends Vue {
      );

      if (response.status !== 200) {
-        const details = await response.text();
-        console.log("Problem with nearby search:", details);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "There was a problem accessing the server. Try again later.",
-          },
-          -1,
-        );
        throw await response.text();
      }

      const results = await response.json();

      if (results.data) {
-        if (beforeId) {
-          const plans: ProjectData[] = results.data;
-          for (const plan of plans) {
-            const { name, description, handleId = plan.handleId, rowid } = plan;
-            if (beforeId !== plan["rowid"]) {
-              this.projects.push({ name, description, handleId, rowid });
-            }
-          }
-        } else {
-          this.projects = results.data;
-        }
-        this.localCount = this.projects.length;
+        console.log("Plans found in that location:", results.data);
      } else {
        throw JSON.stringify(results);
      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (e: any) {
+    } catch (e) {
      console.log("Error with feed load:", e);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: e.userMessage || "There was a problem retrieving projects.",
-        },
-        -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 loadMoreData(payload: boolean) {
-    if (this.projects.length > 0 && payload) {
-      const latestProject = this.projects[this.projects.length - 1];
-      if (this.isLocalActive) {
-        this.searchLocal(latestProject["rowid"]);
-      } else if (this.isRemoteActive) {
-        this.searchAll(latestProject["rowid"]);
-      }
+      this.alertMessage =
+        e.userMessage || "There was an error retrieving projects.";
+      this.alertTitle = "Error";
    }
  }

@@ -375,37 +273,5 @@ export default class DiscoverView extends Vue {
    };
    this.$router.push(route);
  }
-
-  public computedLocalTabClassNames() {
-    return {
-      "inline-block": true,
-      "py-3": true,
-      "rounded-t-lg": true,
-      "border-b-2": true,
-      active: this.isLocalActive,
-      "text-blue-600": this.isLocalActive,
-      "border-blue-600": this.isLocalActive,
-      "font-semibold": this.isLocalActive,
-      "border-transparent": !this.isLocalActive,
-      "hover:text-slate-600": !this.isLocalActive,
-      "hover:border-slate-300": !this.isLocalActive,
-    };
-  }
-
-  public computedRemoteTabClassNames() {
-    return {
-      "inline-block": true,
-      "py-3": true,
-      "rounded-t-lg": true,
-      "border-b-2": true,
-      active: this.isRemoteActive,
-      "text-blue-600": this.isRemoteActive,
-      "border-blue-600": this.isRemoteActive,
-      "font-semibold": this.isRemoteActive,
-      "border-transparent": !this.isRemoteActive,
-      "hover:text-slate-600": !this.isRemoteActive,
-      "hover:border-slate-300": !this.isRemoteActive,
-    };
-  }
 }
 </script>
--- a/src/views/HelpView.vue
+++ b/src/views/HelpView.vue
@@ -41,15 +41,14 @@
        You need someone to register you -- usually the person who told you
        about this app, on the Contacts
        <fa icon="circle-user" class="fa-fw" /> page. After they register you,
-        you can select any contact on the home page (or "anonymous") and record
-        your appreciation for... whatever. The main goal is to record what
-        people have given you, to grow gifting economies. Each claim is recorded
+        and after you have contacts, you can select any contact on the home page
+        and record your appreciation for... whatever. That is a claim recorded
        on a custom ledger. The day after being registered, you'll be able to
-        able to register others; later, you can create projects, too.
+        register others; later, you can create projects, too.
      </p>
      <p>
-        Note that there are limits to how many others each person can register,
-        so you may have to wait.
+        Note that there are limits to how many each person can register, so you
+        may have to wait.
      </p>

      <h2 class="text-xl font-semibold">How do I backup all my data?</h2>
@@ -129,16 +128,6 @@
        key.
      </p>

-      <h2 class="text-xl font-semibold">How do I create another identity?</h2>
-      <p>
-        Before doing this, note that it is an advanced feature that affects
-        functionality (eg. the words "Alt ID" next to results, backup features)
-        so beware if you think that may cause confusion. You can
-        <router-link to="start" class="text-blue-500">
-          create another identity here.
-        </router-link>
-      </p>
-
      <h2 class="text-xl font-semibold">
        I know there is a record from someone, so why can't I see that info?
      </h2>
@@ -157,6 +146,14 @@
        page.
      </p>

+      <h2 class="text-xl font-semibold">How do I create another identity?</h2>
+      <p>
+        Go
+        <router-link to="start" class="text-blue-500">
+          create another identity here.
+        </router-link>
+      </p>
+
      <h2 class="text-xl font-semibold">What is your privacy policy?</h2>
      <p>
        See
@@ -184,7 +181,7 @@
 <script lang="ts">
 import * as Package from "../../package.json";
 import { Component, Vue } from "vue-facing-decorator";
-import QuickNav from "@/components/QuickNav.vue";
+import QuickNav from "@/components/QuickNav";

@Component({ components: { QuickNav } })
 export default class Help extends Vue {
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -6,166 +6,112 @@
      Time Safari
    </h1>

-    <!-- show the actions for recognizing a give -->
    <div class="mb-8">
-      <div v-if="!activeDid">
-        To record others' giving,
-        <router-link :to="{ name: 'start' }" class="text-blue-500">
-          create your identifier.</router-link
+      <h1 class="text-2xl">Quick Action</h1>
+      <p>Choose a contact to whom to show appreciation:</p>
+      <!-- similar contact selection code is in multiple places -->
+      <div class="px-4">
+        <button
+          v-for="contact in allContacts"
+          :key="contact.did"
+          @click="openDialog(contact)"
+          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
        >
-      </div>
-
-      <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
-        >
-        and then
-        <router-link :to="{ name: 'account' }" class="text-blue-500">
-          check your limits.</router-link
-        >
-      </div>
-
-      <div v-else>
-        <!-- activeDid && isRegistered -->
-        <h2 class="text-xl font-bold">Record a Gift</h2>
-
-        <ul class="grid grid-cols-4 gap-x-3 gap-y-5 text-center mb-5">
-          <li @click="openDialog()">
-            <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"
-            >
-              Anonymous/Unnamed
-            </h3>
-          </li>
-          <li
-            v-for="contact in allContacts"
-            :key="contact.did"
-            @click="openDialog(contact)"
-          >
-            <EntityIcon
-              :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"
-            >
-              {{ contact.name || contact.did }}
-            </h3>
-          </li>
-        </ul>
-
-        <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
-        <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>
+          {{ contact.name || "(no name)" }}
+        </button>
+        <span v-if="allContacts.length > 0">&nbsp;or&nbsp;</span>
+        <button @click="openDialog()" class="text-blue-500">
+          someone not specified
+        </button>
      </div>
    </div>

-    <GiftedDialog ref="customDialog" message="Received from"> </GiftedDialog>
+    <GiftedDialog
+      ref="customDialog"
+      @dialog-result="handleDialogResult"
+      message="Received from"
+    >
+    </GiftedDialog>

-    <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>
-      <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">
+    <div>
+      <h1 class="text-2xl">Latest Activity</h1>
+      <span :class="{ hidden: isHiddenSpinner }">
+        <fa icon="spinner" class="fa-spin-pulse"></fa>
+        Loading&hellip;
+      </span>
+      <ul>
        <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"
+            class="border-b border-dashed border-slate-400 text-orange-400 py-2 mb-2 font-bold uppercase text-sm"
            v-if="record.jwtId == feedLastViewedId"
          >
            You've seen all claims below:
          </div>
          <div class="flex">
-            <fa icon="gift" class="pt-1 pr-2 text-slate-500"></fa>
+            <fa
+              icon="gift"
+              class="fa-fw flex-none 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>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
 import GiftedDialog from "@/components/GiftedDialog.vue";
-import { db, accountsDB } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { db, accountsDB } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import {
-  didInfo,
-  GiverInputInfo,
-  GiveServerRecord,
-} 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";
+import { createAndSubmitGive, didInfo } from "@/libs/endorserServer";
 import { Account } from "@/db/tables/accounts";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import { Contact } from "@/db/tables/contacts";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

@Component({
-  components: { GiftedDialog, QuickNav, EntityIcon },
+  components: { GiftedDialog, AlertMessage, QuickNav },
 })
 export default class HomeView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  activeDid = "";
+  allAccounts: Array<Account> = [];
  allContacts: Array<Contact> = [];
-  allMyDids: Array<string> = [];
  apiServer = "";
  feedAllLoaded = false;
  feedData = [];
-  feedPreviousOldestId?: string;
-  feedLastViewedId?: string;
+  feedPreviousOldestId = null;
+  feedLastViewedId = null;
  isHiddenSpinner = true;
-  isRegistered = false;
+  alertTitle = "";
+  alertMessage = "";
+  accounts: AccountsSchema;
  numAccounts = 0;

  async beforeCreate() {
-    await accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
+    accountsDB.open();
+    this.accounts = accountsDB.accounts;
+    this.numAccounts = await this.accounts.count();
  }

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
-    const account = (await accountsDB.accounts
+    const account = await accountsDB.accounts
      .where("did")
      .equals(activeDid)
-      .first()) as Account;
+      .first();
    const identity = JSON.parse(account?.identity || "null");

    if (!identity) {
@@ -176,7 +122,7 @@ export default class HomeView extends Vue {
    return identity;
  }

-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
    const token = await accessToken(identity);
    const headers = {
      "Content-Type": "application/json",
@@ -188,44 +134,29 @@ export default class HomeView extends Vue {
  async created() {
    try {
      await accountsDB.open();
-      const allAccounts = await accountsDB.accounts.toArray();
-      this.allMyDids = allAccounts.map((acc) => acc.did);
-
+      this.allAccounts = await accountsDB.accounts.toArray();
      await db.open();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
      this.apiServer = settings?.apiServer || "";
      this.activeDid = settings?.activeDid || "";
      this.allContacts = await db.contacts.toArray();
      this.feedLastViewedId = settings?.lastViewedClaimId;
-      this.isRegistered = !!settings?.isRegistered;
      this.updateAllFeed();
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text:
-            err.userMessage ||
-            "There was an error retrieving the latest sweet, sweet action.",
-        },
-        -1,
-      );
+    } catch (err) {
+      this.alertTitle = "Error";
+      this.alertMessage =
+        err.userMessage ||
+        "There was an error retrieving the latest sweet, sweet action.";
    }
  }

  public async buildHeaders() {
-    const headers: HeadersInit = {
-      "Content-Type": "application/json",
-    };
+    const headers = { "Content-Type": "application/json" };

    if (this.activeDid) {
      await accountsDB.open();
      const allAccounts = await accountsDB.accounts.toArray();
-      const account = allAccounts.find(
-        (acc) => acc.did === this.activeDid,
-      ) as Account;
+      const account = allAccounts.find((acc) => acc.did === this.activeDid);
      const identity = JSON.parse(account?.identity || "null");

      if (!identity) {
@@ -243,7 +174,7 @@ export default class HomeView extends Vue {

  public async updateAllFeed() {
    this.isHiddenSpinner = false;
-    await this.retrieveClaims(this.apiServer, this.feedPreviousOldestId)
+    await this.retrieveClaims(this.apiServer, null, this.feedPreviousOldestId)
      .then(async (results) => {
        if (results.data.length > 0) {
          this.feedData = this.feedData.concat(results.data);
@@ -264,21 +195,15 @@ export default class HomeView extends Vue {
      })
      .catch((e) => {
        console.log("Error with feed load:", e);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Export Error",
-            text: e.userMessage || "There was an error retrieving feed data.",
-          },
-          -1,
-        );
+        this.alertMessage =
+          e.userMessage || "There was an error retrieving feed data.";
+        this.alertTitle = "Error";
      });

    this.isHiddenSpinner = true;
  }

-  public async retrieveClaims(endorserApiServer: string, beforeId?: string) {
+  public async retrieveClaims(endorserApiServer, identifier, beforeId) {
    const beforeQuery = beforeId == null ? "" : "&beforeId=" + beforeId;
    const response = await fetch(
      endorserApiServer + "/api/v2/report/gives?" + beforeQuery,
@@ -301,58 +226,132 @@ export default class HomeView extends Vue {
    }
  }

-  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;
+  giveDescription(giveRecord) {
+    let claim = giveRecord.fullClaim;
+    if (claim.claim) {
+      claim = claim.claim;
+    }
+
    // 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 giverDid =
+      claim.agent?.identifier || claim.agent?.did || giveRecord.issuer;
    const giverInfo = didInfo(
      giverDid,
      this.activeDid,
-      this.allMyDids,
+      this.allAccounts,
      this.allContacts,
    );
-    let gaveAmount = claim.object?.amountOfThisGood
+    const gaveAmount = claim.object?.amountOfThisGood
      ? this.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";
-    }
+      : claim.description || "something unknown";
    // 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 gaveRecipientId = claim.recipient?.identifier || claim.recipient?.did;
    const gaveRecipientInfo = gaveRecipientId
      ? " to " +
        didInfo(
          gaveRecipientId,
          this.activeDid,
-          this.allMyDids,
+          this.allAccounts,
          this.allContacts,
        )
      : "";
-    return giverInfo + " gave" + gaveRecipientInfo + ": " + gaveAmount;
+    return giverInfo + " gave " + gaveAmount + gaveRecipientInfo;
  }

-  displayAmount(code: string, amt: number) {
+  displayAmount(code, amt) {
    return "" + amt + " " + this.currencyShortWordForCode(code, amt === 1);
  }

-  currencyShortWordForCode(unitCode: string, single: boolean) {
+  currencyShortWordForCode(unitCode, single) {
    return unitCode === "HUR" ? (single ? "hour" : "hours") : unitCode;
  }

-  openDialog(giver: GiverInputInfo) {
-    (this.$refs.customDialog as GiftedDialog).open(giver);
+  openDialog(giver) {
+    this.$refs.customDialog.open(giver);
+  }
+
+  handleDialogResult(result) {
+    if (result.action === "confirm") {
+      return new Promise((resolve) => {
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
+      });
+    } else {
+      // action was "cancel" so do nothing
+    }
+  }
+
+  /**
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param hours may be 0
+   */
+  public async recordGive(giverDid, description, hours) {
+    if (!this.activeDid) {
+      this.setAlert(
+        "Error",
+        "You must select an identity before you can record a give.",
+      );
+      return;
+    }
+
+    if (!description && !hours) {
+      this.setAlert(
+        "Error",
+        "You must enter a description or some number of hours.",
+      );
+      return;
+    }
+
+    try {
+      const identity = await this.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        giverDid,
+        this.activeDid,
+        description,
+        hours,
+      );
+
+      if (isGiveCreationError(result)) {
+        const errorMessage = getGiveCreationErrorMessage(result);
+        console.log("Error with give result:", result);
+        this.setAlert(
+          "Error",
+          errorMessage || "There was an error recording the give.",
+        );
+      } else {
+        this.setAlert("Success", "That gift was recorded.");
+      }
+    } catch (error) {
+      console.log("Error with give caught:", error);
+      this.setAlert(
+        "Error",
+        getGiveErrorMessage(error) || "There was an error recording the give.",
+      );
+    }
+  }
+
+  private setAlert(title, message) {
+    this.alertTitle = title;
+    this.alertMessage = message;
+  }
+
+  // Helper functions for readability
+
+  isGiveCreationError(result) {
+    return result.status !== 201 || result.data?.error;
+  }
+
+  getGiveCreationErrorMessage(result) {
+    return result.data?.error?.message;
+  }
+
+  getGiveErrorMessage(error) {
+    return error.userMessage || error.response?.data?.error?.message;
  }
 }
 </script>
--- a/src/views/IdentitySwitcherView.vue
+++ b/src/views/IdentitySwitcherView.vue
@@ -1,170 +0,0 @@
-<template>
-  <QuickNav selected="Profile"></QuickNav>
-  <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: 'account' }"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          ><fa icon="chevron-left" class="fa-fw"></fa>
-        </router-link>
-
-        Switch Identity
-      </h1>
-    </div>
-
-    <!-- Identity List -->
-
-    <!-- Current Identity - Display First! -->
-    <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>
-      </span>
-    </div>
-
-    <!-- Other Identity/ies -->
-    <ul class="mb-4">
-      <li
-        class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
-        v-for="ident in otherIdentities"
-        :key="ident.did"
-        @click="switchAccount(ident.did)"
-      >
-        <fa 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">
-            <b>ID:</b> <code>{{ ident.did }}</code>
-          </div>
-        </span>
-      </li>
-    </ul>
-
-    <!-- Actions -->
-    <!-- id used by puppeteer test script -->
-    <router-link
-      id="start-link"
-      :to="{ name: 'start' }"
-      class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-    >
-      Add Another Identity&hellip;
-    </router-link>
-    <a
-      href="#"
-      class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-8"
-      @click="switchAccount('0')"
-    >
-      No Identity
-    </a>
-  </section>
-</template>
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-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: Notification, timeout?: number) => void;
-
-  Constants = AppString;
-  public accounts: typeof AccountsSchema;
-  public activeDid = "";
-  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();
-      const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-      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"];
-        if (did && this.activeDid !== did) {
-          this.otherIdentities.push({ did: did });
-        }
-      }
-    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Loading Accounts",
-          text: "Clear your cache and start over (after data backup).",
-        },
-        -1,
-      );
-      console.error("Telling user to clear cache at page create because:", err);
-    }
-  }
-
-  async switchAccount(did?: string) {
-    // 0 means none
-    if (did === "0") {
-      did = undefined;
-    }
-    await db.open();
-    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" });
-  }
-}
-</script>
--- a/src/views/ImportAccountView.vue
+++ b/src/views/ImportAccountView.vue
@@ -17,33 +17,13 @@
    <p class="text-center text-xl mb-4 font-light">
      Enter your seed phrase below to import your identity on this device.
    </p>
-    <!-- id used by puppeteer test script -->
    <input
-      id="seed-input"
      type="text"
      placeholder="Seed Phrase"
      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"
-    >
-      Advanced
-    </h3>
-    <div v-if="showAdvanced">
-      Enter a custom derivation path
-      <input
-        type="text"
-        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-        v-model="derivationPath"
-      />
-      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="from_mnemonic()"
@@ -64,26 +44,19 @@

 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import {
-  DEFAULT_ROOT_DERIVATION_PATH,
-  deriveAddress,
-  newIdentifier,
-} from "../libs/crypto";
-import { accountsDB, db } from "@/db/index";
+import { deriveAddress, newIdentifier } from "../libs/crypto";
+import { accountsDB, db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";

@Component({
  components: {},
 })
 export default class ImportAccountView extends Vue {
-  UPORT_DERIVATION_PATH = "m/7696500'/0'/0'/0'";
-
  mnemonic = "";
  address = "";
  privateHex = "";
  publicHex = "";
-  derivationPath = DEFAULT_ROOT_DERIVATION_PATH;
-  showAdvanced = false;
+  derivationPath = "";

  public onCancelClick() {
    this.$router.back();
@@ -92,10 +65,8 @@ export default class ImportAccountView extends Vue {
  public async from_mnemonic() {
    const mne: string = this.mnemonic.trim().toLowerCase();
    if (this.mnemonic.trim().length > 0) {
-      [this.address, this.privateHex, this.publicHex] = deriveAddress(
-        mne,
-        this.derivationPath,
-      );
+      [this.address, this.privateHex, this.publicHex, this.derivationPath] =
+        deriveAddress(mne);

      const newId = newIdentifier(
        this.address,
--- a/src/views/ImportDerivedAccountView.vue
+++ b/src/views/ImportDerivedAccountView.vue
@@ -1,163 +0,0 @@
-<template>
-  <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 -->
-        <button
-          @click="$router.go(-1)"
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-        >
-          <fa icon="chevron-left"></fa>
-        </button>
-        Derive from Existing Identity
-      </h1>
-    </div>
-    <!-- Import Account Form -->
-
-    <div>
-      <p class="text-center text-xl mb-4 font-light">
-        Will increment the maximum derivation path from the existing seed.
-      </p>
-
-      <p v-if="didArrays.length > 1">
-        Choose existing DIDs from same seed phrase to compute derivation.
-      </p>
-      <ul class="mb-4">
-        <li
-          class="block bg-slate-100 rounded-md flex items-center px-4 py-3 mb-2"
-          v-for="dids in didArrays"
-          :key="dids[0]"
-          @click="switchAccount(dids[0])"
-        >
-          <fa
-            v-if="dids[0] == selectedArrayFirstDid"
-            icon="circle"
-            class="fa-fw text-blue-400 text-xl mr-3"
-          ></fa>
-          <fa
-            v-else
-            icon="circle"
-            class="fa-fw text-slate-400 text-xl mr-3"
-          ></fa>
-          <span class="overflow-hidden">
-            <div class="text-sm text-slate-500 truncate">
-              <code>{{ dids.join(",") }}</code>
-            </div>
-          </span>
-        </li>
-      </ul>
-    </div>
-    <div class="mt-8">
-      <button
-        @click="incrementDerivation()"
-        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
-      >
-        Increment and Import
-      </button>
-      <button
-        @click="onCancelClick()"
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Cancel
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import {
-  DEFAULT_ROOT_DERIVATION_PATH,
-  deriveAddress,
-  newIdentifier,
-} from "../libs/crypto";
-import { accountsDB, db } from "@/db/index";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-
-@Component({
-  components: {},
-})
-export default class ImportAccountView extends Vue {
-  derivationPath = DEFAULT_ROOT_DERIVATION_PATH;
-  didArrays: Array<Array<string>> = [];
-  selectedArrayFirstDid = "";
-
-  async mounted() {
-    await accountsDB.open();
-    const accounts = await accountsDB.accounts.toArray();
-    const seedDids: Record<string, Array<string>> = {};
-    accounts.forEach((account) => {
-      const prevDids: Array<string> = seedDids[account.mnemonic] || [];
-      seedDids[account.mnemonic] = prevDids.concat([account.did]);
-    });
-    this.didArrays = Object.values(seedDids);
-    this.selectedArrayFirstDid = this.didArrays[0][0];
-  }
-
-  public onCancelClick() {
-    this.$router.back();
-  }
-
-  public switchAccount(did: string) {
-    this.selectedArrayFirstDid = did;
-  }
-
-  public async incrementDerivation() {
-    await accountsDB.open();
-    // find the maximum derivation path for the selected DIDs
-    const selectedArray: Array<string> =
-      this.didArrays.find((dids) => dids[0] === this.selectedArrayFirstDid) ||
-      [];
-    const allMatchingAccounts = await accountsDB.accounts
-      .where("did")
-      .anyOf(...selectedArray)
-      .toArray();
-    const accountWithMaxDeriv = allMatchingAccounts[0];
-    allMatchingAccounts.slice(1).forEach((account) => {
-      if (account.derivationPath > accountWithMaxDeriv.derivationPath) {
-        accountWithMaxDeriv.derivationPath = account.derivationPath;
-      }
-    });
-    // increment the last number in that max derivation path
-    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;
-
-    const [address, privateHex, publicHex] = deriveAddress(mne, newDerivPath);
-
-    const newId = newIdentifier(address, publicHex, privateHex, newDerivPath);
-
-    try {
-      await accountsDB.accounts.add({
-        dateCreated: new Date().toISOString(),
-        derivationPath: newDerivPath,
-        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" });
-    } catch (err) {
-      console.error("Error saving mnemonic & updating settings:", err);
-    }
-  }
-}
-</script>
--- a/src/views/NewEditAccountView.vue
+++ b/src/views/NewEditAccountView.vue
@@ -10,64 +10,77 @@
        >
          <fa icon="chevron-left" class="fa-fw"></fa>
        </button>
-        Edit Identity
+        [New/Edit] Identity
      </h1>
    </div>
+    <form>
+      <input
+        type="text"
+        placeholder="First Name"
+        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+        v-model="firstName"
+      />
+      <input
+        type="text"
+        placeholder="Last Name"
+        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
+        v-model="lastName"
+      />

-    <input
-      type="text"
-      placeholder="Name"
-      class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
-      v-model="givenName"
-    />
-
-    <div class="mt-8">
-      <button
-        type="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="onClickSaveChanges()"
-      >
-        Save Changes
-      </button>
-      <!-- SHOW ME instead while processing saving changes -->
-      <button
-        type="button"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-        @click="onClickCancel()"
-      >
-        Cancel
-      </button>
-    </div>
+      <div class="mt-8">
+        <button
+          type="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="onClickSaveChanges()"
+        >
+          Save Changes
+        </button>
+        <!-- SHOW ME instead while processing saving changes -->
+        <button
+          type="button"
+          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+          @click="onClickCancel()"
+        >
+          Cancel
+        </button>
+      </div>
+    </form>
  </section>
 </template>

 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { db } from "@/db/index";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { db } from "@/db";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";

@Component({
  components: {},
 })
 export default class NewEditAccountView extends Vue {
-  givenName = "";
+  firstName =
+    localStorage.getItem("firstName") === null
+      ? "--"
+      : localStorage.getItem("firstName");
+  lastName =
+    localStorage.getItem("lastName") === null
+      ? "--"
+      : localStorage.getItem("lastName");

  // 'created' hook runs when the Vue instance is first created
  async created() {
    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
-    this.givenName =
-      (settings?.firstName || "") +
-      (settings?.lastName ? ` ${settings.lastName}` : ""); // deprecated, pre v 0.1.3
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
+    this.firstName = settings?.firstName || "";
+    this.lastName = settings?.lastName || "";
  }

  onClickSaveChanges() {
    db.settings.update(MASTER_SETTINGS_KEY, {
-      firstName: this.givenName,
-      lastName: "", // deprecated, pre v 0.1.3
+      firstName: this.firstName,
+      lastName: this.lastName,
    });
-    localStorage.setItem("firstName", this.givenName as string);
-    localStorage.setItem("lastName", ""); // deprecated, pre v 0.1.3
+    localStorage.setItem("firstName", this.firstName as string);
+    localStorage.setItem("lastName", this.lastName as string);
    this.$router.push({ name: "account" });
  }

--- a/src/views/NewEditCommitmentView.vue
+++ b/src/views/NewEditCommitmentView.vue
@@ -16,44 +16,47 @@
    </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
+    <form>
+      <select
+        class="block w-full rounded border border-slate-400 mb-4 px-3 py-2"
      >
-    </div>
+        <option disabled>Choose a commitment type…</option>
+        <option selected>Time</option>
+        <option>Cryptocurrency</option>
+        <option>Money</option>
+      </select>

-    <!-- Crypto amount -->
+      <!-- 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>

-    <!-- Money amount -->
+      <!-- Crypto 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>
+      <!-- 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>
+    </form>
  </section>
 </template>

--- a/src/views/NewEditProjectView.vue
+++ b/src/views/NewEditProjectView.vue
@@ -1,5 +1,4 @@
 <template>
-  <QuickNav selected="Projects"></QuickNav>
  <!-- CONTENT -->
  <section id="Content" class="p-6 pb-24">
    <!-- Breadcrumb -->
@@ -40,45 +39,6 @@
      {{ description.length }}/500 max. characters
    </div>

-    <div class="flex items-center mb-4">
-      <input
-        type="checkbox"
-        class="mr-2"
-        v-model="includeLocation"
-        @change="includeLocation = true"
-      />
-      <label for="includeLocation">Include Location</label>
-    </div>
-    <div v-if="includeLocation" style="height: 600px; width: 800px">
-      <div class="px-2 py-2">
-        For your security, we recommend you choose a location nearby but not
-        exactly at the place.
-      </div>
-
-      <l-map
-        ref="map"
-        v-model:zoom="zoom"
-        :center="[0, 0]"
-        @click="
-          (event) => {
-            latitude = event.latlng.lat;
-            longitude = event.latlng.lng;
-          }
-        "
-      >
-        <l-tile-layer
-          url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-          layer-type="base"
-          name="OpenStreetMap"
-        />
-        <l-marker
-          v-if="latitude || longitude"
-          :lat-lng="[latitude, longitude]"
-          @click="maybeEraseLatLong()"
-        />
-      </l-map>
-    </div>
-
    <div class="mt-8">
      <button
        :disabled="isHiddenSave"
@@ -103,54 +63,53 @@
        Cancel
      </button>
    </div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
-import "leaflet/dist/leaflet.css";
 import { AxiosError } from "axios";
 import * as didJwt from "did-jwt";
 import { Component, Vue } from "vue-facing-decorator";
-import { LMap, LMarker, LTileLayer } from "@vue-leaflet/vue-leaflet";

-import QuickNav from "@/components/QuickNav.vue";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken, SimpleSigner } from "@/libs/crypto";
 import { useAppStore } from "@/store/app";
 import { IIdentifier } from "@veramo/core";
-import { PlanVerifiableCredential } from "@/libs/endorserServer";
+import AlertMessage from "@/components/AlertMessage";

-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
+interface VerifiableCredential {
+  "@context": string;
+  "@type": string;
+  name: string;
+  description: string;
+  identifier?: string;
 }

@Component({
-  components: { LMap, LMarker, LTileLayer, QuickNav },
+  components: { AlertMessage },
 })
 export default class NewEditProjectView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  activeDid = "";
  apiServer = "";
+  projectName = "";
  description = "";
  errorMessage = "";
-  includeLocation = false;
-  latitude = 0;
-  longitude = 0;
+  accounts: AccountsSchema;
  numAccounts = 0;
-  projectName = "";
-  zoom = 2;

  async beforeCreate() {
-    await accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
+    accountsDB.open();
+    this.accounts = accountsDB.accounts;
+    this.numAccounts = await this.accounts.count();
  }

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
    const account = await accountsDB.accounts
      .where("did")
@@ -166,7 +125,7 @@ export default class NewEditProjectView extends Vue {
    return identity;
  }

-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
    const token = await accessToken(identity);
    const headers = {
      "Content-Type": "application/json",
@@ -225,7 +184,7 @@ export default class NewEditProjectView extends Vue {

  private async SaveProject(identity: IIdentifier) {
    // Make a claim
-    const vcClaim: PlanVerifiableCredential = {
+    const vcClaim: VerifiableCredential = {
      "@context": "https://schema.org",
      "@type": "PlanAction",
      name: this.projectName,
@@ -235,15 +194,6 @@ export default class NewEditProjectView extends Vue {
    if (this.projectId) {
      vcClaim.identifier = this.projectId;
    }
-    if (this.includeLocation) {
-      vcClaim.location = {
-        geo: {
-          "@type": "GeoCoordinates",
-          latitude: this.latitude,
-          longitude: this.longitude,
-        },
-      };
-    }
    // Make a payload for the claim
    const vcPayload = {
      vc: {
@@ -277,18 +227,22 @@ export default class NewEditProjectView extends Vue {
      try {
        const resp = await this.axios.post(url, payload, { headers });
        // handleId is new in server v release-1.6.0; remove fullIri when that
-        // version shows up here: https://api.endorser.ch/api-docs/
+        // version shows up here: https://endorser.ch:3000/api-docs/
        if (resp.data?.success?.handleId || resp.data?.success?.fullIri) {
          this.errorMessage = "";
-
+          this.alertTitle = "";
+          this.alertMessage = "";
          // handleId is new in server v release-1.6.0; remove fullIri when that
-          // version shows up here: https://api.endorser.ch/api-docs/
+          // version shows up here: https://endorser.ch:3000/api-docs/
          useAppStore().setProjectId(
            resp.data.success.handleId || resp.data.success.fullIri,
          );
          setTimeout(
-            function (that: NewEditProjectView) {
-              that.$router.push({ name: "project" });
+            function (that: Vue) {
+              const route = {
+                name: "project",
+              };
+              that.$router.push(route);
            },
            2000,
            this,
@@ -296,47 +250,24 @@ export default class NewEditProjectView extends Vue {
        }
      } catch (error) {
        let userMessage = "There was an error saving the project.";
-        const serverError = error as AxiosError<{
-          error?: { message?: string };
-        }>;
+        const serverError = error as AxiosError;
        if (serverError) {
          if (Object.prototype.hasOwnProperty.call(serverError, "message")) {
            console.log(serverError);
-            userMessage = serverError.response?.data?.error?.message || ""; // This is info for the user.
-            this.$notify(
-              {
-                group: "alert",
-                type: "danger",
-                title: "User Message",
-                text: userMessage,
-              },
-              -1,
-            );
+            this.alertTitle = "User Message";
+            userMessage = serverError.response.data.error.message; // This is info for the user.
+            this.alertMessage = userMessage;
          } else {
-            this.$notify(
-              {
-                group: "alert",
-                type: "danger",
-                title: "Server Message",
-                text: JSON.stringify(serverError.toJSON()),
-              },
-              -1,
-            );
+            this.alertTitle = "Server Message";
+            this.alertMessage = JSON.stringify(serverError.toJSON());
          }
        } else {
          console.error(
            "Here's the full error trying to save the claim:",
            error,
          );
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Claim Error",
-              text: error as string,
-            },
-            -1,
-          );
+          this.alertTitle = "Claim Error";
+          this.alertMessage = error as string;
        }
        // Now set that error for the user to see.
        this.errorMessage = userMessage;
@@ -356,16 +287,12 @@ export default class NewEditProjectView extends Vue {
    }
  }

-  public maybeEraseLatLong() {
-    if (window.confirm("Are you sure you don't want to mark a location?")) {
-      this.latitude = 0;
-      this.longitude = 0;
-      this.includeLocation = false;
-    }
-  }
-
  public onCancelClick() {
    this.$router.back();
  }
+
+  // This same popup code is in many files.
+  alertTitle = "";
+  alertMessage = "";
 }
 </script>
--- a/src/views/NewIdentifierView.vue
+++ b/src/views/NewIdentifierView.vue
@@ -40,16 +40,17 @@
 <script lang="ts">
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import { deriveAddress, generateSeed, newIdentifier } from "@/libs/crypto";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import QuickNav from "@/components/QuickNav.vue";
+import QuickNav from "@/components/QuickNav";

@Component({ components: { QuickNav } })
-export default class NewIdentifierView extends Vue {
+export default class AccountViewView extends Vue {
  loading = true;

  async mounted() {
+    await accountsDB.open();
    const mnemonic = generateSeed();
    // address is 0x... ETH address, without "did:eth:"
    const [address, privateHex, publicHex, derivationPath] =
@@ -57,8 +58,6 @@ export default class NewIdentifierView extends Vue {

    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,
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -12,45 +12,31 @@
        >
          <fa icon="chevron-left" class="fa-fw"></fa>
        </button>
+        <!-- Context Menu -->
+        <a
+          href=""
+          class="text-lg text-center px-2 py-1 absolute -right-2 -top-1"
+          ><fa icon="ellipsis-vertical" class="fa-fw"></fa
+        ></a>
+
        View Plan
      </h1>
    </div>

+    <div class="text-red-500">
+      {{ errorMessage }}
+    </div>
+
    <!-- Project Details -->
    <div class="bg-slate-100 rounded-md overflow-hidden px-4 py-3 mb-4">
      <div>
-        <div class="block pb-4 flex gap-4">
-          <div class="flex-none w-16 pt-1">
-            <EntityIcon
-              :entityId="projectId"
-              :iconSize="64"
-              class="block border border-slate-300 rounded-md"
-            ></EntityIcon>
-          </div>
-
-          <div class="overflow-hidden">
-            <h2 class="text-xl font-semibold">{{ name }}</h2>
-            <div class="text-sm mb-3">
-              <div class="truncate">
-                <fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ issuer }}
-              </div>
-              <div>
-                <fa icon="calendar" class="fa-fw text-slate-400"></fa>
-                {{ timeSince }}
-              </div>
-              <div v-if="latitude || longitude">
-                <fa icon="location-dot" class="fa-fw text-slate-400"></fa>
-                <a
-                  :href="getOpenStreetMapUrl()"
-                  target="_blank"
-                  class="underline"
-                >
-                  Map View
-                </a>
-              </div>
-            </div>
-          </div>
+        <h2 class="text-xl font-semibold">{{ name }}</h2>
+        <div class="flex justify-between gap-4 text-sm mb-3">
+          <span><fa icon="user" class="fa-fw text-slate-400"></fa> Rotary</span>
+          <span
+            ><fa icon="calendar" class="fa-fw text-slate-400"></fa
+            >{{ timeSince }}
+          </span>
        </div>

        <div class="text-sm text-slate-500">
@@ -71,7 +57,6 @@
        </div>
      </div>
      <button
-        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()"
@@ -81,211 +66,164 @@
    </div>

    <div>
-      <div v-if="activeDid" class="text-center">
+      <div v-if="activeDid">
        <button
          @click="openDialog({ name: 'you', did: activeDid })"
-          class="block w-full text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
+          class="text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md"
        >
-          I gave&hellip;
+          I gave...
        </button>
-        <p class="mt-2 mb-4 text-center">Or, record a gift from:</p>
+        &horbar; or:
      </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="openDialog()">
-          <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"
-          >
-            Anonymous/Unnamed
-          </h3>
-        </li>
-        <li
-          v-for="contact in allContacts"
-          :key="contact.did"
-          @click="openDialog(contact)"
-        >
-          <EntityIcon
-            :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"
-          >
-            {{ contact.name || "(no name)" }}
-          </h3>
-        </li>
-      </ul>
-
-      <!-- Ideally, this button should only be visible when the active account has more than 7 or 11 contacts in their list (we want to limit the grid count above to 8 or 12 accounts to keep it compact) -->
-      <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>
+      <!-- similar contact selection code is in multiple places -->
+      Record a gift from
+      <span v-for="contact in allContacts" :key="contact.did">
+        <button @click="openDialog(contact)" class="text-blue-500">
+          &nbsp;{{ contact.name }}</button
+        >,
+      </span>
+      <span v-if="allContacts.length > 0">&nbsp;or&nbsp;</span>
+      <button @click="openDialog()" class="text-blue-500">
+        someone not specified
+      </button>
    </div>

    <!-- Gifts to & from this -->
-    <div class="grid items-start grid-cols-1 sm:grid-cols-2 gap-4">
-      <div class="bg-slate-100 px-4 py-3 rounded-md">
-        <h3 class="text-sm uppercase font-semibold mb-3">
-          Given To This Project
-        </h3>
-
-        <div v-if="givesToThis.length === 0">(None yet. Record one above.)</div>
-
-        <ul v-else class="text-sm border-t border-slate-300">
-          <li
-            v-for="give in givesToThis"
-            :key="give.id"
-            class="py-1.5 border-b border-slate-300"
-          >
-            <div class="flex justify-between gap-4">
-              <span
-                ><fa icon="user" class="fa-fw text-slate-400"></fa>
-                {{ didInfo(give.agentDid, activeDid, allMyDids, allContacts) }}
-              </span>
-              <span v-if="give.amount"
-                ><fa icon="coins" class="fa-fw text-slate-400"></fa>
-                {{ give.amount }}
-              </span>
-            </div>
-            <div v-if="give.description" class="text-slate-500">
-              <fa icon="comment" class="fa-fw text-slate-400"></fa>
-              {{ give.description }}
-            </div>
-          </li>
-        </ul>
+    <div class="mt-8 flex justify-around">
+      <div>
+        <h1 class="text-xl">Given to this Project</h1>
      </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 By This Project
-        </h3>
-        <button
-          @click="onClickLoadProject(fulfilledByThis.handleId)"
-          class="text-blue-500"
-        >
-          {{ fulfilledByThis.name }}
-        </button>
-      </div>
-
-      <div
-        v-if="fulfillersToThis.length > 0"
-        class="bg-slate-100 px-4 py-3 rounded-md"
-      >
-        <h3 class="text-sm uppercase font-semibold mb-3">
-          Contributions To This Project
-        </h3>
-        <ul>
-          <li v-for="plan in fulfillersToThis" :key="plan.handleId">
-            <button
-              @click="onClickLoadProject(plan.handleId)"
-              class="text-blue-500"
-            >
-              {{ plan.name }}
-            </button>
-          </li>
-        </ul>
+      <div>
+        <h1 class="text-xl">... and from this Project</h1>
+      </div>
+    </div>
+    <div class="flex justify-around">
+      <div class="w-1/2">
+        <div v-for="give in givesToThis" :key="give.id">
+          <div class="flex justify-between">
+            <div class="flex gap-3">
+              <div class="flex gap-2">
+                <fa icon="user" class="fa-fw text-slate-400"></fa>
+                <span>{{
+                  didInfo(give.agentDid, activeDid, accounts, allContacts)
+                }}</span>
+              </div>
+              <div class="flex gap-2" v-if="give.amount">
+                <fa icon="coins" class="fa-fw text-slate-400"></fa>
+                <span>{{ give.amount }}</span>
+              </div>
+              <div class="flex gap-2" v-if="give.description">
+                <fa icon="comment" class="fa-fw text-slate-400"></fa>
+                <span>{{ give.description }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="w-1/2">
+        <div v-for="give in givesByThis" :key="give.id">
+          <div class="flex justify-between">
+            <div class="flex gap-3">
+              <div class="flex gap-2">
+                <fa icon="user" class="fa-fw text-slate-400"></fa>
+                <span>{{
+                  didInfo(give.agentDid, activeDid, accounts, allContacts)
+                }}</span>
+              </div>
+              <div class="flex gap-2" v-if="give.amount">
+                <fa icon="coins" class="fa-fw text-slate-400"></fa>
+                <span>{{ give.amount }}</span>
+              </div>
+              <div class="flex gap-2">
+                <fa icon="comment" class="fa-fw text-slate-400"></fa>
+                <span>{{ give.description }}</span>
+              </div>
+            </div>
+          </div>
+        </div>
      </div>
    </div>
-
    <GiftedDialog
      ref="customDialog"
+      @dialog-result="handleDialogResult"
      message="Received from"
-      :projectId="this.projectId"
    >
    </GiftedDialog>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
-import { AxiosError, RawAxiosRequestHeaders } from "axios";
+import { AxiosError } from "axios";
 import * as moment from "moment";
 import { IIdentifier } from "@veramo/core";
 import { Component, Vue } from "vue-facing-decorator";

 import GiftedDialog from "@/components/GiftedDialog.vue";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
-import { MASTER_SETTINGS_KEY, Settings } from "@/db/tables/settings";
+import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import {
+  createAndSubmitGive,
  didInfo,
-  GiverInputInfo,
  GiveServerRecord,
-  PlanServerRecord,
 } 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;
-}
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

@Component({
-  components: { GiftedDialog, QuickNav, EntityIcon },
+  components: { GiftedDialog, AlertMessage, QuickNav },
 })
 export default class ProjectViewView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
+  accounts: AccountsSchema;
  activeDid = "";
-  allMyDids: Array<string> = [];
+  alertMessage = "";
+  alertTitle = "";
  allContacts: Array<Contact> = [];
  apiServer = "";
  description = "";
+  errorMessage = "";
  expanded = false;
-  fulfilledByThis: PlanServerRecord | null = null;
-  fulfillersToThis: Array<PlanServerRecord> = [];
  givesToThis: Array<GiveServerRecord> = [];
-  latitude = 0;
-  longitude = 0;
+  givesByThis: Array<GiveServerRecord> = [];
  name = "";
-  issuer = "";
+  numAccounts = 0;
  projectId = localStorage.getItem("projectId") || ""; // handle ID
  timeSince = "";
  truncatedDesc = "";
  truncateLength = 40;

+  async beforeCreate() {
+    accountsDB.open();
+    this.accounts = accountsDB.accounts;
+    this.numAccounts = (await this.accounts?.count()) || 0;
+  }
+
  async created() {
    await db.open();
-    const settings = (await db.settings.get(MASTER_SETTINGS_KEY)) as Settings;
+    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
    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);
+    this.accounts = accountsDB.accounts;
+    const accountsArr = await this.accounts?.toArray();
    const account = accountsArr.find((acc) => acc.did === this.activeDid);
    const identity = JSON.parse(account?.identity || "null");
-
-    const pathParam = window.location.pathname.substring("/project/".length);
-    if (pathParam) {
-      this.projectId = decodeURIComponent(pathParam);
-    }
-    this.LoadProject(this.projectId, identity);
+    this.LoadProject(identity);
  }

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
-    const account = (await accountsDB.accounts
+    const account = await accountsDB.accounts
      .where("did")
      .equals(activeDid)
-      .first()) as Account;
+      .first();
    const identity = JSON.parse(account?.identity || "null");

    if (!identity) {
@@ -296,7 +234,7 @@ export default class ProjectViewView extends Vue {
    return identity;
  }

-  public async getHeaders(identity: IIdentifier) {
+  public async getHeaders(identity) {
    const token = await accessToken(identity);
    const headers = {
      "Content-Type": "application/json",
@@ -314,13 +252,8 @@ 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);
+  didInfo(did, activeDid, identities, contacts) {
+    return didInfo(did, activeDid, identities, contacts);
  }

  expandText() {
@@ -331,12 +264,12 @@ export default class ProjectViewView extends Vue {
    this.expanded = false;
  }

-  async LoadProject(projectId: string, identity: IIdentifier) {
-    this.projectId = projectId;
-
+  async LoadProject(identity: IIdentifier) {
    const url =
-      this.apiServer + "/api/claim/byHandle/" + encodeURIComponent(projectId);
-    const headers: RawAxiosRequestHeaders = {
+      this.apiServer +
+      "/api/claim/byHandle/" +
+      encodeURIComponent(this.projectId);
+    const headers = {
      "Content-Type": "application/json",
    };
    if (identity) {
@@ -347,194 +280,134 @@ export default class ProjectViewView extends Vue {
    try {
      const resp = await this.axios.get(url, { headers });
      if (resp.status === 200) {
+        // feel free to remove this; I haven't yet because it's helpful
+        console.log("Loaded project: ", resp.data);
        const startTime = resp.data.startTime;
        if (startTime != null) {
          const eventDate = new Date(startTime);
          const now = moment.now();
          this.timeSince = moment.utc(now).to(eventDate);
        }
-        this.issuer = resp.data.issuer;
        this.name = resp.data.claim?.name || "(no name)";
        this.description = resp.data.claim?.description || "(no description)";
        this.truncatedDesc = this.description.slice(0, this.truncateLength);
-        this.latitude = resp.data.claim?.location?.geo?.latitude || 0;
-        this.longitude = resp.data.claim?.location?.geo?.longitude || 0;
      } else if (resp.status === 404) {
        // actually, axios throws an error so we never get here
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "That project does not exist.",
-          },
-          -1,
-        );
+        this.errorMessage = "That project does not exist.";
      }
    } catch (error: unknown) {
      const serverError = error as AxiosError;
      if (serverError.response?.status === 404) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "That project does not exist.",
-          },
-          -1,
-        );
+        this.errorMessage = "That project does not exist.";
      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Something went wrong retrieving that project. See logs for more info.",
-          },
-          -1,
-        );
-        console.error("Error retrieving project:", serverError.message);
+        this.errorMessage =
+          "Something went wrong retrieving that project." +
+          " See logs for more info.";
+        console.error("Error retrieving project:", error);
      }
    }

    const givesInUrl =
      this.apiServer +
      "/api/v2/report/givesForPlans?planIds=" +
-      encodeURIComponent(JSON.stringify([projectId]));
+      encodeURIComponent(JSON.stringify([this.projectId]));
    try {
      const resp = await this.axios.get(givesInUrl, { headers });
      if (resp.status === 200 && resp.data.data) {
        this.givesToThis = resp.data.data;
      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve gives to this project.",
-          },
-          -1,
-        );
+        this.errorMessage = "Failed to retrieve gives to this project.";
      }
    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving gives to this project.",
-        },
-        -1,
-      );
-      console.error(
-        "Error retrieving gives to this project:",
-        serverError.message,
-      );
+      console.error("Error retrieving gives to this project:", error);
+      this.errorMessage =
+        "Something went wrong retrieving gives to this project.";
    }

-    const fulfilledByUrl =
+    const givesOutUrl =
      this.apiServer +
-      "/api/v2/report/planFulfilledByPlan?planHandleId=" +
-      encodeURIComponent(projectId);
+      "/api/v2/report/givesProvidedBy?providerId=" +
+      encodeURIComponent(this.projectId);
    try {
-      const resp = await this.axios.get(fulfilledByUrl, { headers });
-      if (resp.status === 200) {
-        this.fulfilledByThis = resp.data.data;
+      const resp = await this.axios.get(givesOutUrl, { headers });
+      if (resp.status === 200 && resp.data.data) {
+        this.givesByThis = resp.data.data;
      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve plans fulfilled by this project.",
-          },
-          -1,
-        );
+        this.errorMessage = "Failed to retrieve gives by this project.";
      }
    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving plans fulfilled by this project.",
-        },
-        -1,
-      );
-      console.error(
-        "Error retrieving plans fulfilled by this project:",
-        serverError.message,
-      );
+      console.error("Error retrieving gives by this project:", error);
+      this.errorMessage = "Something went wrong retrieving gives by project.";
    }
+  }

-    const fulfillersToUrl =
-      this.apiServer +
-      "/api/v2/report/planFulfillersToPlan?planHandleId=" +
-      encodeURIComponent(projectId);
-    try {
-      const resp = await this.axios.get(fulfillersToUrl, { headers });
-      if (resp.status === 200) {
-        this.fulfillersToThis = resp.data.data;
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to retrieve plan fulfillers to this project.",
-          },
-          -1,
-        );
-      }
-    } catch (error: unknown) {
-      const serverError = error as AxiosError;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong retrieving plan fulfillers to this project.",
-        },
-        -1,
-      );
-      console.error(
-        "Error retrieving plan fulfillers to this project:",
-        serverError.message,
-      );
+  openDialog(contact) {
+    this.$refs.customDialog.open(contact);
+  }
+
+  handleDialogResult(result) {
+    if (result.action === "confirm") {
+      return new Promise((resolve) => {
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
+      });
+    } else {
+      // action was not "confirm" so do nothing
    }
  }

  /**
-   * Handle clicking on a project entry found in the list
-   * @param id of the project
-   **/
-  async onClickLoadProject(projectId: string) {
-    localStorage.setItem("projectId", projectId);
-    const route = {
-      path: "/project/" + encodeURIComponent(projectId),
-    };
-    this.$router.push(route);
-    this.LoadProject(projectId, await this.getIdentity(this.activeDid));
-  }
+   *
+   * @param giverDid may be null
+   * @param description may be an empty string
+   * @param hours may be 0
+   */
+  async recordGive(giverDid, description, hours) {
+    if (!this.activeDid) {
+      this.alertTitle = "Error";
+      this.alertMessage =
+        "You must select an identity before you can record a give.";
+      return;
+    }

-  getOpenStreetMapUrl() {
-    // Google URL is https://maps.google.com/?q=LAT,LONG
-    return (
-      "https://www.openstreetmap.org/?mlat=" +
-      this.latitude +
-      "&mlon=" +
-      this.longitude +
-      "#map=15/" +
-      this.latitude +
-      "/" +
-      this.longitude
-    );
-  }
+    if (!description && !hours) {
+      this.alertTitle = "Error";
+      this.alertMessage =
+        "You must enter a description or some number of hours.";
+      return;
+    }

-  openDialog(contact: GiverInputInfo) {
-    (this.$refs.customDialog as GiftedDialog).open(contact);
+    try {
+      const identity = await this.getIdentity(this.activeDid);
+      const result = await createAndSubmitGive(
+        this.axios,
+        this.apiServer,
+        identity,
+        giverDid,
+        this.activeDid,
+        description,
+        hours,
+        this.projectId,
+      );
+
+      if (result.status !== 201 || result.data?.error) {
+        console.log("Error with give result:", result);
+        this.alertTitle = "Error";
+        this.alertMessage =
+          result.data?.error?.message ||
+          "There was an error recording the give.";
+      } else {
+        this.alertTitle = "Success";
+        this.alertMessage = "That gift was recorded.";
+      }
+    } catch (e) {
+      console.log("Error with give caught:", e);
+      this.alertTitle = "Error";
+      this.alertMessage =
+        e.userMessage ||
+        e.response?.data?.error?.message ||
+        "There was an error recording the give.";
+    }
  }
 }
 </script>
--- a/src/views/ProjectsView.vue
+++ b/src/views/ProjectsView.vue
@@ -7,8 +7,7 @@
    </h1>

    <!-- Quick Search -->
-
-    <div id="QuickSearch" class="mb-4 flex">
+    <form id="QuickSearch" class="mb-4 flex">
      <input
        type="text"
        placeholder="Search…"
@@ -19,7 +18,7 @@
      >
        <fa icon="magnifying-glass" class="fa-fw"></fa>
      </button>
-    </div>
+    </form>

    <!-- New Project -->
    <button
@@ -39,7 +38,7 @@

    <!-- Results List -->
    <InfiniteScroll @reached-bottom="loadMoreData">
-      <ul class="border-t border-slate-300">
+      <ul>
        <li
          class="border-b border-slate-300"
          v-for="project in projects"
@@ -50,11 +49,10 @@
            class="block py-4 flex gap-4"
          >
            <div class="flex-none w-12">
-              <EntityIcon
-                :entityId="project.handleId"
-                :iconSize="48"
-                class="inline-block align-middle border border-slate-300 rounded-md"
-              ></EntityIcon>
+              <img
+                src="https://picsum.photos/200/200?random=1"
+                class="w-full rounded"
+              />
            </div>

            <div class="grow overflow-hidden">
@@ -67,42 +65,63 @@
        </li>
      </ul>
    </InfiniteScroll>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import { IIdentifier } from "@veramo/core";
-import InfiniteScroll from "@/components/InfiniteScroll.vue";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { ProjectData } from "@/libs/endorserServer";
+import InfiniteScroll from "@/components/InfiniteScroll";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
+/**
+ * Represents data about a project
+ **/
+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;
 }

@Component({
-  components: { InfiniteScroll, QuickNav, EntityIcon },
+  components: { InfiniteScroll, AlertMessage, QuickNav },
 })
 export default class ProjectsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  apiServer = "";
  projects: ProjectData[] = [];
  current: IIdentifier;
  isLoading = false;
+  alertTitle = "";
+  alertMessage = "";
+  accounts: AccountsSchema;
  numAccounts = 0;

  async beforeCreate() {
-    await accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
+    accountsDB.open();
+    this.accounts = accountsDB.accounts;
+    this.numAccounts = await this.accounts.count();
  }

  /**
@@ -122,33 +141,17 @@ export default class ProjectsView extends Vue {
      if (resp.status === 200 || !resp.data.data) {
        const plans: ProjectData[] = resp.data.data;
        for (const plan of plans) {
-          const { name, description, handleId, rowid } = plan;
+          const { name, description, handleId = plan.fullIri, rowid } = plan;
          this.projects.push({ name, description, handleId, rowid });
        }
      } else {
        console.log("Bad server response & data:", resp.status, resp.data);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: "Failed to get projects from the server. Try again later.",
-          },
-          -1,
-        );
+        throw Error("Failed to get projects from the server.");
      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.error("Got error loading projects:", error.message || error);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Got an error loading projects.",
-        },
-        -1,
-      );
+    } catch (error) {
+      console.error("Got error loading projects:", error.message);
+      this.alertTitle = "Error";
+      this.alertMessage = "Got an error loading projects:" + error.message;
    } finally {
      this.isLoading = false;
    }
@@ -189,7 +192,7 @@ export default class ProjectsView extends Vue {
    await this.dataLoader(url, token);
  }

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
    const account = await accountsDB.accounts
      .where("did")
@@ -217,15 +220,8 @@ export default class ProjectsView extends Vue {

      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,
-        );
+        this.alertTitle = "Error";
+        this.alertMessage = "You need an identity to load your projects.";
      } else {
        const identity = await this.getIdentity(activeDid);
        this.current = identity;
@@ -233,15 +229,8 @@ export default class ProjectsView extends Vue {
      }
    } catch (err) {
      console.log("Error initializing:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "Something went wrong loading your projects.",
-        },
-        -1,
-      );
+      this.alertTitle = "Error";
+      this.alertMessage = "Something went wrong loading your projects.";
    }
  }

--- a/src/views/SearchAreaView.vue
+++ b/src/views/SearchAreaView.vue
@@ -1,281 +0,0 @@
-<template>
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24">
-    <!-- Breadcrumb -->
-    <div class="mb-8">
-      <!-- Back -->
-      <div class="text-lg text-center font-light relative px-7">
-        <h1
-          class="text-lg text-center px-2 py-1 absolute -left-2 -top-1"
-          @click="$router.back()"
-        >
-          <fa icon="chevron-left" class="fa-fw"></fa>
-        </h1>
-      </div>
-
-      <!-- Heading -->
-      <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-        Area for Nearby Search
-      </h1>
-    </div>
-
-    <div class="px-2 py-4">
-      This location is only stored on your device. It is used to show you more
-      appropriate projects but is not stored on any servers.
-    </div>
-
-    <div>
-      <button v-if="!searchBox && !isNewMarkerSet" class="m-4 px-4 py-2">
-        Click to Choose a Location for Nearby Search
-      </button>
-      <button
-        v-if="isNewMarkerSet"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="storeSearchBox"
-      >
-        Store This Location for Nearby Search
-      </button>
-      <button
-        v-if="searchBox"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="forgetSearchBox"
-      >
-        Delete Stored Location
-      </button>
-      <button
-        v-if="searchBox"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="resetLatLong"
-      >
-        Reset Marker
-      </button>
-      <button
-        v-if="isNewMarkerSet"
-        class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-        @click="isNewMarkerSet = false"
-      >
-        Erase Marker
-      </button>
-      <div v-if="isNewMarkerSet">
-        Click on the pin to erase it. Click anywhere else to set a different
-        different corner.
-      </div>
-    </div>
-
-    <div style="height: 600px; width: 800px">
-      <l-map
-        ref="map"
-        :center="[localCenterLat, localCenterLong]"
-        v-model:zoom="localZoom"
-        @click="setMapPoint"
-      >
-        <l-tile-layer
-          url="https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png"
-          layer-type="base"
-          name="OpenStreetMap"
-        />
-        <l-marker
-          v-if="isNewMarkerSet"
-          :lat-lng="[localCenterLat, localCenterLong]"
-          @click="isNewMarkerSet = false"
-        />
-        <l-rectangle
-          v-if="isNewMarkerSet"
-          :bounds="[
-            [localCenterLat - localLatDiff, localCenterLong - localLongDiff],
-            [localCenterLat + localLatDiff, localCenterLong + localLongDiff],
-          ]"
-          :weight="1"
-        />
-      </l-map>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { LeafletMouseEvent } from "leaflet";
-import "leaflet/dist/leaflet.css";
-import { Component, Vue } from "vue-facing-decorator";
-import {
-  LMap,
-  LMarker,
-  LRectangle,
-  LTileLayer,
-} from "@vue-leaflet/vue-leaflet";
-
-import { db } from "@/db/index";
-import { BoundingBox, MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-
-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: {
-    LRectangle,
-    LMap,
-    LMarker,
-    LTileLayer,
-  },
-})
-export default class DiscoverView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  isChoosingSearchBox = false;
-  isNewMarkerSet = false;
-
-  // "local" vars are for the currently selected map box
-  localCenterLat = 0;
-  localCenterLong = 0;
-  localLatDiff = DEFAULT_LAT_LONG_DIFF;
-  localLongDiff = DEFAULT_LAT_LONG_DIFF;
-  localZoom = DEFAULT_ZOOM;
-
-  // searchBox reflects what is stored in the database
-  searchBox: { name: string; bbox: BoundingBox } | null = null;
-
-  async mounted() {
-    await db.open();
-    const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-    this.searchBox = settings?.searchBoxes?.[0] || null;
-    this.resetLatLong();
-  }
-
-  setMapPoint(event: LeafletMouseEvent) {
-    if (this.isNewMarkerSet) {
-      this.localLatDiff = Math.abs(event.latlng.lat - this.localCenterLat);
-      this.localLongDiff = Math.abs(event.latlng.lng - this.localCenterLong);
-    } else {
-      // marker is not set
-      this.localCenterLat = event.latlng.lat;
-      this.localCenterLong = event.latlng.lng;
-
-      let latDiff = DEFAULT_LAT_LONG_DIFF;
-      let longDiff = DEFAULT_LAT_LONG_DIFF;
-      // Guess at a size for the bounding box.
-      // This doesn't seem like the right approach but it's the only way I can find to get the screen bounds.
-      const bounds = event.target.boxZoom?._map?.getBounds();
-      if (bounds) {
-        latDiff = Math.abs(bounds._northEast.lat - bounds._southWest.lat) / 8;
-        longDiff = Math.abs(bounds._northEast.lng - bounds._southWest.lng) / 8;
-      }
-      this.localLatDiff = latDiff;
-      this.localLongDiff = longDiff;
-      this.isNewMarkerSet = true;
-    }
-  }
-
-  public resetLatLong() {
-    if (this.searchBox?.bbox) {
-      const bbox = this.searchBox.bbox;
-      this.localCenterLat = (bbox.maxLat + bbox.minLat) / 2;
-      this.localCenterLong = (bbox.eastLong + bbox.westLong) / 2;
-      this.localLatDiff = (bbox.maxLat - bbox.minLat) / 2;
-      this.localLongDiff = (bbox.eastLong - bbox.westLong) / 2;
-      this.localZoom = WORLD_ZOOM;
-      this.isNewMarkerSet = true;
-    } else {
-      this.isNewMarkerSet = false;
-    }
-  }
-
-  public async storeSearchBox() {
-    if (this.localCenterLong || this.localCenterLat) {
-      try {
-        const newSearchBox = {
-          name: "Local",
-          bbox: {
-            eastLong: this.localCenterLong + this.localLongDiff,
-            maxLat: this.localCenterLat + this.localLatDiff,
-            minLat: this.localCenterLat - this.localLatDiff,
-            westLong: this.localCenterLong - this.localLongDiff,
-          },
-        };
-        await db.open();
-        db.settings.update(MASTER_SETTINGS_KEY, {
-          searchBoxes: [newSearchBox],
-        });
-        this.searchBox = newSearchBox;
-        this.isChoosingSearchBox = false;
-
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Saved",
-            text: "That has been saved in your preferences.",
-          },
-          -1,
-        );
-      } catch (err) {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Updating Search Settings",
-            text: "Try going to a different page and then coming back.",
-          },
-          -1,
-        );
-        console.error(
-          "Telling user to retry the location search setting because:",
-          err,
-        );
-      }
-    } else {
-      this.$notify(
-        {
-          group: "alert",
-          type: "warning",
-          title: "No Location Selected",
-          text: "Select a location on the map.",
-        },
-        -1,
-      );
-    }
-  }
-
-  public async forgetSearchBox() {
-    try {
-      await db.open();
-      db.settings.update(MASTER_SETTINGS_KEY, {
-        searchBoxes: [],
-      });
-      this.searchBox = null;
-      this.localCenterLat = 0;
-      this.localCenterLong = 0;
-      this.localLatDiff = DEFAULT_LAT_LONG_DIFF;
-      this.localLongDiff = DEFAULT_LAT_LONG_DIFF;
-      this.localZoom = DEFAULT_ZOOM;
-      this.isChoosingSearchBox = false;
-      this.isNewMarkerSet = false;
-    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Updating Search Settings",
-          text: "Try going to a different page and then coming back.",
-        },
-        -1,
-      );
-      console.error(
-        "Telling user to retry the location search setting because:",
-        err,
-      );
-    }
-  }
-
-  public cancelSearchBoxSelect() {
-    this.isChoosingSearchBox = false;
-    this.localZoom = WORLD_ZOOM;
-  }
-}
-</script>
--- a/src/views/SeedBackupView.vue
+++ b/src/views/SeedBackupView.vue
@@ -20,64 +20,45 @@
    </div>

    <div v-if="activeAccount">
-      <p class="text-center mb-4">
-        <b class="text-red-600">BEWARE!</b> Anyone who has this seed phrase will
-        be able impersonate you and take over any digital holdings based on it.
-        Reveal it when you are somewhere only you can see your screen, and
-        record it somewhere only you have access.
-        <i>Don't take a screenshot or send it to any online service.</i>
+      <p>
+        BEWARE: Anyone who gets hold of this mnemonic seed phrase will be able
+        impersonate you and take over any digital holdings based on it. So only
+        reveal it when you are in a private place out of sight of other eyes,
+        and only record it in something private -- don't take a screenshot or
+        send it to any online service.
      </p>

-      <p v-if="numAccounts > 1">
-        <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 identity, this one backup is sufficient; however, if you have
-        different seeds for other identities, you will have to back them up
-        separately.
-      </p>
+      <button
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        @click="showSeedPhrase"
+      >
+        Click here when you're ready to see it.
+      </button>

-      <div class="bg-slate-100 rounded-md overflow-hidden p-4 mb-4">
-        <button
-          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-          @click="showSeedPhrase"
-        >
-          Reveal my Seed Phrase
-        </button>
-
-        <p v-if="showSeed" class="text-center text-slate-700 mt-2">
-          {{ activeAccount.mnemonic }}
-        </p>
-      </div>
+      <p v-if="showSeed">{{ activeAccount.mnemonic }}</p>
    </div>
    <div v-else>You do not have an active identity.</div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB, db } from "@/db/index";
+import { accountsDB, db } from "@/db";
 import * as R from "ramda";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import QuickNav from "@/components/QuickNav.vue";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

-interface Account {
-  mnemonic: string;
-}
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { QuickNav } })
+@Component({ components: { AlertMessage, QuickNav } })
 export default class SeedBackupView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
-  activeAccount: Account | null | undefined = null;
-  numAccounts = 0;
+  activeAccount = null;
  showSeed = false;
+  alertMessage = "";
+  alertTitle = "";

  // 'created' hook runs when the Vue instance is first created
  async created() {
@@ -88,19 +69,11 @@ export default class SeedBackupView extends Vue {

      await accountsDB.open();
      const accounts = await accountsDB.accounts.toArray();
-      this.numAccounts = accounts.length;
      this.activeAccount = R.find((acc) => acc.did === activeDid, accounts);
-    } catch (err: unknown) {
+    } catch (err) {
      console.error("Got an error loading an identity:", err);
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Loading Account",
-          text: "Got an error loading your seed data.",
-        },
-        -1,
-      );
+      this.alertTitle = "Error Loading Account";
+      this.alertMessage = "Got an error loading your seed data.";
    }
  }

--- a/src/views/StartView.vue
+++ b/src/views/StartView.vue
@@ -8,49 +8,32 @@
      Start Here
    </h1>

-    <!-- id used by puppeteer test script -->
-    <div id="start-question" class="mt-8">
+    <div class="mt-8">
      <p class="text-center text-xl mb-4 font-light">
-        Do you have an identity to import?
+        Do you already 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"
+        class="block w-full text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
      >
        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"
+        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        >Yes</a
      >
-        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 Seed Imported Previously
-      </a>
    </div>
  </section>
 </template>

 <script lang="ts">
 import { Component, Vue } from "vue-facing-decorator";
-import { accountsDB } from "@/db/index";

@Component({
  components: {},
 })
 export default class StartView extends Vue {
-  numAccounts = 0;
-
-  async mounted() {
-    await accountsDB.open();
-    this.numAccounts = await accountsDB.accounts.count();
-  }
-
  public onClickYes() {
    this.$router.push({ name: "new-identifier" });
  }
@@ -58,9 +41,5 @@ export default class StartView extends Vue {
  public onClickNo() {
    this.$router.push({ name: "import-account" });
  }
-
-  public onClickDerive() {
-    this.$router.push({ name: "import-derive" });
-  }
 }
 </script>
--- a/src/views/StatisticsView.vue
+++ b/src/views/StatisticsView.vue
@@ -34,53 +34,42 @@
    </div>
    <button class="float-right" @click="captureGraphics()">Screenshot</button>
    <div id="scene-container" class="h-screen"></div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>   
  </section>
 </template>
 <script lang="ts">
-import { SVGRenderer } from "three/examples/jsm/renderers/SVGRenderer.js";
+import { SVGRenderer } from "three/addons/renderers/SVGRenderer.js";
 import { Component, Vue } from "vue-facing-decorator";
 import { World } from "@/components/World/World.js";
-import QuickNav from "@/components/QuickNav.vue";
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

-interface RendererSVGType {
-  domElement: Element;
+interface WorldProperties {
+  startTime?: string;
+  endTime?: string;
 }

-interface Dictionary<T> {
-  [key: string]: T;
-}
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
-
-@Component({ components: { World, QuickNav } })
+@Component({ components: { AlertMessage, World, QuickNav } })
 export default class StatisticsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  world: World;
-  worldProperties: Dictionary<number> = {};
+  worldProperties: WorldProperties = {};
+  alertTitle = "";
+  alertMessage = "";

  mounted() {
    try {
      const container = document.querySelector("#scene-container");
+      console.log(container);
      const newWorld = new World(container, this);
      newWorld.start();
      this.world = newWorld;
-    } catch (err: unknown) {
-      const error = err as Error;
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Mounting Error",
-          text: error.message,
-        },
-        -1,
-      );
+    } catch (err) {
+      console.log(err);
+      this.alertTitle = "Mounting error";
+      this.alertMessage = err.message;
    }
  }

@@ -95,12 +84,12 @@ export default class StatisticsView extends Vue {
    ExportToSVG(rendererSVG, "test.svg");
  }

-  public setWorldProperty(propertyName: string, propertyValue: number) {
+  public setWorldProperty(propertyName, propertyValue) {
    this.worldProperties[propertyName] = propertyValue;
  }
 }

-function ExportToSVG(rendererSVG: RendererSVGType, filename: string) {
+function ExportToSVG(rendererSVG, filename) {
  const XMLS = new XMLSerializer();
  const svgfile = XMLS.serializeToString(rendererSVG.domElement);
  const svgData = svgfile;
--- a/src/views/TestView.vue
+++ b/src/views/TestView.vue
@@ -1,151 +0,0 @@
-<template>
-  <QuickNav selected="Profile"></QuickNav>
-  <!-- CONTENT -->
-  <section id="Content" class="p-6 pb-24">
-    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
-      Test
-    </h1>
-
-    <div class="mb-8">
-      <h2 class="text-xl font-bold mb-4">Notiwind Alert Test Suite</h2>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'toast',
-              text: 'I\'m a toast. Without a timeout, I\'m stuck.',
-            },
-            5000,
-          )
-        "
-        class="font-bold uppercase bg-slate-900 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Toast
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'info',
-              title: 'Information Alert',
-              text: 'Just wanted you to know.',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Info
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'success',
-              title: 'Success Alert',
-              text: 'Congratulations!',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-emerald-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Success
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'warning',
-              title: 'Warning Alert',
-              text: 'You might wanna look at this.',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-amber-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Warning
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'alert',
-              type: 'danger',
-              title: 'Danger Alert',
-              text: 'Something terrible has happened!',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-rose-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Danger
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'modal',
-              type: 'notification-permission',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Notif ON
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'modal',
-              type: 'notification-mute',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Notif MUTE
-      </button>
-
-      <button
-        @click="
-          this.$notify(
-            {
-              group: 'modal',
-              type: 'notification-off',
-            },
-            -1,
-          )
-        "
-        class="font-bold uppercase bg-slate-600 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Notif OFF
-      </button>
-    </div>
-  </section>
-</template>
-
-<script lang="ts">
-import { Component, Vue } from "vue-facing-decorator";
-import QuickNav from "@/components/QuickNav.vue";
-
-@Component({ components: { QuickNav } })
-export default class Help extends Vue {}
-</script>
--- a/sw_scripts/additional-scripts.js
+++ b/sw_scripts/additional-scripts.js
@@ -1,33 +0,0 @@
-const notifications = require("./safari-notifications.js");
-
-
-self.addEventListener("push", function (event) {
-  let payload;
-  if (event.data) {
-    payload = JSON.parse(event.data.text());
-  }
-
-  const title = payload ? payload.title : "Custom Title";
-  const options = {
-    body: payload ? payload.body : "Custom body text",
-    icon: payload ? payload.icon : "icon.png",
-    badge: payload ? payload.badge : "badge.png",
-  };
-
-  event.waitUntil(self.registration.showNotification(title, options));
-});
-
-
-self.addEventListener("message", function (event) {
-    const data = event.data;
-
-    const result = notifications.getNotificationCount()
-
-    switch (data.command) {
-    case "account":
-	break;
-
-    default:
-	console.log("Unknown command:", data.command);
-    }
-});
--- a/sw_scripts/safari-notifications.js
+++ b/sw_scripts/safari-notifications.js
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,47 +1,41 @@
 {
-    "compilerOptions": {
-	"allowJs": true,
-	"resolveJsonModule": true,
-	"target": "esnext",
-	"module": "esnext",
-	"strict": true,
-	"strictPropertyInitialization": false,
-	"jsx": "preserve",
-	"moduleResolution": "node",
-	"experimentalDecorators": true,
-	"skipLibCheck": true,
-	"esModuleInterop": true,
-	"allowSyntheticDefaultImports": true,
-	"forceConsistentCasingInFileNames": true,
-	"useDefineForClassFields": true,
-	"sourceMap": true,
-	"baseUrl": "./src",
-	"types": [
-	    "webpack-env"
-	],
-	"paths": {
-	    "@/components/*": ["components/*"],
-	    "@/views/*": ["views/*"],
-	    "@/db/*": ["db/*"],
-	    "@/libs/*": ["libs/*"],
-	    "@/constants/*": ["constants/*"],
-	    "@/store/*": ["store/*"],
-	},
-	"lib": [
-	    "esnext",
-	    "dom",
-	    "dom.iterable",
-	    "scripthost"
-	]
-    },
-    "include": [
-	"src/**/*.ts",
-	"src/**/*.tsx",
-	"src/**/*.vue",
-	"tests/**/*.ts",
-	"tests/**/*.tsx"
+  "compilerOptions": {
+    "target": "esnext",
+    "module": "esnext",
+    "strict": true,
+    "jsx": "preserve",
+    "moduleResolution": "node",
+    "experimentalDecorators": true,
+    "skipLibCheck": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
+    "forceConsistentCasingInFileNames": true,
+    "useDefineForClassFields": true,
+    "sourceMap": true,
+    "baseUrl": ".",
+    "types": [
+      "webpack-env"
    ],
-    "exclude": [
-	"node_modules"
+    "paths": {
+      "@/*": [
+        "src/*"
+      ]
+    },
+    "lib": [
+      "esnext",
+      "dom",
+      "dom.iterable",
+      "scripthost"
    ]
+  },
+  "include": [
+    "src/**/*.ts",
+    "src/**/*.tsx",
+    "src/**/*.vue",
+    "tests/**/*.ts",
+    "tests/**/*.tsx"
+  ],
+  "exclude": [
+    "node_modules"
+  ]
 }
--- a/vue.config.js
+++ b/vue.config.js
@@ -11,8 +11,5 @@ module.exports = defineConfig({
    iconPaths: {
      faviconSVG: "img/icons/safari-pinned-tab.svg",
    },
-    workboxOptions: {
-      importScripts: ["additional-scripts.js"],
-    },
  },
 });
--- a/web-push.md
+++ b/web-push.md
@@ -1,392 +0,0 @@
-
-# Overivew of Web Push
-
-Web Push notifications is a web browser messaging protocol defined by the W3C.
-
-Discussions of this interesting technology are clouded because of a
-terminological morass.
-
-To understand how Web Push operates, we need to observe that are three (and
-potentially four) parties involved. These are:
-
-1) The user's web browser. Let's call that BROWSER
-2) The Web Push Service Provider which is operated by the organization
-controlling the web browser's source code. Here named PROVIDER. An example of a
-PROVIDER is FCM (Firebase Cloud Messaging) which is owned by Google.
-3) The Web Application that a user is visiting from their web browser. Let's
-call this the SERVICE (short for Web Push application service)
-4) A Custom Web Push Intermediary Service, either third party or self-hosted.
-Called INTERMEDIARY here. FCM also may fit in this category if the SERVICE
-has an API key from FCM.]
-
-The workflow works like this:
-
-BROWSER visits a website which hosts a SERVICE.
-
-The SERVICE asks BROWSER for its permission to subscribe to messages coming
-from the SERVICE.
-
-The SERVICE will provide context and obtain explicit permission before prompting
-for notification permission:
-
-In order to provide this context and explicit permission, a two-step opt-in process
-first presents the user with a pre-permission dialog box that explains
-what the notifications are for and why they are useful. This may help reduce the
-possibility of users clicking "don't allow".
-
-Now, to explain what happens in Typescript, we can activate a browser's
-permission dialogue in this manner:
-
-```
-function askPermission(): Promise<NotificationPermission> {
-  return new Promise(function(resolve, reject) {
-    const permissionResult = Notification.requestPermission(function(result) {
-      resolve(result);
-    });
-
-    if (permissionResult) {
-      permissionResult.then(resolve, reject);
-    }
-  }).then(function(permissionResult) {
-    if (permissionResult !== 'granted') {
-      throw new Error("We weren't granted permission.");
-    }
-    return permissionResult;
-  });
-}
-```
-
-The Notification.permission property indicates the permission level for the
-current session and returns one of the following string values:
-
-    'granted': The user has granted permission for notifications.
-    'denied': The user has denied permission for notifications.
-    'default': The user has not made a choice yet.
-
-Once the user has granted permission, the client application registers a service
-worker using the `ServiceWorkerRegistration` API.
-
-The `ServiceWorkerRegistration` API is accessible via the browser's `navigator`
-object and the `navigator.serviceWorker` child object and ultimately directly
-accessible via the navigator.serviceWorker.register method which also creates
-the service worker or the navigator.serviceWorker.getRegistration method.
-
-Once you have a `ServiceWorkerRegistration` object, that object will provide a
-child object named `pushManager` through which subscription and management of
-subscriptions may be done.
-
-Let's go through the `register` method first:
-
-```
-navigator.serviceWorker.register('sw.js', { scope: '/' })
-  .then(function(registration) {
-    console.log('Service worker registered successfully:', registration);
-  })
-  .catch(function(error) {
-    console.log('Service worker registration failed:', error);
-  });
-```
-
-The `sw.js` file contains the logic for what a service worker should do.
-It executes in a separate thread of execution from the web page but provides a
-means of communicating between itself and the web page via messages.
-
-Note that there is a scope that can specify what network requests it may
-intercept.
-
-The Vue project already has its own service worker but it is possible to
-create multiple service worker files by registering them on different scopes.
-
-It is useful architecturally to specify a separate server worker file.
-
-In the case of web push, the path of the scope only has reference to the domain
-of the service worker and no relationship to the pathing for the web push
-server.  In order to specify more than one server workers each needs to be on
-different scope paths!
-
-Here's a version which can be used for testing locally.  Note there can be
-caching issues in your browser!  Incognito is highly recommended.
-
-sw-dev.ts
-```
-self.addEventListener('push', function(event: PushEvent) {
-  console.log('Received a push message', event);
-
-  const title = 'Push message';
-  const body = 'The message body';
-  const icon = '/images/icon-192x192.png';
-  const tag = 'simple-push-demo-notification-tag';
-
-  event.waitUntil(
-    self.registration.showNotification(title, {
-      body: body,
-      icon: icon,
-      tag: tag
-    })
-  );
-});
-```
-
-
-vue.config.js
-```
-module.exports = {
-  pwa: {
-    workboxOptions: {
-      importScripts: ['sw-dev.ts']
-    }
-  }
-}
-```
-
-Once we have the service worker registered and the ServiceWorkerRegistration is
-returned, we then have access to a `pushManager` property object.  This property
-allows us to continue with the web push work flow.
-
-In the next step, BROWSER requests a data structure from SERVICE called a VAPID
-(Voluntary Application Server Identification) which is the public key from a
-key-pair.
-
-The VAPID is a specification used to identify the application server (i.e. the
-SERVICE server) that is sending push messages through a push PROVIDER. It's an
-authentication mechanism that allows the server to demonstrate its identity to
-the push PROVIDER, by use of a public and private key pair. These keys are used
-by the SERVICE in encrypting messages being sent to the BROWSER, as well as
-being used by the BROWSER in decrypting the messages coming from the SERVICE.
-
-The VAPID (Voluntary Application Server Identification) key provides more
-security and authenticity for web push notifications in the following ways:
-
-Identifying the Application Server:
-    
-        The VAPID key is used to identify the application server that is sending
-	the push notifications. This ensures that the push notifications are
-	authentic and not sent by a malicious third party.
-	
-Encrypting the Messages:
-    
-        The VAPID key is used to sign the push notifications sent by the
-	application server, ensuring that they are not tampered with during
-	transmission. This provides an additional layer of security and
-	authenticity for the push notifications.
-
-Adding Contact Information:
-
-    The VAPID key allows a web application to add contact information to
-    the push messages sent to the browser push service. This enables the
-    push service to contact the application server in case of need or
-    provide additional debug information about the push messages.
-
-Improving Delivery Rates:
-
-    Using the VAPID key can help improve the overall performance of web push
-    notifications, specifically improving delivery rates. By streamlining the
-    delivery process, the chance of delivery errors along the way is lessened.
-
-If the BROWSER accepts and grants permission to subscribe to receiving from the
-SERVICE Web Push messages, then the BROWSER makes a subscription request to
-PROVIDER which creates and stores a special URL for that BROWSER.
-
-Here's a bit of code describing the above process:
-
-```
-// b64 is the VAPID
-b64 = 'BEl62iUYgUivxIkv69yViEuiBIa-Ib9-SkvMeAtA3LFgDzkrxZJjSgSnfckjBJuBkr3qBUYIHBQFLXYp5Nksh8U';
-const applicationServerKey = urlBase64ToUint8Array(b64);
-const options: PushSubscriptionOptions = {
-  userVisibleOnly: true,
-  applicationServerKey: applicationServerKey
-};
-
-registration.pushManager.subscribe(options)
-  .then(function(subscription) {
-    console.log('Push subscription successful:', subscription);
-  })
-  .catch(function(error) {
-    console.error('Push subscription failed:', error);
-  });
-```
-
-In this example, the `applicationServerKey` variable contains the VAPID public
-key, which is converted to a `Uint8Array` using a function such as this:
-
-```
-export function toUint8Array(base64String: string, atobFn: typeof atob): Uint8Array {
-	const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
-	const base64 = (base64String + padding).replace(/-/g, "+").replace(/_/g, "/");
-
-	const rawData = atobFn(base64);
-	const outputArray = new Uint8Array(rawData.length);
-
-	for (let i = 0; i < rawData.length; ++i) {
-		outputArray[i] = rawData.charCodeAt(i);
-	}
-	return outputArray;
-}
-```
-
-The options object is of type `PushSubscriptionOptions`, which includes the
-`userVisibleOnly` and `applicationServerKey` (ie VAPID public key) properties.
-
-    options: An object that contains the options used for creating the
-    subscription. This object itself has the following sub-properties:
-    
-      applicationServerKey: A public key your push service uses for application
-      server identification. This is normally a Uint8Array.
-    
-      userVisibleOnly: A boolean value indicating that the push messages that
-      are sent should be made visible to the user through a notification.
-      This is often set to true.
-
-The subscribe() method returns a `Promise` that resolves to a `PushSubscription`
-object containing details of the subscription, such as the endpoint URL and the
-public key.  The returned data would have a form like this:
-
-    {
-      "endpoint": "https://some.pushservice.com/some/unique/identifier",
-      "expirationTime": null,
-      "keys": {
-        "p256dh": "some_base64_encoded_string",
-        "auth": "some_other_base64_encoded_string"
-      }
-    }
-
-    endpoint: A string representing the endpoint URL for the push service. This
-    URL is essentially the push service address to which the push message would
-    be sent for this particular subscription.
-
-    expirationTime: A DOMHighResTimeStamp (which is basically a number or null)
-    representing the subscription's expiration time in milliseconds since
-    01 January, 1970 UTC. This can be null if the subscription never expires.
-
-The BROWSER will, internally, then use that URL to check for incoming messages
-by way of the service worker we described earlier. The BROWSER also sends this
-URL back to SERVICE which will use that URL to send messages to the BROWSER via
-the PROVIDER.
-
-Ultimately, the actual internal process of receiving messages varies from BROWSER
-to BROWSER. Approaches vary from long-polling HTTP connections to WebSockets. A
-lot of handwaving and voodoo magic. The bottom line is that the BROWSER itself
-manages the connection to the PROVIDER whilst the SERVICE must send messages
-via the PROVIDER so that they reach the BROWSER service worker.
-
-Just to remind us that in our service worker our code for receiving messages
-will look something like this:
-
-```
-self.addEventListener('push', function(event: PushEvent) {
-  console.log('Received a push message', event);
-
-  const title = 'Push message';
-  const body = 'The message body';
-  const icon = '/images/icon-192x192.png';
-  const tag = 'simple-push-demo-notification-tag';
-
-  event.waitUntil(
-    self.registration.showNotification(title, {
-      body: body,
-      icon: icon,
-      tag: tag
-    })
-  );
-});
-```
-
-
-Now to address the issue of receiving notification messages on mobile devices.
-It should be noted that Web Push messages are only received when BROWSER is
-open, except in the cases of Chrome and Firefox mobile BROWSERS. In iOS, the
-mobile application (in our case a PWA) must be added to the Home Screen and
-permissions must be explicitly granted that allow the application to receive
-push notifications. Further, with an iOS device the user must enable wake on
-notification to have their device light-up when it receives a notification
-(https://support.apple.com/enus/HT208081).
-
-So what about #4? - The INTERMEDIARY. Well, It is possible under very special
-circumstances to create your own Web Push PROVIDER. The only case I've found so
-far relates to making an Android Custom ROM. (An Android Custom ROM is a
-customized version of the Android Operating System.) There are open source
-IMTERMEDIARY products such as UnifiedPush (https://unifiedpush.org/) which can
-fulfill this role. If you are using iOS you are not permitted to make or use
-your own custom Web Push PROVIDER. Apple will never allow anyone to do that.
-Apple has none of its own.
-
-It is, however, possible to have a sort of proxy working between your SERVICE
-and FCM (or iOS). Services that mash up various Push notification services (like
-OneSignal) can perform in the role of such proxies.
-
-#4 -The INTERMEDIARY- doesn't appear to be anything we should be spending our
-time on.
-
-A BROWSER may also remove a subscription.   In order to remove a subscription,
-the registration record must be retrieved from the serviceWorker using
-`navigator.serviceWorker.ready`.  Within the `ready` property is the
-`pushManager` which has a `getSubscription` method. Once you have the
-subscription object, you may call the `unsubscribe` method.  `unsubscribe` is
-asynchronnous and returns a boolean true if it is successful in removing the
-subscription and false if not.
-
-
-```
-async function unsubscribeFromPush() {
-  // Check if the browser supports service workers
-  if ("serviceWorker" in navigator) {
-    // Get the registration object for the service worker
-    const registration = await navigator.serviceWorker.ready;
-
-    // Get the existing subscription
-    const subscription = await registration.pushManager.getSubscription();
-
-    if (subscription) {
-      // Unsubscribe
-      const successful = await subscription.unsubscribe();
-      if (successful) {
-        console.log("Successfully unsubscribed from push notifications.");
-        // You can also inform your server to remove this subscription
-      } else {
-        console.log("Failed to unsubscribe from push notifications.");
-      }
-    } else {
-      console.log("No subscription was found.");
-    }
-  } else {
-    console.log("Service workers are not supported by this browser.");
-  }
-}
-
-// Unsubscribe from push notifications
-unsubscribeFromPush().catch((err) => {
-  console.error("An error occurred while unsubscribing from push notifications", err);
-});
-```
-
-NOTE: We could offer an option within the app to "mute" these notifications. This wouldn't turn off the notifications at the browser level, but you could make it so that your Service Worker doesn't display them even if it receives them.
-
-
-# NOTIFICATION DIALOG WORKFLOW
-
-## ON APP FIRST-LAUNCH:
-The user is periodically presented with the notification permission dialog that asks them if they want to turn on notifications. User is given 3 choices:
-
- "Turn on Notifications": triggers the browser's own notification permission prompt.
- "Maybe Later": dismisses the dialog, to reappear at a later instance. (The next time the user launches the app? After X amount of days? A combination of both?)
- "Never": dismisses the dialog; app remembers to not automatically present the dialog again.
-
-## IF THE USER CHOOSES "NEVER":
-The dialog can still be accessed via the Notifications toggle switch in `AccountViewView` (which also tells the user if notifications are turned on or off).
-
-## TO TEMPORARILY MUTE NOTIFICATIONS:
-While notifications are turned on, the user can tap on the Mute Notifications toggle switch in `AccountViewView` (visible only when notifications are turned on) to trigger the Mute Notifications Dialog. User is given the following choices:
-
- Several "Mute for X Hour/s" buttons to temporarily mute notifications.
- "Mute until I turn it back on" button to indefinitely mute notifications.
- "Cancel" to make no changes and dismiss the dialog.
-
-## TO UNMUTE NOTIFICATIONS:
-Simply tap on the Mute Notifications toggle switch in `AccountViewView` to immediately unmute notifications. No dialog needed.
-
-## TO TURN OFF NOTIFICATIONS:
-While notifications are turned on, the user can tap on the App Notifications toggle switch in `AccountViewView` to trigger the Turn Off Notifications Dialog. User is given the following choices:
-
- "Turn off Notifications" to fully turn them off (which means the user will need to go through the dialogs agains to turn them back on).
- "Leave it On" to make no changes and dismiss the dialog.