Merge pull request #2572 from Cimbali/main

Small fixes
mozilla · Sep 26, 2024 · 037a804 · 037a804
2 parents 546ee7a + 6fcb828
commit 037a804
Showing 1 changed file with 3 additions and 2 deletions.
diff --git 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);
         });
@@ -638,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;