enable shelf hiding only if extension is enabled

gautamkrishnar · Oct 22, 2023 · 3dfe5b0 · 3dfe5b0
1 parent 7b7513b
commit 3dfe5b0
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -9,8 +9,8 @@ async function downloadAgent() {
   const observable = new Observable((s) => subscribers.push(s));
   const history = new Map();
   // Hide bottom bar
-  browser.storage.sync.get(['hideChromeBar']).then(({ hideChromeBar }) => {
-    browser.downloads.setShelfEnabled?.(!hideChromeBar);
+  browser.storage.sync.get(['hideChromeBar', 'extensionStatus']).then(({ hideChromeBar, extensionStatus }) => {
+    if (extensionStatus) browser.downloads.setShelfEnabled?.(!hideChromeBar);
   });
   // Setup history
   const { oldHistory = [] } = await browser.storage.local.get(['history']);

diff --git a/app/scripts/config.js b/app/scripts/config.js
@@ -317,7 +317,7 @@ function ConfigView() {
             <Switch
               checked={hideChromeBar}
               onClick={() => {
-                if (browser.downloads.setShelfEnabled) {
+                if (browser.downloads.setShelfEnabled && extensionStatus) {
                   browser.downloads.setShelfEnabled(!!hideChromeBar);
                 }
                 browser.storage.sync.set({

diff --git a/app/scripts/popup.js b/app/scripts/popup.js
@@ -100,6 +100,7 @@ function PopupView() {
 
   const onExtensionStatusChange = (status) => {
     browser.storage.sync.set({ extensionStatus: status });
+    if (!status) browser.downloads.setShelfEnabled?.(true);
     setExtensionStatus(status);
   };