Refactored last viewed notification code. Appears to work now.

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

.gitignore

@@ -4,6 +4,7 @@ node_modules
 signature.bin
 *.pem
 verified.txt
+myenv
 
 *~
 # local env files

package.json

@@ -9,59 +9,62 @@
   },
   "dependencies": {
     "@ethersproject/hdnode": "^5.7.0",
-    "@fortawesome/fontawesome-svg-core": "^6.4.0",
-    "@fortawesome/free-solid-svg-icons": "^6.4.0",
+    "@fortawesome/fontawesome-svg-core": "^6.4.2",
+    "@fortawesome/free-solid-svg-icons": "^6.4.2",
     "@fortawesome/vue-fontawesome": "^3.0.3",
+    "@lionello/secp256k1-js": "^1.1.0",
     "@pvermeer/dexie-encrypted-addon": "^3.0.0",
     "@tweenjs/tween.js": "^21.0.0",
-    "@veramo/core": "^5.2.0",
-    "@veramo/credential-w3c": "^5.2.0",
-    "@veramo/data-store": "^5.2.0",
-    "@veramo/did-manager": "^5.1.2",
-    "@veramo/did-provider-ethr": "^5.1.2",
-    "@veramo/did-resolver": "^5.2.0",
-    "@veramo/key-manager": "^5.1.2",
-    "@vueuse/core": "^10.2.1",
+    "@veramo/core": "^5.4.1",
+    "@veramo/credential-w3c": "^5.4.1",
+    "@veramo/data-store": "^5.4.1",
+    "@veramo/did-manager": "^5.4.1",
+    "@veramo/did-provider-ethr": "^5.4.1",
+    "@veramo/did-resolver": "^5.4.1",
+    "@veramo/key-manager": "^5.4.1",
+    "@vueuse/core": "^10.4.1",
     "@zxing/text-encoding": "^0.9.0",
-    "axios": "^1.4.0",
+    "axios": "^1.5.0",
     "buffer": "^6.0.3",
     "class-transformer": "^0.5.1",
-    "core-js": "^3.31.1",
+    "core-js": "^3.32.1",
     "dexie": "^3.2.4",
     "dexie-export-import": "^4.0.7",
-    "did-jwt": "^7.2.4",
-    "ethereum-cryptography": "^2.0.0",
+    "did-jwt": "^7.2.7",
+    "elliptic": "^6.5.4",
+    "ethereum-cryptography": "^2.1.2",
     "ethereumjs-util": "^7.1.5",
-    "ethr-did-resolver": "^8.0.0",
+    "ethr-did-resolver": "^8.1.2",
     "jdenticon": "^3.2.0",
     "js-generate-password": "^0.1.9",
-    "localstorage-slim": "^2.4.0",
-    "luxon": "^3.3.0",
+    "jssha": "^3.3.1",
+    "localstorage-slim": "^2.5.0",
+    "luxon": "^3.4.3",
     "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",
+    "pinia-plugin-persistedstate": "^3.2.0",
     "qr-code-generator-vue3": "^1.4.21",
     "ramda": "^0.29.0",
     "readable-stream": "^4.4.2",
     "reflect-metadata": "^0.1.13",
     "register-service-worker": "^1.7.2",
-    "three": "^0.154.0",
+    "three": "^0.156.1",
     "vue": "^3.3.4",
     "vue-axios": "^3.5.2",
-    "vue-facing-decorator": "^2.1.20",
-    "vue-qrcode-reader": "^5.3.4",
-    "vue-router": "^4.2.3",
+    "vue-facing-decorator": "^3.0.2",
+    "vue-qrcode-reader": "^5.4.1",
+    "vue-router": "^4.2.4",
     "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",
+    "@types/three": "^0.155.1",
+    "@typescript-eslint/eslint-plugin": "^6.6.0",
+    "@typescript-eslint/parser": "^6.6.0",
     "@vue-leaflet/vue-leaflet": "^0.10.1",
     "@vue/cli-plugin-babel": "~5.0.8",
     "@vue/cli-plugin-eslint": "~5.0.8",
@@ -71,16 +74,15 @@
     "@vue/cli-plugin-vuex": "~5.0.8",
     "@vue/cli-service": "~5.0.8",
     "@vue/eslint-config-typescript": "^11.0.3",
-    "autoprefixer": "^10.4.14",
-    "eslint": "^8.44.0",
-    "eslint-config-prettier": "^8.8.0",
-    "eslint-plugin-prettier": "^5.0.0-alpha.1",
-    "eslint-plugin-vue": "^9.15.1",
+    "autoprefixer": "^10.4.15",
+    "eslint": "^8.53.0",
+    "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-prettier": "^5.0.0",
+    "eslint-plugin-vue": "^9.17.0",
     "leaflet": "^1.9.4",
-    "postcss": "^8.4.24",
-    "prettier": "^3.0.0",
-    "tailwindcss": "^3.3.2",
-    "typescript": "~5.1.6"
-  },
-  "pkgx": "node^18 npm^10"
+    "postcss": "^8.4.29",
+    "prettier": "^3.1.0",
+    "tailwindcss": "^3.3.3",
+    "typescript": "~5.2.2"
+  }
 }

project.task.yaml

@@ -2,7 +2,6 @@
 tasks:
 
 - 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)
 - 40 notifications :
   - push, where we trigger a ServiceWorker(?) in the app to reach out and check for new data assignee:matthew
 
@@ -11,10 +10,9 @@ tasks:
 - 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
 - .1 add instructions for map location selection
 
-- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished assignee:matthew assignee-group:ui
+- 01 Show pop-up or some message confirming that settings & contacts download has been initiated/finished
 
-- 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
+- 01 Ensure each action sent to the server has a confirmation - eg registration (ie a toast something that dismisses after 5-10s)
 
 - Home Feed & Quick Give screen :
   - 01 save the feed-viewed status in settings storage ("afterQuery")
@@ -23,18 +21,16 @@ tasks:
 
 - 24 Move to Vite assignee:matthew
 
