From 7322cf2014f20b21ba57a0d13e072dfeb28c5e18 Mon Sep 17 00:00:00 2001
From: Miles Blackwood <mrobinson@bitwarden.com>
Date: Thu, 22 May 2025 13:44:15 -0400
Subject: [PATCH] Clarify that notification disqualification is not an error.

---
 .../overlay-notifications.background.ts       | 69 +++++++++----------
 1 file changed, 32 insertions(+), 37 deletions(-)

diff --git a/apps/browser/src/autofill/background/overlay-notifications.background.ts b/apps/browser/src/autofill/background/overlay-notifications.background.ts
index 5d52d52bd19..1e3d52a1ca3 100644
--- a/apps/browser/src/autofill/background/overlay-notifications.background.ts
+++ b/apps/browser/src/autofill/background/overlay-notifications.background.ts
@@ -413,53 +413,45 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
     modifyLoginData: ModifyLoginCipherFormData,
     tab: chrome.tabs.Tab,
   ) => {
-    let error: string;
+    let result: string;
     if (this.shouldAttemptChangedPasswordNotification(modifyLoginData)) {
       // These notifications are temporarily setup as "messages" to the notification background.
       // This will be structured differently in a future refactor.
-      try {
-        const result = await this.notificationBackground.triggerChangedPasswordNotification(
-          {
-            command: "bgChangedPassword",
-            data: {
-              url: modifyLoginData.uri,
-              currentPassword: modifyLoginData.password,
-              newPassword: modifyLoginData.newPassword,
-            },
+      const success = await this.notificationBackground.triggerChangedPasswordNotification(
+        {
+          command: "bgChangedPassword",
+          data: {
+            url: modifyLoginData.uri,
+            currentPassword: modifyLoginData.password,
+            newPassword: modifyLoginData.newPassword,
           },
-          { tab },
-        );
-        if (!result) {
-          throw Error("Didn't trigger changedPassword ");
-        }
-      } catch (e) {
-        error = e;
+        },
+        { tab },
+      );
+      if (success) {
+        this.clearCompletedWebRequest(requestId, tab);
+      } else {
+        result = "Unqualified changedPassword notification attempt.";
       }
-      this.clearCompletedWebRequest(requestId, tab);
-      return;
     }
 
     if (this.shouldAttemptAddLoginNotification(modifyLoginData)) {
-      try {
-        const result = await this.notificationBackground.triggerAddLoginNotification(
-          {
-            command: "bgTriggerAddLoginNotification",
-            login: {
-              url: modifyLoginData.uri,
-              username: modifyLoginData.username,
-              password: modifyLoginData.password || modifyLoginData.newPassword,
-            },
+      const success = await this.notificationBackground.triggerAddLoginNotification(
+        {
+          command: "bgTriggerAddLoginNotification",
+          login: {
+            url: modifyLoginData.uri,
+            username: modifyLoginData.username,
+            password: modifyLoginData.password || modifyLoginData.newPassword,
           },
-          { tab },
-        );
-        if (!result) {
-          throw Error("Didn't trigger addLogin notification");
-        }
-      } catch (e) {
-        error = e;
+        },
+        { tab },
+      );
+      if (success) {
+        this.clearCompletedWebRequest(requestId, tab);
+      } else {
+        result = "Unqualified addLogin notification attempt.";
       }
-      this.clearCompletedWebRequest(requestId, tab);
-      return error;
     }
 
     const shouldGetTasks: boolean = await this.notificationBackground.getNotificationFlag();
@@ -487,8 +479,11 @@ export class OverlayNotificationsBackground implements OverlayNotificationsBackg
           { tab },
         );
         this.clearCompletedWebRequest(requestId, tab);
+      } else {
+        result = "Unqualified atRiskPassword notification attempt.";
       }
     }
+    return result;
   };
 
   /**