From aa9bb41305c29a3dd21a0c44d60763c1dd02a5d4 Mon Sep 17 00:00:00 2001
From: Cimbali <me@cimba.li>
Date: Mon, 11 Sep 2023 13:46:34 +0100
Subject: [PATCH 1/2] Do not resolve promise twice

---
 src/js/background/assignManager.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 617d5ca..614d480 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -61,8 +61,9 @@ window.assignManager = {
         this.area.get([siteStoreKey]).then((storageResponse) => {
           if (storageResponse && siteStoreKey in storageResponse) {
             resolve(storageResponse[siteStoreKey]);
+          } else {
+            resolve(null);
           }
-          resolve(null);
         }).catch((e) => {
           reject(e);
         });

From 6fcb828e1d971df76c4e6035a49b3bcf5d2087aa Mon Sep 17 00:00:00 2001
From: Cimbali <me@cimba.li>
Date: Mon, 11 Sep 2023 16:13:24 +0100
Subject: [PATCH 2/2] Fix error in function name

---
 src/js/background/assignManager.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/js/background/assignManager.js b/src/js/background/assignManager.js
index 614d480..0962a1d 100644
--- a/src/js/background/assignManager.js
+++ b/src/js/background/assignManager.js
@@ -639,7 +639,7 @@ window.assignManager = {
   },
 
   async _maybeRemoveSiteIsolation(userContextId) {
-    const assignments = await this.storageArea.getByContainer(userContextId);
+    const assignments = await this.storageArea.getAssignedSites(userContextId);
     const hasAssignments = assignments && Object.keys(assignments).length > 0;
     if (hasAssignments) {
       return;