properly set promise thenable to avoid console warnings

brave · Oct 11, 2018 · 930d807 · 930d807
1 parent aed2d1d
commit 930d807
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/app/background/reducers/shieldsPanelReducer.ts b/app/background/reducers/shieldsPanelReducer.ts
@@ -142,7 +142,6 @@ export default function shieldsPanelReducer (state: State = { tabs: {}, windows:
         }
         setAllowBraveShields(tabData.origin, action.setting)
           .then(() => {
-            setAllowHTTPUpgradableResources(tabData.origin)
             reloadTab(tabId, true).catch(() => {
               console.error('Tab reload was not successful')
             })
@@ -151,6 +150,16 @@ export default function shieldsPanelReducer (state: State = { tabs: {}, windows:
           .catch(() => {
             console.error('Could not set shields')
           })
+        setAllowHTTPUpgradableResources(tabData.origin)
+          .then(() => {
+            requestShieldPanelData(shieldsPanelState.getActiveTabId(state))
+            reloadTab(tabData.id, true).catch(() => {
+              console.error('Tab reload was not successful')
+            })
+          })
+          .catch(() => {
+            console.error('Could not set HTTPS Everywhere setting')
+          })
         state = shieldsPanelState
           .updateTabShieldsData(state, tabId, { braveShields: action.setting })
         break