From 3ce2ea9b4e430f780550c5a314459a33ecab28fc Mon Sep 17 00:00:00 2001
From: Matthew Raymer <matthew.raymer@anomalistdesign.com>
Date: Thu, 24 Apr 2025 09:34:01 +0000
Subject: [PATCH] fix: standardize FontAwesome usage and improve error handling

- Change <fa> to <font-awesome> for consistent component naming
- Add structured error logging in QR scanner services
- Fix cacheImage event handling in ActivityListItem
- Improve code formatting and error wrapping
---
 src/components/ActivityListItem.vue          |  9 ++-
 src/services/QRScanner/CapacitorQRScanner.ts | 60 +++++++++++++-------
 src/services/QRScanner/WebDialogQRScanner.ts |  7 ++-
 src/views/ContactQRScanShowView.vue          | 24 +++++---
 src/views/ContactsView.vue                   |  2 +-
 5 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/src/components/ActivityListItem.vue b/src/components/ActivityListItem.vue
index 52339be0..51b2ab36 100644
--- a/src/components/ActivityListItem.vue
+++ b/src/components/ActivityListItem.vue
@@ -57,7 +57,7 @@
             class="w-full h-auto max-w-lg max-h-96 object-contain mx-auto drop-shadow-md"
             :src="record.image"
             alt="Activity image"
-            @load="$emit('cacheImage', record.image)"
+            @load="cacheImage(record.image)"
           />
         </a>
       </div>
@@ -182,7 +182,7 @@
 </template>
 
 <script lang="ts">
-import { Component, Prop, Vue } from "vue-facing-decorator";
+import { Component, Prop, Vue, Emit } from "vue-facing-decorator";
 import { GiveRecordWithContactInfo } from "../types";
 import EntityIcon from "./EntityIcon.vue";
 import { isGiveClaimType, notifyWhyCannotConfirm } from "../libs/util";
@@ -202,6 +202,11 @@ export default class ActivityListItem extends Vue {
   @Prop() activeDid!: string;
   @Prop() confirmerIdList?: string[];
 
+  @Emit()
+  cacheImage(image: string) {
+    return image;
+  }
+
   get fetchAmount(): string {
     const claim =
       (this.record.fullClaim as unknown).claim || this.record.fullClaim;
diff --git a/src/services/QRScanner/CapacitorQRScanner.ts b/src/services/QRScanner/CapacitorQRScanner.ts
index 0161bd4c..57b84455 100644
--- a/src/services/QRScanner/CapacitorQRScanner.ts
+++ b/src/services/QRScanner/CapacitorQRScanner.ts
@@ -19,8 +19,11 @@ export class CapacitorQRScanner implements QRScannerService {
       const { camera } = await BarcodeScanner.checkPermissions();
       return camera === "granted";
     } catch (error) {
-      const wrappedError = error instanceof Error ? error : new Error(String(error));
-      logger.error("Error checking camera permissions:", { error: wrappedError.message });
+      const wrappedError =
+        error instanceof Error ? error : new Error(String(error));
+      logger.error("Error checking camera permissions:", {
+        error: wrappedError.message,
+      });
       return false;
     }
   }
@@ -39,8 +42,11 @@ export class CapacitorQRScanner implements QRScannerService {
       logger.debug(`Camera permissions ${granted ? "granted" : "denied"}`);
       return granted;
     } catch (error) {
-      const wrappedError = error instanceof Error ? error : new Error(String(error));
-      logger.error("Error requesting camera permissions:", { error: wrappedError.message });
+      const wrappedError =
+        error instanceof Error ? error : new Error(String(error));
+      logger.error("Error requesting camera permissions:", {
+        error: wrappedError.message,
+      });
       return false;
     }
   }
