Merge 7d99559a30 into 738f93da28

platform/mv3/extension/css/settings.css

@@ -9,12 +9,6 @@ body.firstRun .firstRun {
     display: block;
     padding: 8px;
     }
-body .firstRun > *:first-child {
-    margin-top: 0;
-    }
-body .firstRun > *:last-child {
-    margin-bottom: 0;
-    }
 h3 {
     margin: 1em 0;
     }

platform/mv3/extension/js/background.js

@@ -93,11 +93,7 @@ async function hasGreatPowers(origin) {
     });
 }
 
-async function hasOmnipotence() {
-    const manifest = runtime.getManifest();
-    const hasOmnipotence = Array.isArray(manifest.host_permissions) &&
-        manifest.host_permissions.includes('<all_urls>');
-    if ( hasOmnipotence ) { return true; }
+function hasOmnipotence() {
     return browser.permissions.contains({
         origins: [ '<all_urls>' ],
     });
@@ -440,15 +436,13 @@ async function start() {
             if ( afterLevel === MODE_OPTIMAL ) {
                 updateDynamicRules();
                 registerInjectables();
-                process.firstRun = false;
             }
+        }
+        const disableFirstRunPage = await adminRead('disableFirstRunPage');
+        if ( disableFirstRunPage !== true ) {
+            runtime.openOptionsPage();
         } else {
-            const disableFirstRunPage = await adminRead('disableFirstRunPage');
-            if ( disableFirstRunPage !== true ) {
-                runtime.openOptionsPage();
-            } else {
-                process.firstRun = false;
-            }
+            process.firstRun = false;
         }
     }
 

platform/mv3/extension/js/mode-manager.js

@@ -252,11 +252,10 @@ async function writeFilteringModeDetails(afterDetails) {
     localWrite('filteringModeDetails', data);
     sessionWrite('filteringModeDetails', data);
     readFilteringModeDetails.cache = unserializeModeDetails(data);
-    return Promise.all([
+
+    Promise.all([
         getDefaultFilteringMode(),
         getTrustedSites(),
-        localWrite('filteringModeDetails', data),
-        sessionWrite('filteringModeDetails', data),
     ]).then(results => {
         broadcastMessage({
             defaultFilteringMode: results[0],