From 5ad8a6abb3ecff20c85f454e573f21a21c86adea Mon Sep 17 00:00:00 2001
From: Miles Blackwood <mrobinson@bitwarden.com>
Date: Mon, 11 Aug 2025 16:55:27 -0400
Subject: [PATCH] Error type fixes.

---
 .../background/notification.background.ts     | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/apps/browser/src/autofill/background/notification.background.ts b/apps/browser/src/autofill/background/notification.background.ts
index 08a6945aaae..904befe8a18 100644
--- a/apps/browser/src/autofill/background/notification.background.ts
+++ b/apps/browser/src/autofill/background/notification.background.ts
@@ -812,9 +812,7 @@ export default class NotificationBackground {
         continue;
       }
 
-      const activeUserId = await firstValueFrom(
-        this.accountService.activeAccount$.pipe(getOptionalUserId),
-      );
+      const activeUserId = await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId));
 
       if (queueMessage.type === NotificationQueueMessageType.ChangePassword) {
         const cipherView = await this.getDecryptedCipherById(queueMessage.cipherId, activeUserId);
@@ -868,8 +866,14 @@ export default class NotificationBackground {
         });
         await BrowserApi.tabSendMessage(tab, { command: "addedCipher" });
       } catch (error) {
+        let message;
+        if (error instanceof Error) {
+          message = error.message;
+        } else {
+          message = String(error);
+        }
         await BrowserApi.tabSendMessageData(tab, "saveCipherAttemptCompleted", {
-          error: (error as Error)?.message && String(error.message),
+          error: message,
         });
       }
     }
@@ -952,8 +956,14 @@ export default class NotificationBackground {
         );
       }
     } catch (error) {
+      let message;
+      if (error instanceof Error) {
+        message = error.message;
+      } else {
+        message = String(error);
+      }
       await BrowserApi.tabSendMessageData(tab, "saveCipherAttemptCompleted", {
-        error: (error as Error)?.message && String(error.message),
+        error: message,
       });
     }
   }
@@ -1033,7 +1043,10 @@ export default class NotificationBackground {
     return folders.some((x) => x.id === folderId);
   }
 
-  private async getDecryptedCipherById(cipherId: string, userId: UserId) {
+  private async getDecryptedCipherById(
+    cipherId: string,
+    userId: UserId,
+  ): Promise<CipherView | null> {
     const cipher = await this.cipherService.get(cipherId, userId);
     if (cipher != null && cipher.type === CipherType.Login) {
       return await this.cipherService.decrypt(cipher, userId);