@@ -52,8 +58,11 @@ export class CapacitorQRScanner implements QRScannerService {
       logger.debug(`Scanner support: ${supported}`);
       return supported;
     } catch (error) {
-      const wrappedError = error instanceof Error ? error : new Error(String(error));
-      logger.error("Error checking scanner support:", { error: wrappedError.message });
+      const wrappedError =
+        error instanceof Error ? error : new Error(String(error));
+      logger.error("Error checking scanner support:", {
+        error: wrappedError.message,
+      });
       return false;
     }
   }
@@ -89,27 +98,32 @@ export class CapacitorQRScanner implements QRScannerService {
 
       const scanOptions: StartScanOptions = {
         formats: [BarcodeFormat.QrCode],
-        lensFacing: options?.camera === "front" ? LensFacing.Front : LensFacing.Back,
+        lensFacing:
+          options?.camera === "front" ? LensFacing.Front : LensFacing.Back,
       };
 
       logger.debug("Scanner options:", scanOptions);
 
       // Add listener for barcode scans
-      const handle = await BarcodeScanner.addListener("barcodeScanned", (result) => {
-        if (this.scanListener && result.barcode?.rawValue) {
-          this.scanListener.onScan(result.barcode.rawValue);
-        }
-      });
+      const handle = await BarcodeScanner.addListener(
+        "barcodeScanned",
+        (result) => {
+          if (this.scanListener && result.barcode?.rawValue) {
+            this.scanListener.onScan(result.barcode.rawValue);
+          }
+        },
+      );
       this.listenerHandles.push(handle.remove);
 
       // Start continuous scanning
       await BarcodeScanner.startScan(scanOptions);
       logger.info("MLKit scanner started successfully");
     } catch (error) {
-      const wrappedError = error instanceof Error ? error : new Error(String(error));
-      logger.error("Error during QR scan:", { 
+      const wrappedError =
+        error instanceof Error ? error : new Error(String(error));
+      logger.error("Error during QR scan:", {
         error: wrappedError.message,
-        stack: wrappedError.stack 
+        stack: wrappedError.stack,
       });
       this.isScanning = false;
       await this.cleanup();
@@ -129,10 +143,11 @@ export class CapacitorQRScanner implements QRScannerService {
       await BarcodeScanner.stopScan();
       logger.info("QR scanner stopped successfully");
     } catch (error) {
-      const wrappedError = error instanceof Error ? error : new Error(String(error));
-      logger.error("Error stopping QR scan:", { 
+      const wrappedError =
+        error instanceof Error ? error : new Error(String(error));
+      logger.error("Error stopping QR scan:", {
         error: wrappedError.message,
-        stack: wrappedError.stack 
+        stack: wrappedError.stack,
       });
       this.scanListener?.onError?.(wrappedError);
       throw wrappedError;
@@ -154,7 +169,7 @@ export class CapacitorQRScanner implements QRScannerService {
     this.cleanupPromise = (async () => {
       try {
         logger.debug("Starting QR scanner cleanup");
-        
+
         // Stop scanning if active
         if (this.isScanning) {
           await this.stopScan();
@@ -171,10 +186,11 @@ export class CapacitorQRScanner implements QRScannerService {
 
         logger.info("QR scanner cleanup completed");
       } catch (error) {
-        const wrappedError = error instanceof Error ? error : new Error(String(error));
-        logger.error("Error during cleanup:", { 
+        const wrappedError =
+          error instanceof Error ? error : new Error(String(error));
+        logger.error("Error during cleanup:", {
           error: wrappedError.message,
-          stack: wrappedError.stack 
+          stack: wrappedError.stack,
         });
         throw wrappedError;
       } finally {
diff --git a/src/services/QRScanner/WebDialogQRScanner.ts b/src/services/QRScanner/WebDialogQRScanner.ts
index bf592fab..996c0867 100644
--- a/src/services/QRScanner/WebDialogQRScanner.ts
+++ b/src/services/QRScanner/WebDialogQRScanner.ts
@@ -32,9 +32,10 @@ export class WebDialogQRScanner implements QRScannerService {
       stream.getTracks().forEach((track) => track.stop());
       return true;
     } catch (error) {
-      const wrappedError =
-        error instanceof Error ? error : new Error(String(error));
-      logger.error("Error requesting camera permissions:", wrappedError);
+      logger.error("Error requesting camera permissions:", {
+        error: error instanceof Error ? error.message : String(error),
+        stack: error instanceof Error ? error.stack : undefined,
+      });
       return false;
     }
   }
diff --git a/src/views/ContactQRScanShowView.vue b/src/views/ContactQRScanShowView.vue
index d9b5be8c..1484378b 100644
--- a/src/views/ContactQRScanShowView.vue
+++ b/src/views/ContactQRScanShowView.vue
@@ -114,7 +114,6 @@ import { MASTER_SETTINGS_KEY } from "../db/tables/settings";
 import { getContactJwtFromJwtUrl } from "../libs/crypto";
 import {
   generateEndorserJwtUrlForAccount,
-  isDid,
   register,
   setVisibilityUtil,
 } from "../libs/endorserServer";
@@ -170,12 +169,15 @@ export default class ContactQRScanShow extends Vue {
       this.activeDid = settings.activeDid || "";
       this.apiServer = settings.apiServer || "";
       this.givenName = settings.firstName || "";
-      this.hideRegisterPromptOnNewContact = !!settings.hideRegisterPromptOnNewContact;
+      this.hideRegisterPromptOnNewContact =
+        !!settings.hideRegisterPromptOnNewContact;
       this.isRegistered = !!settings.isRegistered;
 
       const account = await retrieveAccountMetadata(this.activeDid);
       if (account) {
-        const name = (settings.firstName || "") + (settings.lastName ? ` ${settings.lastName}` : "");
+        const name =
+          (settings.firstName || "") +
+          (settings.lastName ? ` ${settings.lastName}` : "");
         this.qrValue = await generateEndorserJwtUrlForAccount(
           account,
           !!settings.isRegistered,
@@ -294,7 +296,10 @@ export default class ContactQRScanShow extends Vue {
   async onScanDetect(result: string | QRScanResult) {
     try {
       // Extract raw value from different possible formats
-      const rawValue = typeof result === 'string' ? result : (result?.rawValue || result?.barcode);
+      const rawValue =
+        typeof result === "string"
+          ? result
+          : result?.rawValue || result?.barcode;
       if (!rawValue) {
         logger.warn("Invalid scan result - no value found:", result);
         return;
@@ -558,7 +563,7 @@ export default class ContactQRScanShow extends Vue {
 
   async handleAppPause() {
     if (!this.isMounted) return;
-    
+
     logger.info("App paused, stopping scanner");
     await this.stopScanning();
   }
@@ -574,11 +579,13 @@ export default class ContactQRScanShow extends Vue {
     try {
       logger.info("Opening database connection for new contact");
       await db.open();
-      
+
       // Check if contact already exists
       const existingContacts = await db.contacts.toArray();
-      const existingContact = existingContacts.find(c => c.did === contact.did);
-      
+      const existingContact = existingContacts.find(
+        (c) => c.did === contact.did,
+      );
+
       if (existingContact) {
         logger.info("Contact already exists", { did: contact.did });
         this.$notify(
@@ -676,4 +683,3 @@ export default class ContactQRScanShow extends Vue {
   aspect-ratio: 1 / 1;
 }
 </style>
-
diff --git a/src/views/ContactsView.vue b/src/views/ContactsView.vue
index 9081effb..c59e13ee 100644
--- a/src/views/ContactsView.vue
+++ b/src/views/ContactsView.vue
@@ -289,7 +289,7 @@
               class="text-sm bg-gradient-to-b from-slate-400 to-slate-700 shadow-[inset_0_-1px_0_0_rgba(0,0,0,0.5)] text-white px-2 py-1.5 rounded-md border border-slate-400"
               title="See more given activity"
             >
-              <fa icon="file-lines" class="fa-fw" />
+              <font-awesome icon="file-lines" class="fa-fw" />
             </router-link>
           </div>
         </div>