From 3471afdf253e135ac765f3aeccbd1ee3eedb1145 Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Sat, 8 Jul 2023 17:39:20 +0800
Subject: [PATCH] Cleaned up messages and improved the accountsDB lookups

---
 src/views/AccountViewView.vue | 17 +++++++----------
 src/views/ProjectViewView.vue |  2 +-
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/views/AccountViewView.vue b/src/views/AccountViewView.vue
index ef6f01d..2bb9227 100644
--- a/src/views/AccountViewView.vue
+++ b/src/views/AccountViewView.vue
@@ -274,7 +274,6 @@
 
 <script lang="ts">
 import "dexie-export-import";
-import * as R from "ramda";
 import { Component, Vue } from "vue-facing-decorator";
 import { useClipboard } from "@vueuse/core";
 
@@ -324,8 +323,10 @@ export default class AccountViewView extends Vue {
 
   public async getIdentity(activeDid) {
     await accountsDB.open();
-    const accounts = await accountsDB.accounts.toArray();
-    const account = R.find((acc) => acc.did === activeDid, accounts);
+    const account = await accountsDB.accounts
+      .where("did")
+      .equals(activeDid)
+      .first();
     const identity = JSON.parse(account?.identity || "null");
 
     if (!identity) {
@@ -362,14 +363,10 @@ export default class AccountViewView extends Vue {
     return timeStr.substring(0, timeStr.indexOf("T"));
   }
 
-  async initializeCount() {
-    this.numAccounts = await this.accounts.count();
-  }
-
-  async mounted() {
+  async beforeCreate() {
     accountsDB.open();
     this.accounts = accountsDB.accounts;
-    await this.initializeCount();
+    this.numAccounts = await this.accounts.count();
   }
 
   async created() {
@@ -402,7 +399,7 @@ export default class AccountViewView extends Vue {
     } catch (err) {
       if (
         err.message ===
-        "Attempted to load Give records with no identity available."
+        "Attempted to load account records with no identity available."
       ) {
         this.limitsMessage = "No identity.";
         this.loadingLimits = false;
diff --git a/src/views/ProjectViewView.vue b/src/views/ProjectViewView.vue
index 00d0f09..11da7a3 100644
--- a/src/views/ProjectViewView.vue
+++ b/src/views/ProjectViewView.vue
@@ -184,7 +184,7 @@ export default class ProjectViewView extends Vue {
 
     if (!identity) {
       throw new Error(
-        "Attempted to load Give records with no identity available.",
+        "Attempted to load project records with no identity available.",
       );
     }
     return identity;