-- .2 fit as many icons as possible on home & project view screens but only going halfway down the page
-- .1 Remove notification alert visuals on home page
+- .5 switch so DiscoverView shows anywhere by default, and no number unless search is done (and maybe a better filter UI, including "mine" to consolidate with ProjectsView)
+- .2 fit as many icons as possible on home & project view screens but only going halfway down the page assignee-group:ui
 - .5 Add infinite scroll to gifts on the home page
 - .5 bug - search for "Safari" does not find the project, but if already on the "Anywhere" tab it shows all
 - .2 figure out why endorser-mobile search doesn't find recently created PlanAction
 - .1 when creating a plan, select location and then make sure you can deselect on Android
-- .5 include a version, maybe the hash of the latest commit -- figuring out how it works on prod now
 - .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 add project ID to the URL of the project-view, to make a project publicly-accessible
 - .5 fix where user 0 sees no txns from user 1 on contacts page but sees them on list page
-- .2 on ProjectViewView, show different messages for "to" and "from" sections if none exist 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 on ProjectViewView, show different messages for "to" and "from" sections if none exist
 - .2 fix rate limit verbiage (with the new one-per-day allowance) assignee:trent
 - .1 remove the logic to exclude beforeId in list of plans after server has commit 26b25af605e715600d4f12b6416ed9fd7142d164
 - .2 in SeedBackupView, don't load the mnemonic and keep it in memory; only load it when they click "show"
@@ -44,14 +40,12 @@ tasks:
 - 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 on ProjectView page, show immediate feedback when a gift is given (on list?) -- and consider the same for Home & Contacts pages
 - .5 customize favicon assignee-group:ui
-- .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
+- .2 Show a warning if both giver and recipient are the same (but still allow?)
 - 01 Would it look better to shrink the buttons on many pages so they don't expand to the width of the screen? assignee-group:ui
-- .5 Display a more appealing confirmation on the map when erasing the marker assignee-group:ui
+- .5 Display a more appealing confirmation on the map when erasing the marker
 - .5 make a VC details page
 - .1 Add units or different icon to the coins (to distinguish $, BTC, hours, etc)
 - .1 remove firstName (& lastName) from localStorage
@@ -63,6 +57,7 @@ tasks:
 
 - stats v1 :
   - 01 show numeric stats
+  - 04 show different graphic for projects vs people on world
   - 01 link to world for specific stats
   - .5 don't load another instance of a bush if it already exists
   - maybe - allow type annotations in World.js & landmarks.js (since we get this error - "Types are not supported by current JavaScript version")

src/App.vue

@@ -162,17 +162,22 @@
 
                 <button
                   class="block w-full text-center text-md font-bold uppercase bg-blue-600 text-white px-2 py-2 rounded-md mb-2"
+                  @click="
+                    close(notification.id);
+                    turnOnNotifications();
+                  "
                 >
                   Turn on Notifications
                 </button>
                 <div class="grid grid-cols-2 gap-2">
                   <button
-                    @click="close(notification.id)"
+                    @click="maybeLater(notification.id)"
                     class="block w-full text-center text-md font-bold uppercase bg-slate-600 text-white px-2 py-2 rounded-md"
                   >
                     Maybe Later
                   </button>
                   <button
+                    @click="never(notification.id)"
                     class="block w-full text-center text-md font-bold uppercase bg-rose-600 text-white px-2 py-2 rounded-md"
                   >
                     Never
@@ -254,4 +259,248 @@
 
 <style></style>
 
