fix syntax & unused code warnings

2023-07-10 19:19:53 -06:00
43 changed files with 7116 additions and 31704 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,13 @@
 .DS_Store
 node_modules
 /dist
-signature.bin
-*.pem
-verified.txt

 *~
 # 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/README.md
+++ b/README.md
@@ -11,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
 ```
@@ -99,9 +96,6 @@ See https://tea.xyz

 ### 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,7 +1,3 @@
-Prerequisites:
-
-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:

 Here is an example of how you can use openssl to sign a JWT with the ES256K algorithm:
--- a/openssl_signing_console.sh
+++ b/openssl_signing_console.sh
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-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')
-payload_b64=$(echo -n "$payload" | jq -c -M . | tr -d '\n')
-
-signing_input="$header_b64.$payload_b64"
-
-echo -n "$signing_input" | openssl dgst -sha256 -sign private.pem -out signature.bin
-
-# Read binary signature from file and encode it to Base64 URL-Safe format
-signature_b64=$(base64 -w 0 < signature.bin | tr -d '=' | tr '+' '-' | tr '/' '_')
-
-# Construct the JWT
-jwt="$signing_input.$signature_b64"
-
-openssl dgst -sha256 -verify public.pem -signature signature.bin -out verified.txt <(echo -n "$signing_input")
-
-
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -33,13 +33,11 @@
    "ethereum-cryptography": "^2.0.0",
    "ethereumjs-util": "^7.1.5",
    "ethr-did-resolver": "^8.0.0",
-    "jdenticon": "^3.2.0",
    "js-generate-password": "^0.1.9",
    "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.1.0",
@@ -52,16 +50,15 @@
    "vue": "^3.3.4",
    "vue-axios": "^3.5.2",
    "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.152.1",
    "@typescript-eslint/eslint-plugin": "^5.61.0",
    "@typescript-eslint/parser": "^5.61.0",
-    "@vue-leaflet/vue-leaflet": "^0.10.1",
    "@vue/cli-plugin-babel": "~5.0.8",
    "@vue/cli-plugin-eslint": "~5.0.8",
    "@vue/cli-plugin-pwa": "~5.0.8",
@@ -75,7 +72,6 @@
    "eslint-config-prettier": "^8.8.0",
    "eslint-plugin-prettier": "^5.0.0-alpha.1",
    "eslint-plugin-vue": "^9.15.1",
-    "leaflet": "^1.9.4",
    "postcss": "^8.4.24",
    "prettier": "^3.0.0",
    "tailwindcss": "^3.3.2",
--- a/project.task.yaml
+++ b/project.task.yaml
@@ -1,59 +1,50 @@

 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

- 08 Scan QR code to import into contacts assignee:matthew
-    - SEE - https://github.com/gruhn/vue-qrcode-reader
+- 08 Scan QR code to import into contacts.

- in endorser-push-server - mount folder for persistent sqlite DB outside of container
- test alerts on all pages -- or refactor to new "notify" (since AlertMessage refactoring may require a change, et. ContactQRScanShowView)
- .2 bug - on contacts view, click on "to" & "from" and nothing happens
- 40 notifications :
-  - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
+- 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

- 01 Replace Gifted/Give in ContactsView with GiftedDialog assignee:matthew
+- contacts v+ :
+  - .2 show error to user when adding a duplicate contact
+  - 01 parse input more robustly (with CSV lib and not commas)

- 01 fix the Discovery map display to not show on top of bottom icons (and any other UI tweaks on the map flow) assignee-group:ui
+- 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

- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew assignee-group:ui
+- show pop-up confirming that settings & contacts have been downloaded

- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s) assignee-group:ui
-  - SEE: https://github.com/emmanuelsw/notiwind assignee:jose assignee-group:ui
+- 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 
-    - SEE: https://github.com/konvajs/vue-konva
+  - 01 quick action - send action, maybe choose via canvas tool https://github.com/konvajs/vue-konva

- 24 Move to Vite assignee:matthew
+- .5 customize favicon
+- 04 allow user to download claims, mine + ones I can see about me from others

- .2 Edit Plan does not have icons across the bottom assignee-group:ui
- .5 include the hash of the latest commit, and maybe a version
- .5 add link to further project / people when a project pays ahead
- .5 add project ID to the URL, to make a project publicly-accessible
- .5 remove edit from project page for projects owned by others
- .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 assignee-group:ui
- .2 fix static icon to the right on project page (Matthew - I've made "Rotary" into issuer?) assignee:jose assignee-group:ui
- .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"
+- 24 Move to Vite
+
+- 40 notifications :
+  - push

 - 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
- .5 change the derivation path, and regenerate test IDs
- 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 assignee-group:ui
- .5 customize favicon assignee-group:ui
- .5 Do we want to combine first name & last name?
- .2 Show a warning if both giver and recipient are the same (but still allow?) assignee-group:ui
- 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 assignee-group:ui
-
- 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)
+- 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
@@ -62,16 +53,22 @@ tasks:
  - 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
  - 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

+- 40 notifications v+ :
+  - pull, w/ scheduled runs
+
 - linking between projects or plans :
  - show total time given to & from a project
  - terminology:
@@ -100,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/src/App.vue
+++ b/src/App.vue
@@ -1,190 +1,5 @@
 <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 turn on 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"
-                >
-                  Turn on Notifications
-                </button>
-                <div class="grid grid-cols-2 gap-2">
-                  <button
-                    @click="close(notification.id)"
-                    class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
-                  >
-                    Maybe Later
-                  </button>
-                  <button
-                    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>
-      </Notification>
-    </div>
-  </NotificationGroup>
 </template>

 <style></style>
--- 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,69 +1,59 @@
 <template>
  <div v-if="visible" class="dialog-overlay">
    <div class="dialog">
-      <h1 class="text-xl font-bold text-center mb-4">
+      <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, Emit } from "vue-facing-decorator";
-import { GiverInputInfo, GiverOutputInfo } from "@/libs/endorserServer";

@Component
 export default class GiftedDialog extends Vue {
  @Prop message = "";

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

-  open(giver: GiverInputInfo) {
+  open(giver) {
+    // giver: GiverInputInfo
    this.giver = giver;
    this.visible = true;
  }
@@ -81,7 +71,7 @@ export default class GiftedDialog extends Vue {
  }

  @Emit("dialog-result")
-  confirm(): GiverOutputInfo {
+  confirm() {
    const result = {
      action: "confirm",
      giver: this.giver,
@@ -90,14 +80,14 @@ export default class GiftedDialog extends Vue {
    };
    this.close();
    this.description = "";
-    this.giver = undefined;
+    this.giver = null;
    this.hours = "0";

    return result;
  }

  @Emit("dialog-result")
-  cancel(): GiverOutputInfo {
+  cancel() {
    const result = { action: "cancel" };
    this.close();
    return result;
@@ -116,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
@@ -4,8 +4,8 @@
 export enum AppString {
  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,
--- a/src/db/index.ts
+++ b/src/db/index.ts
@@ -28,12 +28,12 @@ type NonsensitiveTables = {
 *   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("TimeSafariAccounts") as SensitiveDexie;
+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("TimeSafari") as NonsensitiveDexie;
+export const db = new BaseDexie("KickStart") as NonsensitiveDexie;
 const NonsensitiveSchemas = Object.assign({}, ContactsSchema, SettingsSchema);

 /**
@@ -54,6 +54,7 @@ if (localStorage.getItem("secret") == null) {
  localStorage.setItem("secret", secret);
 }

+//console.log("IndexedDB Encryption Secret:", secret);
 encrypted(accountsDB, { secretKey: secret });
 accountsDB.version(1).stores(SensitiveSchemas);

--- a/src/db/tables/settings.ts
+++ b/src/db/tables/settings.ts
@@ -1,10 +1,3 @@
-export type BoundingBox = {
-  eastLong: number;
-  maxLat: number;
-  minLat: number;
-  westLong: number;
-};
-
 // a singleton
 export type Settings = {
  id: number; // there's only one entry: MASTER_SETTINGS_KEY
@@ -14,10 +7,6 @@ export type Settings = {
  firstName?: string;
  lastName?: string;
  lastViewedClaimId?: string;
-  searchBoxes?: Array<{
-    name: string;
-    bbox: BoundingBox;
-  }>;
  showContactGivesInline?: boolean;
 };

--- a/src/libs/crypto/index.ts
+++ b/src/libs/crypto/index.ts
@@ -7,8 +7,6 @@ import { HDNode } from "@ethersproject/hdnode";
 import * as didJwt from "did-jwt";
 import * as u8a from "uint8arrays";

-export const DEFAULT_ROOT_DERIVATION_PATH = "m/76798669'/0'/0'/0'";
-
 /**
 *
 *
@@ -49,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];
 };

 /**
--- a/src/libs/endorserServer.ts
+++ b/src/libs/endorserServer.ts
@@ -21,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 };
@@ -62,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 {
@@ -93,7 +63,7 @@ export interface RegisterVerifiableCredential {
  "@type": string;
  agent: { identifier: string };
  object: string;
-  participant: { identifier: string };
+  recipient: { identifier: string };
 }

 export interface InternalError {
@@ -105,22 +75,20 @@ 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
 **/
-export function didInfo(
-  did: string,
-  activeDid: string,
-  allMyDids: Array<string>,
-  contacts: Array<Contact>,
-): string {
-  const myId: string | undefined = R.find(R.equals(did), allMyDids);
+export function didInfo(did, activeDid, identifiers, contacts) {
+  const myId: IIdentifier | undefined = R.find(
+    (i) => i.did === did,
+    identifiers,
+  );
  if (myId) {
-    return "You" + (myId !== activeDid ? " (Alt ID)" : "");
+    return "You" + (myId.did !== activeDid ? " (Alt ID)" : "");
  } else {
    const contact: Contact | undefined = R.find((c) => c.did === did, contacts);
    if (contact) {
@@ -135,24 +103,8 @@ export function didInfo(
  }
 }

-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
@@ -164,115 +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 {
-    // Make a claim
-    const vcClaim: GiveVerifiableCredential = {
-      "@context": "https://schema.org",
-      "@type": "GiveAction",
-    };
-    if (toDid) {
-      vcClaim.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
-    const firstKey = identity.keys[0];
-    if (!firstKey || !firstKey.privateKeyHex) {
-      throw {
-        error: "No private key",
-        message: `Your identifier ${identity.did} is not configured correctly. Use a different identifier.`,
-      };
-    }
-
-    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);
-    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,
-    };
-
-    const response = await axios.post(url, payload, { headers });
-    return {
-      type: "success",
-      response,
-    };
-  } catch (error: unknown) {
-    let errorMessage: string;
-
-    if (error instanceof Error) {
-      // If it's a JavaScript Error object
-      errorMessage = error.message;
-    } else if (
-      typeof error === "object" &&
-      error !== null &&
-      "message" in error
-    ) {
-      // If it's an object that has a 'message' property
-      errorMessage = (error as { message: string }).message;
-    } else {
-      // Unknown error shape, default message
-      errorMessage = "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
@@ -284,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/main.ts
+++ b/src/main.ts
@@ -5,21 +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,
  faBurst,
  faCalendar,
  faChevronLeft,
-  faChevronRight,
  faCircle,
  faCircleCheck,
-  faCircleInfo,
  faCircleQuestion,
  faCircleUser,
  faClock,
@@ -35,7 +30,6 @@ import {
  faGift,
  faHand,
  faHouseChimney,
-  faLocationDot,
  faLongArrowAltLeft,
  faLongArrowAltRight,
  faMagnifyingGlass,
@@ -50,22 +44,17 @@ import {
  faSquareCaretDown,
  faSquareCaretUp,
  faTrashCan,
-  faTriangleExclamation,
  faUser,
  faUsers,
  faXmark,
 } from "@fortawesome/free-solid-svg-icons";

 library.add(
-  faArrowLeft,
-  faArrowRight,
  faBurst,
  faCalendar,
  faChevronLeft,
-  faChevronRight,
  faCircle,
  faCircleCheck,
-  faCircleInfo,
  faCircleQuestion,
  faCircleUser,
  faClock,
@@ -81,7 +70,6 @@ library.add(
  faGift,
  faHand,
  faHouseChimney,
-  faLocationDot,
  faLongArrowAltLeft,
  faLongArrowAltRight,
  faMagnifyingGlass,
@@ -96,7 +84,6 @@ library.add(
  faSquareCaretDown,
  faSquareCaretUp,
  faTrashCan,
-  faTriangleExclamation,
  faUser,
  faUsers,
  faXmark,
@@ -109,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) {
@@ -101,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",
@@ -141,14 +123,6 @@ const routes: Array<RouteRecordRaw> = [
        /* webpackChunkName: "new-identifier" */ "../views/NewIdentifierView.vue"
      ),
  },
-  {
-    path: "/identity-switcher",
-    name: "identity-switcher",
-    component: () =>
-      import(
-        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
-      ),
-  },
  {
    path: "/project",
    name: "project",
@@ -184,14 +158,6 @@ const routes: Array<RouteRecordRaw> = [
        /* webpackChunkName: "statistics" */ "../views/StatisticsView.vue"
      ),
  },
-  {
-    path: "/contact-gives",
-    name: "contact-gives",
-    component: () =>
-      import(
-        /* webpackChunkName: "contact-gives" */ "../views/ContactGiftingView.vue"
-      ),
-  },
 ];

 /** @type {*} */
@@ -200,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/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -3,23 +3,10 @@
  <!-- CONTENT -->
  <section id="Content" class="p-6 pb-24">
    <!-- Heading -->
-    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-4">
+    <h1 id="ViewHeading" class="text-4xl text-center font-light pt-4 mb-8">
      Your Identity
    </h1>

-    <div class="flex justify-between">
-      <span />
-      <span class="whitespace-nowrap">
-        <router-link
-          :to="{ name: 'contact-qr' }"
-          class="text-xs uppercase bg-slate-500 text-white px-1.5 py-1 rounded-md"
-        >
-          <fa icon="qrcode" class="fa-fw"></fa>
-        </router-link>
-      </span>
-      <span />
-    </div>
-
    <div class="flex justify-between py-2">
      <span />
      <span>
@@ -66,6 +53,14 @@
          <fa icon="copy" class="text-slate-400 fa-fw"></fa>
        </button>
        <span v-show="showDidCopy">Copied!</span>
+        <span class="whitespace-nowrap ml-4">
+          <router-link
+            :to="{ name: 'contact-qr' }"
+            class="text-xs uppercase bg-slate-500 text-white px-1.5 py-1 rounded-md ml-1"
+          >
+            <fa icon="qrcode" class="fa-fw"></fa>
+          </router-link>
+        </span>
      </div>

      <div class="text-slate-500 text-sm font-bold">Public Key (base 64)</div>
@@ -113,24 +108,10 @@

    <router-link
      :to="{ name: 'new-edit-account' }"
-      class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-2"
+      class="block text-center text-lg font-bold uppercase bg-blue-600 text-white px-2 py-3 rounded-md mb-8"
    >
      Edit Identity
    </router-link>
-    <button
-      @click="
-        this.$notify(
-          {
-            group: 'modal',
-            type: 'notification-permission',
-          },
-          -1,
-        )
-      "
-      class="block w-full text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-8"
-    >
-      Turn on Notifications
-    </button>

    <h3 class="text-sm uppercase font-semibold mb-3">Data</h3>

@@ -151,25 +132,54 @@

    <!-- QR code popup -->
    <dialog id="dlgQR" class="backdrop:bg-black/75 rounded-md">
-      <div class="text-slate-500 text-center">
-        <b>ID:</b> <code>did:peer:kl45kj41lk451kl3</code>
-      </div>
-      <img src="/img/sample-qr-code.png" class="w-full mb-3" />
+      <form method="dialog">
+        <div class="text-slate-500 text-center">
+          <b>ID:</b> <code>did:peer:kl45kj41lk451kl3</code>
+        </div>
+        <img src="/img/sample-qr-code.png" class="w-full mb-3" />

-      <button
-        value="cancel"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-      >
-        Copy to Clipboard
-      </button>
-      <button
-        value="cancel"
-        class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
-      >
-        Close
-      </button>
+        <button
+          value="cancel"
+          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
+        >
+          Copy to Clipboard
+        </button>
+        <button
+          value="cancel"
+          class="block w-full text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md"
+        >
+          Close
+        </button>
+      </form>
    </dialog>

+    <h3 class="text-sm uppercase font-semibold mb-3">Advanced</h3>
+
+    <label
+      for="toggleShowAmounts"
+      class="flex items-center cursor-pointer mb-6"
+      @click="handleChange"
+    >
+      <!-- toggle -->
+      <div class="relative">
+        <!-- input -->
+        <input
+          type="checkbox"
+          v-model="showContactGives"
+          name="showContactGives"
+          class="sr-only"
+        />
+        <!-- line -->
+        <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
+        <!-- dot -->
+        <div
+          class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
+        ></div>
+      </div>
+      <!-- label -->
+      <div class="ml-2">Show amounts given with contacts</div>
+    </label>
+
    <div class="flex py-2">
      <button class="text-center text-md text-blue-500" @click="checkLimits()">
        Check Limits
@@ -197,123 +207,99 @@
      </div>
    </div>

-    <h3
-      class="text-sm uppercase font-semibold mb-3"
-      @click="showAdvanced = !showAdvanced"
-    >
-      Advanced
-    </h3>
-    <div v-if="showAdvanced">
-      <label
-        for="toggleShowAmounts"
-        class="flex items-center cursor-pointer mb-6"
-        @click="handleChange"
+    <div class="flex py-2">
+      Claim Server
+      <input
+        type="text"
+        class="block w-full rounded border border-slate-400 px-3 py-2"
+        v-model="apiServerInput"
+      />
+      <button
+        v-if="apiServerInput != apiServer"
+        class="px-4 rounded bg-red-500 border border-slate-400"
+        @click="onClickSaveApiServer()"
      >
-        <!-- toggle -->
-        <div class="relative">
-          <!-- input -->
-          <input
-            type="checkbox"
-            v-model="showContactGives"
-            name="showContactGives"
-            class="sr-only"
-          />
-          <!-- line -->
-          <div class="block bg-slate-500 w-14 h-8 rounded-full"></div>
-          <!-- dot -->
-          <div
-            class="dot absolute left-1 top-1 bg-slate-400 w-6 h-6 rounded-full transition"
-          ></div>
-        </div>
-        <!-- label -->
-        <div class="ml-2">Show amounts given with contacts</div>
-      </label>
-
-      <div class="flex py-2">
-        <router-link
-          :to="{ name: 'identity-switcher' }"
-          class="block text-center text-md uppercase bg-slate-500 text-white px-1.5 py-2 rounded-md mb-2"
-        >
-          Switch Identity / No Identity
-        </router-link>
-      </div>
-
-      <div class="flex py-2">
-        Claim Server
-        <input
-          type="text"
-          class="block w-full rounded border border-slate-400 px-3 py-2"
-          v-model="apiServerInput"
-        />
-        <button
-          v-if="apiServerInput != apiServer"
-          class="px-4 rounded bg-red-500 border border-slate-400"
-          @click="onClickSaveApiServer()"
-        >
-          <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
-        </button>
-        <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="setApiServerInput(Constants.PROD_ENDORSER_API_SERVER)"
-        >
-          Use Prod
-        </button>
-        <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="setApiServerInput(Constants.TEST_ENDORSER_API_SERVER)"
-        >
-          Use Test
-        </button>
-        <button
-          class="px-4 rounded bg-slate-200 border border-slate-400"
-          @click="setApiServerInput(Constants.LOCAL_ENDORSER_API_SERVER)"
-        >
-          Use Local
-        </button>
-      </div>
-
-      <div>
-        <button class="text-blue-500">
-          <router-link
-            :to="{ name: 'statistics' }"
-            class="block text-center py-3"
-          >
-            See Achievements & Statistics
-          </router-link>
-        </button>
-      </div>
+        <fa icon="floppy-disk" class="fa-fw" color="white"></fa>
+      </button>
+      <button
+        class="px-4 rounded bg-slate-200 border border-slate-400"
+        @click="setApiServerInput(Constants.PROD_ENDORSER_API_SERVER)"
+      >
+        Use Prod
+      </button>
+      <button
+        class="px-4 rounded bg-slate-200 border border-slate-400"
+        @click="setApiServerInput(Constants.TEST_ENDORSER_API_SERVER)"
+      >
+        Use Test
+      </button>
+      <button
+        class="px-4 rounded bg-slate-200 border border-slate-400"
+        @click="setApiServerInput(Constants.LOCAL_ENDORSER_API_SERVER)"
+      >
+        Use Local
+      </button>
    </div>
+
+    <div v-if="numAccounts > 0" class="flex py-2">
+      Switch Identifier
+      <span>
+        <button class="text-blue-500 px-2" @click="switchAccount(0)">
+          None
+        </button>
+      </span>
+      <span v-for="accountNum in numAccounts" :key="accountNum">
+        <button class="text-blue-500 px-2" @click="switchAccount(accountNum)">
+          #{{ accountNum }}
+        </button>
+      </span>
+    </div>
+
+    <div>
+      <button class="text-blue-500">
+        <router-link
+          :to="{ name: 'statistics' }"
+          class="block text-center py-3"
+        >
+          See Achievements & Statistics
+        </router-link>
+      </button>
+    </div>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

 <script lang="ts">
-import { AxiosError } from "axios/index";
 import "dexie-export-import";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";

 import { AppString } from "@/constants/app";
-import { db, accountsDB } from "@/db/index";
+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 QuickNav from "@/components/QuickNav.vue";
-import { IIdentifier } from "@veramo/core";
-import { ErrorResponse, RateLimits } from "@/libs/endorserServer";
+import { AxiosError } from "axios/index";
+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;
+interface RateLimits {
+  doneClaimsThisWeek: string;
+  doneRegistrationsThisMonth: string;
+  maxClaimsPerWeek: string;
+  maxRegistrationsPerMonth: string;
+  nextMonthBeginDateTime: string;
+  nextWeekBeginDateTime: string;
 }

-@Component({ components: { QuickNav } })
+@Component({ components: { AlertMessage, QuickNav } })
 export default class AccountViewView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  Constants = AppString;

  activeDid = "";
@@ -329,27 +315,30 @@ export default class AccountViewView extends Vue {
  limitsMessage = "";
  loadingLimits = true; // might as well now that we do it on mount, to avoid flashing the registration message
  showContactGives = false;
+  private accounts: AccountsSchema;

  showDidCopy = false;
  showDerCopy = false;
  showB64Copy = false;
  showPubCopy = false;

-  showAdvanced = false;
-  alertMessage = "";
-  alertTitle = "";
-
-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
    const account = await accountsDB.accounts
      .where("did")
      .equals(activeDid)
      .first();
    const identity = JSON.parse(account?.identity || "null");
+
+    if (!identity) {
+      throw new Error(
+        "Attempted to load Give records with no identity available.",
+      );
+    }
    return identity;
  }

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

  // call fn, copy text to the clipboard, then redo fn after 2 seconds
-  doCopyTwoSecRedo(text: string, fn: () => void) {
+  doCopyTwoSecRedo(text, fn) {
    fn();
    useClipboard()
      .copy(text)
@@ -376,8 +365,9 @@ export default class AccountViewView extends Vue {
  }

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

  async created() {
@@ -399,20 +389,15 @@ export default class AccountViewView extends Vue {

      const identity = await this.getIdentity(this.activeDid);

-      if (identity) {
-        this.publicHex = identity.keys[0].publicKeyHex;
-        this.publicBase64 = Buffer.from(this.publicHex, "hex").toString(
-          "base64",
-        );
-        this.derivationPath = identity.keys[0].meta.derivationPath;
+      this.publicHex = identity.keys[0].publicKeyHex;
+      this.publicBase64 = Buffer.from(this.publicHex, "hex").toString("base64");
+      this.derivationPath = identity.keys[0].meta.derivationPath;

-        db.settings.update(MASTER_SETTINGS_KEY, {
-          activeDid: identity.did,
-        });
-        this.checkLimitsFor(identity);
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (err: any) {
+      db.settings.update(MASTER_SETTINGS_KEY, {
+        activeDid: identity.did,
+      });
+      this.checkLimits();
+    } catch (err) {
      if (
        err.message ===
        "Attempted to load account records with no identity available."
@@ -420,19 +405,13 @@ export default class AccountViewView extends Vue {
        this.limitsMessage = "No identity.";
        this.loadingLimits = false;
      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error Creating Account",
-            text: "Clear your cache and start over (after data backup).",
-          },
-          -1,
-        );
+        this.alertMessage =
+          "Clear your cache and start over (after data backup).";
        console.error(
          "Telling user to clear cache at page create because:",
          err,
        );
+        this.alertTitle = "Error Creating Account";
      }
    }
  }
@@ -444,19 +423,13 @@ export default class AccountViewView extends Vue {
        showContactGivesInline: this.showContactGives,
      });
    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error Updating Contact Setting",
-          text: "Clear your cache and start over (after data backup).",
-        },
-        -1,
-      );
+      this.alertMessage =
+        "Clear your cache and start over (after data backup).";
      console.error(
        "Telling user to clear cache after contact setting update because:",
        err,
      );
+      this.alertTitle = "Error Updating Contact Setting";
    }
  }

@@ -472,42 +445,22 @@ export default class AccountViewView extends Vue {

      URL.revokeObjectURL(url);

-      this.$notify(
-        {
-          group: "alert",
-          type: "toast",
-          title: "Download Started",
-          text: "See your downloads directory for the backup.",
-        },
-        5000,
-      );
+      this.alertTitle = "Download Started";
+      this.alertMessage = "See your downloads directory for the backup.";
    } catch (error) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Export Error",
-          text: "See console logs for more info.",
-        },
-        -1,
-      );
+      this.alertTitle = "Export Error";
+      this.alertMessage = "See console logs for more info.";
      console.error("Export Error:", error);
    }
  }

  async checkLimits() {
-    const identity = await this.getIdentity(this.activeDid);
-    if (identity) {
-      this.checkLimitsFor(identity);
-    }
-  }
-
-  async checkLimitsFor(identity: IIdentifier) {
    this.loadingLimits = true;
    this.limitsMessage = "";

    try {
      const url = this.apiServer + "/api/report/rateLimits";
+      const identity = await this.getIdentity(this.activeDid);
      const headers = await this.getHeaders(identity);

      const resp = await this.axios.get(url, { headers });
@@ -515,8 +468,7 @@ export default class AccountViewView extends Vue {
      if (resp.status === 200) {
        this.limits = resp.data;
      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
+    } catch (error: unknown) {
      if (
        error.message ===
        "Attempted to load Give records with no identity available."
@@ -526,9 +478,9 @@ export default class AccountViewView extends Vue {
      } else {
        const serverError = error as AxiosError;
        console.error("Bad response retrieving limits: ", serverError);
-
-        const data = (serverError.response &&
-          serverError.response.data) as ErrorResponse;
+        // Anybody know how to access items inside "response.data" without this?
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        const data: any = serverError.response?.data;
        this.limitsMessage = data?.error?.message || "Bad server response.";
      }
    }
@@ -579,8 +531,12 @@ export default class AccountViewView extends Vue {
    this.apiServer = this.apiServerInput;
  }

-  setApiServerInput(value: string) {
+  setApiServerInput(value) {
    this.apiServerInput = value;
  }
+
+  // This same popup code is in many files.
+  alertMessage = "";
+  alertTitle = "";
 }
 </script>
--- 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,95 +1,118 @@
 <template>
-  <QuickNav selected="Contacts"></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">
-        <!-- 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>
-    </div>
+      </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>

+  <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>
-    <div class="flex justify-around">
-      <span />
-      <span class="justify-around">(Only 50 most recent)</span>
-      <span />
-    </div>

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

@@ -97,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";
@@ -109,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")
@@ -150,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",
@@ -172,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;
@@ -208,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 =
@@ -225,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);
@@ -235,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(
@@ -253,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;
    }
  }

@@ -314,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;
        }
@@ -330,29 +330,15 @@ 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>
--- a/src/views/ContactGiftingView.vue
+++ b/src/views/ContactGiftingView.vue
@@ -1,295 +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>
-
-    <!-- Quick Search -->
-
-    <!-- Initial Loading Animation -->
-
-    <!-- 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"
-      @dialog-result="handleDialogResult"
-      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 { AccountsSchema } from "@/db/tables/accounts";
-import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
-import { accessToken } from "@/libs/crypto";
-import {
-  createAndSubmitGive,
-  CreateAndSubmitGiveResult,
-  ErrorResult,
-  GiverInputInfo,
-  GiverOutputInfo,
-} 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();
-    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);
-      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);
-  }
-
-  handleDialogResult(result: GiverOutputInfo) {
-    if (result.action === "confirm") {
-      return new Promise((resolve) => {
-        this.recordGive(
-          result.giver?.did,
-          result.description,
-          result.hours,
-        ).then(() => {
-          resolve(null);
-        });
-      });
-    } 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?: 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,
-      );
-
-      if (this.isGiveCreationError(result)) {
-        const errorMessage = this.getGiveCreationErrorMessage(result);
-        console.log("Error with give result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error recording the give.",
-          },
-          -1,
-        );
-      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "That gift was recorded.",
-          },
-          -1,
-        );
-      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
-      console.log("Error with give 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
-
-  isGiveCreationError(result: CreateAndSubmitGiveResult) {
-    return result.type == "error";
-  }
-
-  getGiveCreationErrorMessage(result: CreateAndSubmitGiveResult) {
-    return (result as ErrorResult).error?.userMessage;
-  }
-}
-</script>
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -17,50 +17,43 @@
      :dotsOptions="{ type: 'square' }"
      class="flex justify-center"
    />
+    <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 { 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 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: {
    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) {
@@ -71,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);
@@ -81,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;
@@ -116,5 +110,9 @@ export default class ContactQRScanShow extends Vue {
      this.qrValue = viewPrefix + vcJwt;
    }
  }
+
+  // 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
@@ -66,27 +66,18 @@
              : "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)" }}
          </h2>
          <div class="text-sm truncate">{{ contact.did }}</div>
@@ -94,87 +85,70 @@
            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
@@ -185,18 +159,28 @@
                        : (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>
@@ -204,6 +188,10 @@
      </li>
    </ul>
    <p v-else>This identity has no contacts.</p>
+    <AlertMessage
+      :alertTitle="alertTitle"
+      :alertMessage="alertMessage"
+    ></AlertMessage>
  </section>
 </template>

@@ -212,36 +200,26 @@ import { AxiosError } from "axios";
 import * as didJwt from "did-jwt";
 import * as R from "ramda";
 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 } from "@/db/tables/settings";
 import { accessToken, 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 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: { QuickNav, EntityIcon },
+  components: { AlertMessage, QuickNav },
 })
 export default class ContactsView extends Vue {
-  $notify!: (notification: Notification, timeout?: number) => void;
-
  activeDid = "";
  apiServer = "";
  contacts: Array<Contact> = [];
@@ -263,6 +241,8 @@ export default class ContactsView extends Vue {
  showGiveNumbers = false;
  showGiveTotals = true;
  showGiveConfirmed = true;
+  alertTitle = "";
+  alertMessage = "";

  async created() {
    await db.open();
@@ -281,7 +261,7 @@ export default class ContactsView extends Vue {
    );
  }

-  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);
@@ -295,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",
@@ -304,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);

@@ -312,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;
            }
          }
        }
@@ -342,31 +315,27 @@ 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 " +
-              (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 }),
@@ -381,7 +350,6 @@ export default class ContactsView extends Vue {
        givenByMeDescriptions,
        givenByMeConfirmed,
        givenByMeUnconfirmed,
-        true,
      );
      this.givenByMeDescriptions = givenByMeDescriptions;
      this.givenByMeConfirmed = givenByMeConfirmed;
@@ -395,21 +363,13 @@ 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: "Error With Server",
-          text: error as string,
-        },
-        -1,
-      );
+      this.alertTitle = "Error With Server";
+      this.alertMessage = error as string;
    }
  }

@@ -461,9 +421,6 @@ 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"
-            : "") +
          "?",
      )
    ) {
@@ -500,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.";
@@ -545,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: "Error With Server",
-              text: userMessage,
-            },
-            -1,
-          );
+          this.alertTitle = "Error With Server";
+          this.alertMessage = userMessage;
        }
      }
    }
@@ -574,39 +515,17 @@ export default class ContactsView extends Vue {
        contact.seesMe = visibility;
        db.contacts.update(contact.did, { seesMe: visibility });
      } else {
+        this.alertTitle = "Error With Server";
        console.error("Bad response setting visibility: ", resp.data);
        if (resp.data.error?.message) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error With Server",
-              text: resp.data.error?.message,
-            },
-            -1,
-          );
+          this.alertMessage = resp.data.error?.message;
        } else {
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error With Server",
-              text: "Bad server response of " + resp.status,
-            },
-            -1,
-          );
+          this.alertMessage = "Bad server response of " + resp.status;
        }
      }
    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error With Server",
-          text: err as string,
-        },
-        -1,
-      );
+      this.alertTitle = "Error With Server";
+      this.alertMessage = err as string;
    }
  }

@@ -615,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 });
@@ -625,52 +542,23 @@ export default class ContactsView extends Vue {
        contact.seesMe = visibility;
        db.contacts.update(contact.did, { seesMe: visibility });

-        this.$notify(
-          {
-            group: "alert",
-            type: "toast",
-            title: "Refreshed",
-            text:
-              this.nameForContact(contact, true) +
-              " can " +
-              (visibility ? "" : "not ") +
-              "see your activity.",
-          },
-          5000,
-        );
+        this.alertTitle = "Refreshed";
+        this.alertMessage =
+          this.nameForContact(contact, true) +
+          " can " +
+          (visibility ? "" : "not ") +
+          "see your activity.";
      } else {
+        this.alertTitle = "Error With Server";
        if (resp.data.error?.message) {
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error With Server",
-              text: resp.data.error?.message,
-            },
-            -1,
-          );
+          this.alertMessage = resp.data.error?.message;
        } else {
-          this.$notify(
-            {
-              group: "alert",
-              type: "danger",
-              title: "Error With Server",
-              text: "Bad server response of " + resp.status,
-            },
-            -1,
-          );
+          this.alertMessage = "Bad server response of " + resp.status;
        }
      }
    } catch (err) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error With Server",
-          text: err as string,
-        },
-        -1,
-      );
+      this.alertTitle = "Error With Server";
+      this.alertMessage = err as string;
    }
  }

@@ -694,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?",
        )
      ) {
@@ -712,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;
@@ -763,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 +
            "?",
@@ -825,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);
@@ -863,15 +720,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: "Error With Server",
-            text: userMessage,
-          },
-          -1,
-        );
+        this.alertTitle = "Error With Server";
+        this.alertMessage = userMessage;
      }
    }
  }
--- 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,249 +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 v-if="!isChoosingSearchBox">
-        <button
-          class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-          @click="isChoosingSearchBox = true"
-        >
-          Select a {{ searchBox ? "Different" : "" }} Location for Nearby Search
-        </button>
-      </div>
-      <div v-else>
-        <button v-if="!searchBox && !isNewMarkerSet" class="m-4 px-4 py-2">
-          Choose Location Below 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="isNewMarkerSet"
-          class="m-4 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-          @click="resetLatLong"
-        >
-          Reset Marker
-        </button>
-        <button
-          class="ml-2 px-4 py-2 rounded-md bg-blue-200 text-blue-500"
-          @click="cancelSearchBoxSelect"
-        >
-          Cancel
-        </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>

-    <div
-      v-if="isLocalActive && isChoosingSearchBox"
-      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>
+      <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 { 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 { 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";
-
-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;
-}
+import AlertMessage from "@/components/AlertMessage";
+import QuickNav from "@/components/QuickNav";

@Component({
-  components: {
-    LRectangle,
-    QuickNav,
-    InfiniteScroll,
-    EntityIcon,
-    LMap,
-    LMarker,
-    LTileLayer,
-  },
+  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;
-  isNewMarkerSet = false;
-  localCenterLat = 0;
-  localCenterLong = 0;
-  localLatDiff = DEFAULT_LAT_LONG_DIFF;
-  localLongDiff = DEFAULT_LAT_LONG_DIFF;
-  localCount = 0;
-  localZoom = DEFAULT_ZOOM;
-  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.resetLatLong();
-
-    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();
@@ -293,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(),
@@ -312,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,
        {
@@ -386,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";
    }
  }

@@ -461,159 +273,5 @@ export default class DiscoverView extends Vue {
    };
    this.$router.push(route);
  }
-
-  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.searchLocal();
-      } 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;
-      this.searchLocal();
-    } 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;
-  }
-
-  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
@@ -128,14 +128,6 @@
        key.
      </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">
        I know there is a record from someone, so why can't I see that info?
      </h2>
@@ -154,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
@@ -181,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
@@ -7,158 +7,22 @@
    </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. Don\'t mind me.',
-            },
-            5000,
-          )
-        "
-        class="font-bold uppercase bg-slate-400 text-white px-3 py-2 rounded-md mr-2"
-      >
-        Toast (self-dismiss)
-      </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"
-      >
-        Notification Permission
-      </button>
-    </div>
-
-    <div class="mb-8">
-      <h2 class="text-xl font-bold">Quick Action</h2>
-      <p class="mb-4">Record a gift from a contact:</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
-          </h3>
-        </li>
-        <li
+      <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"
        >
-          <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.)
+          {{ 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>

@@ -169,84 +33,80 @@
    >
    </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 { db, accountsDB } from "@/db";
+import { AccountsSchema } from "@/db/tables/accounts";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
-import {
-  createAndSubmitGive,
-  didInfo,
-  GiverInputInfo,
-  GiverOutputInfo,
-  GiveServerRecord,
-} from "@/libs/endorserServer";
+import { createAndSubmitGive, didInfo } from "@/libs/endorserServer";
+import { Account } from "@/db/tables/accounts";
 import { Contact } from "@/db/tables/contacts";
-import QuickNav from "@/components/QuickNav.vue";
-import EntityIcon from "@/components/EntityIcon.vue";
-import { IIdentifier } from "@veramo/core";
-
-interface Notification {
-  group: string;
-  type: string;
-  title: string;
-  text: string;
-}
+import 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;
+  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")
@@ -262,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",
@@ -274,9 +134,7 @@ 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);
      this.apiServer = settings?.apiServer || "";
@@ -284,26 +142,16 @@ export default class HomeView extends Vue {
      this.allContacts = await db.contacts.toArray();
      this.feedLastViewedId = settings?.lastViewedClaimId;
      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();
@@ -326,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);
@@ -347,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,
@@ -384,60 +226,55 @@ export default class HomeView extends Vue {
    }
  }

-  giveDescription(giveRecord: GiveServerRecord) {
-    // 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,
    );
    const gaveAmount = claim.object?.amountOfThisGood
      ? this.displayAmount(claim.object.unitCode, claim.object.amountOfThisGood)
      : 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 " + 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: GiverOutputInfo) {
+  handleDialogResult(result) {
    if (result.action === "confirm") {
      return new Promise((resolve) => {
-        this.recordGive(
-          result.giver?.did,
-          result.description,
-          result.hours,
-        ).then(() => {
-          resolve(null);
-        });
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
      });
    } else {
      // action was "cancel" so do nothing
@@ -450,33 +287,19 @@ export default class HomeView extends Vue {
   * @param description may be an empty string
   * @param hours may be 0
   */
-  public async recordGive(
-    giverDid?: string,
-    description?: string,
-    hours?: number,
-  ) {
+  public async recordGive(giverDid, description, hours) {
    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identity before you can record a give.",
-        },
-        -1,
+      this.setAlert(
+        "Error",
+        "You must select an identity before you can record a give.",
      );
      return;
    }

    if (!description && !hours) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must enter a description or some number of hours.",
-        },
-        -1,
+      this.setAlert(
+        "Error",
+        "You must enter a description or some number of hours.",
      );
      return;
    }
@@ -493,58 +316,42 @@ export default class HomeView extends Vue {
        hours,
      );

-      if (this.isGiveCreationError(result)) {
-        const errorMessage = this.getGiveCreationErrorMessage(result);
+      if (isGiveCreationError(result)) {
+        const errorMessage = getGiveCreationErrorMessage(result);
        console.log("Error with give result:", result);
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: errorMessage || "There was an error recording the give.",
-          },
-          -1,
+        this.setAlert(
+          "Error",
+          errorMessage || "There was an error recording the give.",
        );
      } else {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "That gift was recorded.",
-          },
-          -1,
-        );
+        this.setAlert("Success", "That gift was recorded.");
      }
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (error: any) {
+    } catch (error) {
      console.log("Error with give 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,
+      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

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  isGiveCreationError(result: any) {
+  isGiveCreationError(result) {
    return result.status !== 201 || result.data?.error;
  }

-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  getGiveCreationErrorMessage(result: any) {
+  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,168 +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">
-          {{ firstName }} {{ lastName }}
-        </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 -->
-    <router-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 } 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 firstName = "";
-  public lastName = "";
-  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 || "null");
-    return identity;
-  }
-
-  async created() {
-    try {
-      await db.open();
-      const settings = await db.settings.get(MASTER_SETTINGS_KEY);
-      this.activeDid = settings?.activeDid || "";
-      this.apiServer = settings?.apiServer || "";
-      this.apiServerInput = settings?.apiServer || "";
-      this.firstName = settings?.firstName || "No";
-      this.lastName = settings?.lastName || "Name";
-      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();
-    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
@@ -24,24 +24,6 @@
      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()"
@@ -62,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();
@@ -90,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
@@ -13,43 +13,44 @@
        [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="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"
-    />
-
-    <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 { db } from "@/db";
 import { MASTER_SETTINGS_KEY } from "@/db/tables/settings";

@Component({
--- 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
@@ -39,40 +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">
-      <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"
@@ -97,53 +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 { 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 },
+  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")
@@ -159,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",
@@ -218,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,
@@ -228,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: {
@@ -270,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,
@@ -289,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;
@@ -349,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 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 AccountViewView 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,180 +66,144 @@
    </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
-          </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>
-
-        <ul 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 class="bg-slate-100 px-4 py-3 rounded-md">
-        <h3 class="text-sm uppercase font-semibold mb-3">
-          &hellip;and from this Project
-        </h3>
-
-        <ul class="text-sm border-t border-slate-300">
-          <li
-            v-for="give in givesByThis"
-            :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>
+        <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"
    >
    </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 } from "@/db/tables/settings";
 import { accessToken } from "@/libs/crypto";
 import {
  createAndSubmitGive,
  didInfo,
-  GiverInputInfo,
-  GiverOutputInfo,
  GiveServerRecord,
-  ResultWithType,
 } from "@/libs/endorserServer";
-import QuickNav from "@/components/QuickNav.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: { 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;
  givesToThis: Array<GiveServerRecord> = [];
  givesByThis: Array<GiveServerRecord> = [];
-  latitude = 0;
-  longitude = 0;
  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);
@@ -262,16 +211,14 @@ export default class ProjectViewView extends Vue {
    this.apiServer = settings?.apiServer || "";
    this.allContacts = await db.contacts.toArray();

-    await accountsDB.open();
-    const accounts = accountsDB.accounts;
-    const accountsArr = await accounts?.toArray();
-    this.allMyDids = accountsArr.map((acc) => acc.did);
-    const account = accountsArr?.find((acc) => acc.did === this.activeDid);
+    this.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");
    this.LoadProject(identity);
  }

-  public async getIdentity(activeDid: string) {
+  public async getIdentity(activeDid) {
    await accountsDB.open();
    const account = await accountsDB.accounts
      .where("did")
@@ -287,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",
@@ -305,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() {
@@ -327,7 +269,7 @@ export default class ProjectViewView extends Vue {
      this.apiServer +
      "/api/claim/byHandle/" +
      encodeURIComponent(this.projectId);
-    const headers: RawAxiosRequestHeaders = {
+    const headers = {
      "Content-Type": "application/json",
    };
    if (identity) {
@@ -338,53 +280,30 @@ 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);
      }
    }

@@ -397,31 +316,12 @@ export default class ProjectViewView extends Vue {
      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 givesOutUrl =
@@ -433,63 +333,23 @@ export default class ProjectViewView extends Vue {
      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 gives 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 gives by project.",
-        },
-        -1,
-      );
-      console.error(
-        "Error retrieving gives by this project:",
-        serverError.message,
-      );
+      console.error("Error retrieving gives by this project:", error);
+      this.errorMessage = "Something went wrong retrieving gives by project.";
    }
  }

-  openDialog(contact: GiverInputInfo) {
-    const dialog: GiftedDialog = this.$refs.customDialog as GiftedDialog;
-    dialog.open(contact);
+  openDialog(contact) {
+    this.$refs.customDialog.open(contact);
  }

-  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
-    );
-  }
-
-  handleDialogResult(result: GiverOutputInfo) {
+  handleDialogResult(result) {
    if (result.action === "confirm") {
      return new Promise((resolve) => {
-        this.recordGive(
-          result.giver?.did,
-          result.description,
-          result.hours,
-        ).then(() => {
-          resolve(null);
-        });
+        this.recordGive(result.contact?.did, result.description, result.hours);
+        resolve();
      });
    } else {
      // action was not "confirm" so do nothing
@@ -502,31 +362,22 @@ export default class ProjectViewView extends Vue {
   * @param description may be an empty string
   * @param hours may be 0
   */
-  async recordGive(giverDid?: string, description?: string, hours?: number) {
+  async recordGive(giverDid, description, hours) {
    if (!this.activeDid) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must select an identity before you can record a give.",
-        },
-        -1,
-      );
+      this.alertTitle = "Error";
+      this.alertMessage =
+        "You must select an identity before you can record a give.";
      return;
    }

    if (!description && !hours) {
-      this.$notify(
-        {
-          group: "alert",
-          type: "danger",
-          title: "Error",
-          text: "You must enter a description or some number of hours.",
-        },
-        -1,
-      );
-    } else {
+      this.alertTitle = "Error";
+      this.alertMessage =
+        "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,
@@ -538,37 +389,24 @@ export default class ProjectViewView extends Vue {
        hours,
        this.projectId,
      );
-      if (result.type == "success") {
-        this.$notify(
-          {
-            group: "alert",
-            type: "success",
-            title: "Success",
-            text: "That gift was recorded.",
-          },
-          -1,
-        );
+
+      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 {
-        console.log("Error with give creation:", result);
-        if (result.type != "error") {
-          console.log(
-            "... and it has an unexpected result type of",
-            (result as ResultWithType).type,
-          );
-        }
-        const message =
-          result?.error?.userMessage ||
-          "There was an error recording the Give.";
-        this.$notify(
-          {
-            group: "alert",
-            type: "danger",
-            title: "Error",
-            text: message,
-          },
-          -1,
-        );
+        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.";
    }
  }
 }
--- 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,44 +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();
  }

  /**
@@ -124,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;
    }
@@ -191,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")
@@ -219,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;
@@ -235,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/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
@@ -10,46 +10,30 @@

    <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" });
  }
@@ -57,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/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/web-push.md
+++ b/web-push.md
@@ -1,360 +0,0 @@
-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 explict permission a two-step opt-in process
-where the user is first presented 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 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.