From 2844e06aa83ac959da9eb2dd01db3d2fcdbc933f Mon Sep 17 00:00:00 2001
From: Daniel James Smith <djsmith85@users.noreply.github.com>
Date: Mon, 7 Feb 2022 11:31:18 +0100
Subject: [PATCH] Fix regression in notificationBar (#2314)

---
 src/content/notificationBar.ts | 35 +++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/content/notificationBar.ts b/src/content/notificationBar.ts
index 141021d6f9..ecc6e61c92 100644
--- a/src/content/notificationBar.ts
+++ b/src/content/notificationBar.ts
@@ -48,23 +48,32 @@ document.addEventListener("DOMContentLoaded", (event) => {
   let disabledAddLoginNotification = false;
   let disabledChangedPasswordNotification = false;
 
-  chrome.storage.local.get("neverDomains", (ndObj: any) => {
-    const domains = ndObj.neverDomains;
+  const activeUserIdKey = "activeUserId";
+  let activeUserId: string;
+  chrome.storage.local.get(activeUserIdKey, (obj: any) => {
+    if (obj == null || obj[activeUserIdKey] == null) {
+      return;
+    }
+    activeUserId = obj[activeUserIdKey];
+  });
+
+  chrome.storage.local.get(activeUserId, (obj: any) => {
+    if (obj === null) {
+      return;
+    }
+
+    const domains = obj[activeUserId].settings.neverDomains;
     if (domains != null && domains.hasOwnProperty(window.location.hostname)) {
       return;
     }
 
-    chrome.storage.local.get("disableAddLoginNotification", (disAddObj: any) => {
-      disabledAddLoginNotification =
-        disAddObj != null && disAddObj.disableAddLoginNotification === true;
-      chrome.storage.local.get("disableChangedPasswordNotification", (disChangedObj: any) => {
-        disabledChangedPasswordNotification =
-          disChangedObj != null && disChangedObj.disableChangedPasswordNotification === true;
-        if (!disabledAddLoginNotification || !disabledChangedPasswordNotification) {
-          collectIfNeededWithTimeout();
-        }
-      });
-    });
+    disabledAddLoginNotification = obj[activeUserId].settings.disableAddLoginNotification;
+    disabledChangedPasswordNotification =
+      obj[activeUserId].settings.disableChangedPasswordNotification;
+
+    if (!disabledAddLoginNotification || !disabledChangedPasswordNotification) {
+      collectIfNeededWithTimeout();
+    }
   });
 
   chrome.runtime.onMessage.addListener((msg: any, sender: any, sendResponse: Function) => {