-<script lang="ts"></script>
+<script lang="ts">
+import { Vue, Component } from "vue-facing-decorator";
+import axios, { AxiosError } from "axios";
+
+interface ServiceWorkerMessage {
+  type: string;
+  data: string;
+}
+
+interface ServiceWorkerResponse {
+  // Define the properties and their types
+  success: boolean;
+  message?: string;
+}
+
+// Example interface for error
+interface ErrorResponse {
+  message: string;
+  // Other properties as needed
+}
+
+interface VapidResponse {
+  data: {
+    vapidKey: string;
+  };
+}
+
+@Component
+export default class App extends Vue {
+  b64 = "";
+  mounted() {
+    axios
+      .get("https://timesafari-pwa.anomalistlabs.com/web-push/vapid")
+      .then((response: VapidResponse) => {
+        this.b64 = response.data.vapidKey;
+        console.log(this.b64);
+        navigator.serviceWorker.addEventListener("controllerchange", () => {
+          console.log("New service worker is now controlling the page");
+        });
+      })
+      .catch((error: AxiosError) => {
+        console.error("API error", error);
+      });
+  }
+
+  private sendMessageToServiceWorker(
+    message: ServiceWorkerMessage,
+  ): Promise<unknown> {
+    return new Promise((resolve, reject) => {
+      if (navigator.serviceWorker.controller) {
+        const messageChannel = new MessageChannel();
+
+        messageChannel.port1.onmessage = (event: MessageEvent) => {
+          if (event.data.error) {
+            reject(event.data.error as ErrorResponse);
+          } else {
+            resolve(event.data as ServiceWorkerResponse);
+          }
+        };
+
+        navigator.serviceWorker.controller.postMessage(message, [
+          messageChannel.port2,
+        ]);
+      } else {
+        reject("Service worker controller not available");
+      }
+    });
+  }
+
+  private askPermission(): Promise<NotificationPermission> {
+    if (!("serviceWorker" in navigator && navigator.serviceWorker.controller)) {
+      return Promise.reject("Service worker not available.");
+    }
+
+    const secret = localStorage.getItem("secret");
+    if (!secret) {
+      return Promise.reject("No secret found.");
+    }
+
+    return this.sendSecretToServiceWorker(secret)
+      .then(() => this.checkNotificationSupport())
+      .then(() => this.requestNotificationPermission())
+      .catch((error) => Promise.reject(error));
+  }
+
+  private sendSecretToServiceWorker(secret: string): Promise<void> {
+    const message: ServiceWorkerMessage = {
+      type: "SEND_LOCAL_DATA",
+      data: secret,
+    };
+
+    return this.sendMessageToServiceWorker(message).then((response) => {
+      console.log("Response from service worker:", response);
+    });
+  }
+
+  private checkNotificationSupport(): Promise<void> {
+    if (!("Notification" in window)) {
+      alert("This browser does not support notifications.");
+      return Promise.reject("This browser does not support notifications.");
+    }
+    if (Notification.permission === "granted") {
+      return Promise.resolve();
+    }
+    return Promise.resolve();
+  }
+
+  private requestNotificationPermission(): Promise<NotificationPermission> {
+    return Notification.requestPermission().then((permission) => {
+      if (permission !== "granted") {
+        alert("We need notification permission to provide certain features.");
+        throw new Error("We weren't granted permission.");
+      }
+      return permission;
+    });
+  }
+
+  async turnOnNotifications() {
+    return this.askPermission()
+      .then((permission) => {
+        console.log("Permission granted:", permission);
+
+        // Call the function and handle promises
+        this.subscribeToPush()
+          .then(() => {
+            console.log("Subscribed successfully.");
+            // Assuming the subscription object is available
+            return navigator.serviceWorker.ready;
+          })
+          .then((registration) => {
+            // Fetch the existing subscription object from the registration
+            return registration.pushManager.getSubscription();
+          })
+          .then((subscription) => {
+            if (subscription) {
+              console.log(subscription);
+              return this.sendSubscriptionToServer(subscription);
+            } else {
+              throw new Error("Subscription object is not available.");
+            }
+          })
+          .then(() => {
+            console.log("Subscription data sent to server.");
+          })
+          .catch((error) => {
+            console.error(
+              "Subscription or server communication failed:",
+              error,
+            );
+          });
+      })
+      .catch((error) => {
+        console.error("An error occurred:", error);
+        // Handle error appropriately here
+      });
+  }
+
+  // Function to convert URL base64 to Uint8Array
+  private urlBase64ToUint8Array(base64String: string): Uint8Array {
+    const padding = "=".repeat((4 - (base64String.length % 4)) % 4);
+    const base64 = (base64String + padding)
+      .replace(/-/g, "+")
+      .replace(/_/g, "/");
+    const rawData = window.atob(base64);
+    const outputArray = new Uint8Array(rawData.length);
+
+    for (let i = 0; i < rawData.length; ++i) {
+      outputArray[i] = rawData.charCodeAt(i);
+    }
+    return outputArray;
+  }
+
+  private subscribeToPush(): Promise<void> {
+    return new Promise<void>((resolve, reject) => {
+      if (!("serviceWorker" in navigator && "PushManager" in window)) {
+        const errorMsg = "Push messaging is not supported";
+        console.warn(errorMsg);
+        return reject(new Error(errorMsg));
+      }
+
+      if (Notification.permission !== "granted") {
+        const errorMsg = "Notification permission not granted";
+        console.warn(errorMsg);
+        return reject(new Error(errorMsg));
+      }
+
+      const applicationServerKey = this.urlBase64ToUint8Array(this.b64);
+      const options: PushSubscriptionOptions = {
+        userVisibleOnly: true,
+        applicationServerKey: applicationServerKey,
+      };
+
+      navigator.serviceWorker.ready
+        .then((registration) => {
+          return registration.pushManager.subscribe(options);
+        })
+        .then((subscription) => {
+          console.log("Push subscription successful:", subscription);
+          resolve();
+        })
+        .catch((error) => {
+          console.error(
+            "Subscription or server communication failed:",
+            error,
+            options,
+          );
+
+          // Inform the user about the issue
+          alert(
+            "We encountered an issue setting up push notifications. " +
+              "If you wish to revoke notification permissions, please do so in your browser settings.",
+          );
+
+          reject(error);
+        });
+    });
+  }
+
+  private sendSubscriptionToServer(
+    subscription: PushSubscription,
+  ): Promise<void> {
+    console.log(subscription);
+    return fetch("/web-push/subscribe", {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      body: JSON.stringify(subscription),
+    }).then((response) => {
+      if (!response.ok) {
+        throw new Error("Failed to send subscription to server");
+      }
+      console.log("Subscription sent to server successfully.");
+    });
+  }
+
+  never(ID: string) {
+    alert(ID);
+  }
+
+  maybeLater(ID: string) {
+    alert(ID);
+  }
+}
+</script>

src/constants/app.ts

@@ -4,7 +4,7 @@
  * See also ../libs/veramo/setup.ts
  */
 export enum AppString {
-  APP_NAME = "Time Safari",
+  APP_NAME = "TimeSafari",
 
   PROD_ENDORSER_API_SERVER = "https://api.endorser.ch",
   TEST_ENDORSER_API_SERVER = "https://test-api.endorser.ch",

src/db/index.ts

@@ -9,59 +9,39 @@ import {
 } from "./tables/settings";
 import { AppString } from "@/constants/app";
 
-// a separate DB because the seed is super-sensitive data
-type SensitiveTables = {
-  accounts: Table<Account>;
-};
-
+// Define types for tables that hold sensitive and non-sensitive data
+type SensitiveTables = { accounts: Table<Account> };
 type NonsensitiveTables = {
   contacts: Table<Contact>;
   settings: Table<Settings>;
 };
 
-/**
- * In order to make the next line be acceptable, the program needs to have its linter suppress a rule:
- *   https://typescript-eslint.io/rules/no-unnecessary-type-constraint/
- *
- * and change *any* to *unknown*
- *
- *   https://9to5answer.com/how-to-bypass-warning-unexpected-any-specify-a-different-type-typescript-eslint-no-explicit-any
- */
+// Using 'unknown' instead of 'any' for stricter typing and to avoid TypeScript warnings
 export type SensitiveDexie<T extends unknown = SensitiveTables> = BaseDexie & T;
-export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
-const SensitiveSchemas = Object.assign({}, AccountsSchema);
-
 export type NonsensitiveDexie<T extends unknown = NonsensitiveTables> =
   BaseDexie & T;
+
+// Initialize Dexie databases for sensitive and non-sensitive data
+export const accountsDB = new BaseDexie("TimeSafariAccounts") as SensitiveDexie;
+const SensitiveSchemas = { ...AccountsSchema };
+
 export const db = new BaseDexie("TimeSafari") as NonsensitiveDexie;
-const NonsensitiveSchemas = Object.assign({}, ContactsSchema, SettingsSchema);
+const NonsensitiveSchemas = { ...ContactsSchema, ...SettingsSchema };
 
-/**
- * Needed to enable a special webpack setting to allow *await* below:
- *   https://stackoverflow.com/questions/72474803/error-the-top-level-await-experiment-is-not-enabled-set-experiments-toplevelaw
- */
-
-/**
- * Create password and place password in localStorage.
- *
- * It's good practice to keep the data encrypted at rest, so we'll do that even
- * if the secret is stored right next to the app.
- */
+// Manage the encryption key. If not present in localStorage, create and store it.
 const secret =
   localStorage.getItem("secret") || Encryption.createRandomEncryptionKey();
+if (!localStorage.getItem("secret")) localStorage.setItem("secret", secret);
 
-if (localStorage.getItem("secret") == null) {
-  localStorage.setItem("secret", secret);
-}
-
+// Apply encryption to the sensitive database using the secret key
 encrypted(accountsDB, { secretKey: secret });
-accountsDB.version(1).stores(SensitiveSchemas);
 
+// Define the schema for our databases
+accountsDB.version(1).stores(SensitiveSchemas);
 db.version(1).stores(NonsensitiveSchemas);
 
-// initialize, a la https://dexie.org/docs/Tutorial/Design#the-populate-event
-db.on("populate", function () {
-  // ensure there's an initial entry for settings
+// Event handler to initialize the non-sensitive database with default settings
+db.on("populate", () => {
   db.settings.add({
     id: MASTER_SETTINGS_KEY,
     apiServer: AppString.DEFAULT_ENDORSER_API_SERVER,

src/db/tables/settings.ts

@@ -1,29 +1,47 @@
+/**
+ * BoundingBox type describes the geographical bounding box coordinates.
+ */
 export type BoundingBox = {
-  eastLong: number;
-  maxLat: number;
-  minLat: number;
-  westLong: number;
+  eastLong: number; // Eastern longitude
+  maxLat: number; // Maximum (Northernmost) latitude
+  minLat: number; // Minimum (Southernmost) latitude
+  westLong: number; // Western longitude
 };
 
-// a singleton
+/**
+ * Settings type encompasses user-specific configuration details.
+ */
 export type Settings = {
-  id: number; // there's only one entry: MASTER_SETTINGS_KEY
-
-  activeDid?: string;
-  apiServer?: string;
-  firstName?: string;
+  id: number; // Only one entry using MASTER_SETTINGS_KEY
+  activeDid?: string; // Active Decentralized ID
+  apiServer?: string; // API server URL
+  firstName?: string; // User's first name
+  lastName?: string; // User's last name
+  lastViewedClaimId?: string; // Last viewed claim ID
+  lastNotifiedClaimId?: string; // Last notified claim ID
   isRegistered?: boolean;
-  lastName?: string; // deprecated, pre v 0.1.3
-  lastViewedClaimId?: string;
+
+  // Array of named search boxes defined by bounding boxes
+
   searchBoxes?: Array<{
     name: string;
     bbox: BoundingBox;
   }>;
-  showContactGivesInline?: boolean;
+
+  showContactGivesInline?: boolean; // Display contact inline or not
+  vapid?: string; // VAPID (Voluntary Application Server Identification) field for web push
+  reminderTime?: number; // Time in milliseconds since UNIX epoch for reminders
+  reminderOn?: boolean; // Toggle to enable or disable reminders
 };
 
+/**
+ * Schema for the Settings table in the database.
+ */
 export const SettingsSchema = {
   settings: "id",
 };
 
+/**
+ * Constants.
+ */
 export const MASTER_SETTINGS_KEY = 1;

src/libs/endorserServer.ts

@@ -134,8 +134,8 @@ export function didInfo(
   return contact
     ? contact.name || "Contact With No Name"
     : isHiddenDid(did)
-    ? "Someone Not In Network"
-    : "Someone Not In Contacts";
+      ? "Someone Not In Network"
+      : "Someone Not In Contacts";
 }
 
 export interface ResultWithType {
@@ -231,10 +231,10 @@ export async function createAndSubmitGive(
       error === null
         ? "Null error"
         : error instanceof Error
-        ? error.message
-        : typeof error === "object" && error !== null && "message" in error
-        ? (error as { message: string }).message
-        : "Unknown error";
+          ? error.message
+          : typeof error === "object" && error !== null && "message" in error
+            ? (error as { message: string }).message
+            : "Unknown error";
 
     return {
       type: "error",

src/registerServiceWorker.ts

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

src/router/index.ts

@@ -79,14 +79,6 @@ const routes: Array<RouteRecordRaw> = [
     component: () =>
       import(/* webpackChunkName: "contacts" */ "../views/ContactsView.vue"),
   },
-  {
-    path: "/scan-contact",
-    name: "scan-contact",
-    component: () =>
-      import(
-        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
-      ),
-  },
   {
     path: "/discover",
     name: "discover",
@@ -99,6 +91,14 @@ const routes: Array<RouteRecordRaw> = [
     component: () =>
       import(/* webpackChunkName: "help" */ "../views/HelpView.vue"),
   },
+  {
+    path: "/identity-switcher",
+    name: "identity-switcher",
+    component: () =>
+      import(
+        /* webpackChunkName: "identity-switcher" */ "../views/IdentitySwitcherView.vue"
+      ),
+  },
   {
     path: "/import-account",
     name: "import-account",
@@ -147,14 +147,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",
@@ -168,6 +160,14 @@ const routes: Array<RouteRecordRaw> = [
       import(/* webpackChunkName: "projects" */ "../views/ProjectsView.vue"),
     beforeEnter: enterOrStart,
   },
+  {
+    path: "/scan-contact",
+    name: "scan-contact",
+    component: () =>
+      import(
+        /* webpackChunkName: "scan-contact" */ "../views/ContactScanView.vue"
+      ),
+  },
   {
     path: "/seed-backup",
     name: "seed-backup",

src/views/ContactsView.vue

@@ -67,8 +67,8 @@
             showGiveTotals
               ? "Total"
               : showGiveConfirmed
-              ? "Confirmed"
-              : "Unconfirmed"
+                ? "Confirmed"
+                : "Unconfirmed"
           }}
         </button>
         <br />

src/views/HomeView.vue

@@ -8,22 +8,38 @@
 
     <!-- show the actions for recognizing a give -->
     <div class="mb-8">
-      <div v-if="!activeDid">
-        To record others' giving,
-        <router-link :to="{ name: 'start' }" class="text-blue-500">
-          create your identifier.</router-link
+      <div
+        v-if="!activeDid"
+        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+      >
+        <p class="text-lg mb-3">
+          You need an <b>identifier</b> before you can record others' giving.
+        </p>
+        <router-link
+          :to="{ name: 'start' }"
+          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
+        >
+          Create Your Identifier</router-link
         >
       </div>
 
-      <div v-else-if="!isRegistered">
-        To record others' giving, someone must register your account, so show
-        them
-        <router-link :to="{ name: 'contact-qr' }" class="text-blue-500">
-          your identity info</router-link
+      <div
+        v-else-if="!isRegistered"
+        class="bg-amber-200 rounded-md overflow-hidden text-center px-4 py-3 mb-4"
+      >
+        Someone must register your account before you can record others' giving.
+        To do this:
+        <router-link
+          :to="{ name: 'contact-qr' }"
+          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
         >
-        and then
-        <router-link :to="{ name: 'account' }" class="text-blue-500">
-          check your limits.</router-link
+          1. Show Them Your Identity Info</router-link
+        >
+        <router-link
+          :to="{ name: 'account' }"
+          class="block text-center text-md font-bold uppercase bg-slate-500 text-white px-2 py-3 rounded-md"
+        >
+          2. Check Your Limits</router-link
         >
       </div>
 

src/views/ProjectsView.vue

@@ -98,8 +98,6 @@ export default class ProjectsView extends Vue {
   projects: ProjectData[] = [];
   current: IIdentifier;
   isLoading = false;
-  alertTitle = "";
-  alertMessage = "";
   numAccounts = 0;
 
   async beforeCreate() {

sw_scripts/additional-scripts.js

@@ -0,0 +1,63 @@
+/* eslint-env serviceworker */
+/* global workbox */
+importScripts(
+  "https://storage.googleapis.com/workbox-cdn/releases/6.4.1/workbox-sw.js",
+);
+
+self.addEventListener("install", (event) => {
+  importScripts(
+    "safari-notifications.js",
+    "nacl.js",
+    "noble-curves.js",
+    "noble-hashes.js",
+  );
+});
+
+self.addEventListener("push", function (event) {
+  event.waitUntil(
+    (async () => {
+      try {
+        let payload;
+        if (event.data) {
+          payload = JSON.parse(event.data.text());
+        }
+        const message = await self.getNotificationCount();
+        const title = payload ? payload.title : "Custom Title";
+        const options = {
+          body: message,
+          icon: payload ? payload.icon : "icon.png",
+          badge: payload ? payload.badge : "badge.png",
+        };
+        await self.registration.showNotification(title, options);
+      } catch (error) {
+        console.error("Error in processing the push event:", error);
+      }
+    })(),
+  );
+});
+
+self.addEventListener("message", (event) => {
+  if (event.data && event.data.type === "SEND_LOCAL_DATA") {
+    self.secret = event.data.data;
+    event.ports[0].postMessage({ success: true });
+  }
+});
+
+self.addEventListener("activate", (event) => {
+  event.waitUntil(clients.claim());
+  console.log("Service worker activated", event);
+});
+
+self.addEventListener("fetch", (event) => {
+  console.log(event.request);
+});
+
+self.addEventListener("error", (event) => {
+  console.error("Error in Service Worker:", event.message);
+  console.error("File:", event.filename);
+  console.error("Line:", event.lineno);
+  console.error("Column:", event.colno);
+  console.error("Error Object:", event.error);
+});
+
+workbox.precaching.precacheAndRoute(self.__WB_MANIFEST);

sw_scripts/safari-notifications.js

@@ -0,0 +1,545 @@
+function bufferFromBase64(base64) {
+  const binaryString = atob(base64);
+  const length = binaryString.length;
+  const bytes = new Uint8Array(length);
+
+  for (let i = 0; i < length; i++) {
+    bytes[i] = binaryString.charCodeAt(i);
+  }
+
+  return bytes;
+}
+
+function fromString(str, encoding = "utf8") {
+  if (encoding === "utf8") {
+    return new TextEncoder().encode(str);
+  } else if (encoding === "base16") {
+    if (str.length % 2 !== 0) {
+      throw new Error("Invalid hex string length.");
+    }
+    let bytes = new Uint8Array(str.length / 2);
+    for (let i = 0; i < str.length; i += 2) {
+      bytes[i / 2] = parseInt(str.substring(i, i + 2), 16);
+    }
+    return bytes;
+  } else if (encoding === "base64url") {
+    str = str.replace(/-/g, "+").replace(/_/g, "/");
+    while (str.length % 4) {
+      str += "=";
+    }
+    return new Uint8Array(bufferFromBase64(str));
+  } else {
+    throw new Error(`Unsupported encoding "${encoding}"`);
+  }
+}
+
+/**
+ * Convert a Uint8Array to a string with the given encoding.
+ *
+ * @param {Uint8Array} byteArray - The Uint8Array to convert.
+ * @param {string} [encoding='utf8'] - The desired encoding ('utf8', 'base16', 'base64url').
+ * @returns {string} - The encoded string.
+ * @throws {Error} - Throws an error if the encoding is unsupported.
+ */
+function toString(byteArray, encoding = "utf8") {
+  switch (encoding) {
+    case "utf8":
+      return decodeUTF8(byteArray);
+    case "base16":
+      return toBase16(byteArray);
+    case "base64url":
+      return toBase64Url(byteArray);
+    default:
+      throw new Error(`Unsupported encoding "${encoding}"`);
+  }
+}
+
+/**
+ * Decode a Uint8Array as a UTF-8 string.
+ *
+ * @param {Uint8Array} byteArray
+ * @returns {string}
+ */
+function decodeUTF8(byteArray) {
+  return new TextDecoder().decode(byteArray);
+}
+
+/**
+ * Convert a Uint8Array to a base16 (hex) encoded string.
+ *
+ * @param {Uint8Array} byteArray
+ * @returns {string}
+ */
+function toBase16(byteArray) {
+  return Array.from(byteArray)
+    .map((byte) => byte.toString(16).padStart(2, "0"))
+    .join("");
+}
+
+/**
+ * Convert a Uint8Array to a base64url encoded string.
+ *
+ * @param {Uint8Array} byteArray
+ * @returns {string}
+ */
+function toBase64Url(byteArray) {
+  let uint8Array = new Uint8Array(byteArray);
+  let binaryString = "";
+  for (let i = 0; i < uint8Array.length; i++) {
+    binaryString += String.fromCharCode(uint8Array[i]);
+  }
+
+  // Encode to base64
+  let base64 = btoa(binaryString);
+
+  return base64.replace(/\+/g, "-").replace(/\//g, "_").replace(/=+$/, "");
+}
+
+const u8a = { toString, fromString };
+
+function sha256(payload) {
+  const data = typeof payload === "string" ? u8a.fromString(payload) : payload;
+  return nobleHashes.sha256(data);
+}
+
+async function accessToken(identifier) {
+  const did = identifier["did"];
+  const privateKeyHex = identifier["keys"][0]["privateKeyHex"];
+
+  const signer = await SimpleSigner(privateKeyHex);
+
+  const nowEpoch = Math.floor(Date.now() / 1000);
+  const endEpoch = nowEpoch + 60; // add one minute
+
+  const tokenPayload = { exp: endEpoch, iat: nowEpoch, iss: did };
+  const alg = undefined; // defaults to 'ES256K', more standardized but harder to verify vs ES256K-R
+  const jwt = await createJWT(tokenPayload, {
+    alg,
+    issuer: did,
+    signer,
+  });
+  return jwt;
+}
+
+async function createJWT(payload, options, header = {}) {
+  const { issuer, signer, alg, expiresIn, canonicalize } = options;
+
+  if (!signer)
+    throw new Error(
+      "missing_signer: No Signer functionality has been configured",
+    );
+  if (!issuer)
+    throw new Error("missing_issuer: No issuing DID has been configured");
+  if (!header.typ) header.typ = "JWT";
+  if (!header.alg) header.alg = alg;
+
+  const timestamps = {
+    iat: Math.floor(Date.now() / 1000),
+    exp: undefined,
+  };
+
+  if (expiresIn) {
+    if (typeof expiresIn === "number") {
+      timestamps.exp = (payload.nbf || timestamps.iat) + Math.floor(expiresIn);
+    } else {
+      throw new Error("invalid_argument: JWT expiresIn is not a number");
+    }
+  }
+
+  const fullPayload = { ...timestamps, ...payload, iss: issuer };
+  return createJWS(fullPayload, signer, header, { canonicalize });
+}
+
+const defaultAlg = "ES256K";
+
+async function createJWS(payload, signer, header = {}, options = {}) {
+  if (!header.alg) header.alg = defaultAlg;
+  const encodedPayload =
+    typeof payload === "string"
+      ? payload
+      : encodeSection(payload, options.canonicalize);
+  const signingInput = [
+    encodeSection(header, options.canonicalize),
+    encodedPayload,
+  ].join(".");
+
+  const jwtSigner = ES256KSignerAlg(false);
+  const signature = await jwtSigner(signingInput, signer);
+
+  // JWS Compact Serialization
+  // https://www.rfc-editor.org/rfc/rfc7515#section-7.1
+  return [signingInput, signature].join(".");
+}
+
+function canonicalizeData(object) {
+  if (typeof object === "number" && isNaN(object)) {
+    throw new Error("NaN is not allowed");
+  }
+
+  if (typeof object === "number" && !isFinite(object)) {
+    throw new Error("Infinity is not allowed");
+  }
+
+  if (object === null || typeof object !== "object") {
+    return JSON.stringify(object);
+  }
+
+  if (object.toJSON instanceof Function) {
+    return serialize(object.toJSON());
+  }
+
+  if (Array.isArray(object)) {
+    const values = object.reduce((t, cv, ci) => {
+      const comma = ci === 0 ? "" : ",";
+      const value = cv === undefined || typeof cv === "symbol" ? null : cv;
+      return `${t}${comma}${serialize(value)}`;
+    }, "");
+    return `[${values}]`;
+  }
+
+  const values = Object.keys(object)
+    .sort()
+    .reduce((t, cv) => {
+      if (object[cv] === undefined || typeof object[cv] === "symbol") {
+        return t;
+      }
+      const comma = t.length === 0 ? "" : ",";
+      return `${t}${comma}${serialize(cv)}:${serialize(object[cv])}`;
+    }, "");
+  return `{${values}}`;
+}
+
+function encodeSection(data, shouldCanonicalize = false) {
+  if (shouldCanonicalize) {
+    return encodeBase64url(canonicalizeData(data));
+  } else {
+    return encodeBase64url(JSON.stringify(data));
+  }
+}
+
+function encodeBase64url(s) {
+  return bytesToBase64url(u8a.fromString(s));
+}
+
+function instanceOfEcdsaSignature(object) {
+  return typeof object === "object" && "r" in object && "s" in object;
+}
+
+function ES256KSignerAlg(recoverable) {
+  return async function sign(payload, signer) {
+    const signature = await signer(payload);
+    if (instanceOfEcdsaSignature(signature)) {
+      return toJose(signature, recoverable);
+    } else {
+      if (
+        recoverable &&
+        typeof fromJose(signature).recoveryParam === "undefined"
+      ) {
+        throw new Error(
+          `not_supported: ES256K-R not supported when signer doesn't provide a recovery param`,
+        );
+      }
+      return signature;
+    }
+  };
+}
+
+function leftpad(data, size = 64) {
+  if (data.length === size) return data;
+  return "0".repeat(size - data.length) + data;
+}
+
+async function SimpleSigner(hexPrivateKey) {
+  const signer = await ES256KSigner(hexToBytes(hexPrivateKey), true);
+  return async (data) => {
+    const signature = await signer(data);
+    return fromJose(signature);
+  };
+}
+
+function hexToBytes(s, minLength) {
+  let input = s.startsWith("0x") ? s.substring(2) : s;
+
+  if (input.length % 2 !== 0) {
+    input = `0${input}`;
+  }
+
+  if (minLength) {
+    const paddedLength = Math.max(input.length, minLength * 2);
+    input = input.padStart(paddedLength, "00");
+  }
+
+  return u8a.fromString(input.toLowerCase(), "base16");
+}
+
+function ES256KSigner(privateKey, recoverable = false) {
+  const privateKeyBytes = privateKey;
+  if (privateKeyBytes.length !== 32) {
+    throw new Error(
+      `bad_key: Invalid private key format. Expecting 32 bytes, but got ${privateKeyBytes.length}`,
+    );
+  }
+
+  return async function (data) {
+    const signature = nobleCurves.secp256k1.sign(sha256(data), privateKeyBytes);
+    return toJose(
+      {
+        r: leftpad(signature.r.toString(16)),
+        s: leftpad(signature.s.toString(16)),
+        recoveryParam: signature.recovery,
+      },
+      recoverable,
+    );
+  };
+}
+
+function toJose(signature, recoverable) {
+  const { r, s, recoveryParam } = signature;
+  const jose = new Uint8Array(recoverable ? 65 : 64);
+  jose.set(u8a.fromString(r, "base16"), 0);
+  jose.set(u8a.fromString(s, "base16"), 32);
+
+  if (recoverable) {
+    if (typeof recoveryParam === "undefined") {
+      throw new Error("Signer did not return a recoveryParam");
+    }
+    jose[64] = recoveryParam;
+  }
+  return bytesToBase64url(jose);
+}
+
+function bytesToBase64url(b) {
+  return u8a.toString(b, "base64url");
+}
+
+function base64ToBytes(s) {
+  const inputBase64Url = s
+    .replace(/\+/g, "-")
+    .replace(/\//g, "_")
+    .replace(/=/g, "");
+  return u8a.fromString(inputBase64Url, "base64url");
+}
+
+function bytesToHex(b) {
+  return u8a.toString(b, "base16");
+}
+
+function fromJose(signature) {
+  const signatureBytes = base64ToBytes(signature);
+  if (signatureBytes.length < 64 || signatureBytes.length > 65) {
+    throw new TypeError(
+      `Wrong size for signature. Expected 64 or 65 bytes, but got ${signatureBytes.length}`,
+    );
+  }
+  const r = bytesToHex(signatureBytes.slice(0, 32));
+  const s = bytesToHex(signatureBytes.slice(32, 64));
+  const recoveryParam =
+    signatureBytes.length === 65 ? signatureBytes[64] : undefined;
+
+  return { r, s, recoveryParam };
+}
+
+function validateBase64(s) {
+  if (
+    !/^(?:[A-Za-z0-9+\/]{2}[A-Za-z0-9+\/]{2})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/.test(
+      s,
+    )
+  ) {
+    throw new TypeError("invalid encoding");
+  }
+}
+
+function decodeBase64(s) {
+  validateBase64(s);
+  var i,
+    d = atob(s),
+    b = new Uint8Array(d.length);
+  for (i = 0; i < d.length; i++) b[i] = d.charCodeAt(i);
+  return b;
+}
+
+async function getSettingById(id) {
+  return new Promise((resolve, reject) => {
+    let openRequest = indexedDB.open("TimeSafari");
+
+    openRequest.onupgradeneeded = (event) => {
+      // Handle database setup if necessary
+      let db = event.target.result;
+      if (!db.objectStoreNames.contains("settings")) {
+        db.createObjectStore("settings", { keyPath: "id" });
+      }
+    };
+
+    openRequest.onsuccess = (event) => {
+      let db = event.target.result;
+      let transaction = db.transaction("settings", "readonly");
+      let objectStore = transaction.objectStore("settings");
+      let getRequest = objectStore.get(id);
+
+      getRequest.onsuccess = () => resolve(getRequest.result);
+      getRequest.onerror = () => reject(getRequest.error);
+    };
+
+    openRequest.onerror = () => reject(openRequest.error);
+  });
+}
+
+
+async function setMostRecentNotified(id) {
+    try {
+        const db = await openIndexedDB("TimeSafari");
+        const transaction = db.transaction("settings", "readwrite");
+        const store = transaction.objectStore("settings");
+
+        const data = await getRecord(store, 1);
+        if (data) {
+          data["lastNotifiedClaimId"] = id;
+          await updateRecord(store, data);
+        } else {
+          console.error("Record not found");
+        }
+
+        transaction.oncomplete = () => db.close();
+    } catch (error) {
+        console.error("Database error: " + error.message);
+    }
+}
+
+
+function openIndexedDB(dbName) {
+    return new Promise((resolve, reject) => {
+        const request = indexedDB.open(dbName);
+        request.onerror = () => reject(request.error);
+        request.onsuccess = () => resolve(request.result);
+        request.onupgradeneeded = (event) => {
+            const db = event.target.result;
+            if (!db.objectStoreNames.contains("settings")) {
+                db.createObjectStore("settings");
+            }
+        };
+    });
+}
+
+
+function getRecord(store, key) {
+    return new Promise((resolve, reject) => {
+        const request = store.get(key);
+        request.onsuccess = () => resolve(request.result);
+        request.onerror = () => reject(request.error);
+    });
+}
+
+
+function updateRecord(store, data) {
+    return new Promise((resolve, reject) => {
+        const request = store.put(data);
+        request.onsuccess = () => resolve(request.result);
+        request.onerror = () => reject(request.error);
+    });
+}
+
+
+async function fetchAllAccounts() {
+  return new Promise((resolve, reject) => {
+    let openRequest = indexedDB.open("TimeSafariAccounts");
+
+    openRequest.onupgradeneeded = function (event) {
+      let db = event.target.result;
+      if (!db.objectStoreNames.contains("accounts")) {
+        db.createObjectStore("accounts", { keyPath: "id" });
+      }
+    };
+
+    openRequest.onsuccess = function (event) {
+      let db = event.target.result;
+      let transaction = db.transaction("accounts", "readonly");
+      let objectStore = transaction.objectStore("accounts");
+      let getAllRequest = objectStore.getAll();
+
+      getAllRequest.onsuccess = function () {
+        resolve(getAllRequest.result);
+      };
+      getAllRequest.onerror = function () {
+        reject(getAllRequest.error);
+      };
+    };
+
+    openRequest.onerror = function () {
+      reject(openRequest.error);
+    };
+  });
+}
+
+async function getNotificationCount() {
+  let secret = null;
+  let accounts = [];
+  let result = null;
+  if ("secret" in self) {
+    secret = self.secret;
+    const secretUint8Array = self.decodeBase64(secret);
+    const settings = await getSettingById(1);
+    let lastNotifiedClaimId = null;
+    if ("lastNotifiedClaimId" in settings) {
+      lastNotifiedClaimId = settings["lastNotifiedClaimId"];
+    }
+    const activeDid = settings["activeDid"];
+    accounts = await fetchAllAccounts();
+    let did = null;
+    for (var i = 0; i < accounts.length; i++) {
+      let account = accounts[i];
+      let did = account["did"];
+      if (did == activeDid) {
+        let publicKeyHex = account["publicKeyHex"];
+        let identity = account["identity"];
+        const messageWithNonceAsUint8Array = self.decodeBase64(identity);
+        const nonce = messageWithNonceAsUint8Array.slice(0, 24);
+        const message = messageWithNonceAsUint8Array.slice(24, identity.length);
+        const decoder = new TextDecoder("utf-8");
+        const decrypted = self.secretbox.open(message, nonce, secretUint8Array);
+
+        const msg = decoder.decode(decrypted);
+        const identifier = JSON.parse(JSON.parse(msg));
+
+        const headers = {
+          "Content-Type": "application/json",
+        };
+
+        headers["Authorization"] = "Bearer " + (await accessToken(identifier));
+
+        let response = await fetch(
+          "https://test-api.endorser.ch/api/v2/report/claims",
+          {
+            method: "GET",
+            headers: headers,
+          },
+        );
+        if (response.status == 200) {
+          let json = await response.json();
+          let claims = json["data"];
+          let newClaims = 0;
+          for (var i = 0; i < claims.length; i++) {
+            let claim = claims[i];
+            if (claim["id"] === lastNotifiedClaimId) {
+              break;
+            }
+            newClaims++;
+          }
+          if (newClaims === 0) {
+            result = "You have no new claims today.";
+          } else {
+            result = `${newClaims} have been shared with you`;
+          }
+          const most_recent_notified = claims[0]["id"];
+          await setMostRecentNotified(most_recent_notified);
+	    return "TEST";
+        } else {
+          console.error(response.status);
+        }
+      }
+    }
+  }
+  return result;
+}
+
+self.getNotificationCount = getNotificationCount;
+self.decodeBase64 = decodeBase64;

vue.config.js

@@ -11,5 +11,9 @@ module.exports = defineConfig({
     iconPaths: {
       faviconSVG: "img/icons/safari-pinned-tab.svg",
     },
+    workboxPluginMode: "InjectManifest",
+    workboxOptions: {
+      swSrc: "./sw_scripts/additional-scripts.js",
+    },
   },
 });

web-push.md

@@ -1,3 +1,6 @@
+
+# Overivew of Web Push
+
 Web Push notifications is a web browser messaging protocol defined by the W3C.
 
 Discussions of this interesting technology are clouded because of a
@@ -360,29 +363,29 @@ unsubscribeFromPush().catch((err) => {
 NOTE: We could offer an option within the app to "mute" these notifications. This wouldn't turn off the notifications at the browser level, but you could make it so that your Service Worker doesn't display them even if it receives them.
 
 
-## NOTIFICATION DIALOG WORKFLOW
+# NOTIFICATION DIALOG WORKFLOW
 
-# ON APP FIRST-LAUNCH:
+## ON APP FIRST-LAUNCH:
 The user is periodically presented with the notification permission dialog that asks them if they want to turn on notifications. User is given 3 choices:
 
 - "Turn on Notifications": triggers the browser's own notification permission prompt.
 - "Maybe Later": dismisses the dialog, to reappear at a later instance. (The next time the user launches the app? After X amount of days? A combination of both?)
 - "Never": dismisses the dialog; app remembers to not automatically present the dialog again.
 
-# IF THE USER CHOOSES "NEVER":
+## IF THE USER CHOOSES "NEVER":
 The dialog can still be accessed via the Notifications toggle switch in `AccountViewView` (which also tells the user if notifications are turned on or off).
 
-# TO TEMPORARILY MUTE NOTIFICATIONS:
+## TO TEMPORARILY MUTE NOTIFICATIONS:
 While notifications are turned on, the user can tap on the Mute Notifications toggle switch in `AccountViewView` (visible only when notifications are turned on) to trigger the Mute Notifications Dialog. User is given the following choices:
 
 - Several "Mute for X Hour/s" buttons to temporarily mute notifications.
 - "Mute until I turn it back on" button to indefinitely mute notifications.
 - "Cancel" to make no changes and dismiss the dialog.
 
-# TO UNMUTE NOTIFICATIONS:
+## TO UNMUTE NOTIFICATIONS:
 Simply tap on the Mute Notifications toggle switch in `AccountViewView` to immediately unmute notifications. No dialog needed.
 
-# TO TURN OFF NOTIFICATIONS:
+## TO TURN OFF NOTIFICATIONS:
 While notifications are turned on, the user can tap on the App Notifications toggle switch in `AccountViewView` to trigger the Turn Off Notifications Dialog. User is given the following choices:
 
 - "Turn off Notifications" to fully turn them off (which means the user will need to go through the dialogs agains to turn them back on).