Merge branch 'develop' into mv3-dapp-sendMessage-after-SW-inactivity

Author: legobeat

development/generate-lavamoat-policies.js

@@ -11,7 +11,7 @@ start().catch((error) => {
 
 async function start() {
   const {
-    argv: { buildTypes, parallel },
+    argv: { buildTypes, parallel, devMode },
   } = yargs(hideBin(process.argv)).usage(
     '$0 [options]',
     'Generate the LavaMoat policy file for one more more build types.',
@@ -31,13 +31,22 @@ async function start() {
           description: 'Whether to generate policies in parallel.',
           type: 'boolean',
         })
+        .option('devMode', {
+          alias: ['d'],
+          default: false,
+          demandOption: true,
+          description:
+            'Whether to run the process under lavamoat (devMode=false) or node (devMode=true)',
+          type: 'boolean',
+        })
         .strict(),
   );
 
+  const buildCommand = devMode ? 'build:dev' : 'build';
   await concurrently(
     (Array.isArray(buildTypes) ? buildTypes : [buildTypes]).map(
       (buildType) => ({
-        command: `yarn build scripts:dist --policy-only --build-type=${buildType}`,
+        command: `yarn ${buildCommand} scripts:dist --policy-only --lint-fence-files=false --build-type=${buildType}`,
         env: {
           WRITE_AUTO_POLICY: 1,
         },

package.json

@@ -73,10 +73,10 @@
     "lavamoat:build": "lavamoat development/build/index.js --policy lavamoat/build-system/policy.json --policyOverride lavamoat/build-system/policy-override.json",
     "lavamoat:build:auto": "yarn lavamoat:build --writeAutoPolicy",
     "lavamoat:debug:build": "yarn lavamoat:build --writeAutoPolicyDebug --policydebug lavamoat/build-system/policy-debug.json",
-    "lavamoat:background:auto": "node ./development/generate-lavamoat-policies.js",
-    "lavamoat:background:auto:ci": "node ./development/generate-lavamoat-policies.js --parallel=false",
-    "lavamoat:auto": "yarn lavamoat:build:auto && yarn lavamoat:background:auto",
-    "lavamoat:auto:ci": "yarn lavamoat:build:auto && yarn lavamoat:background:auto:ci",
+    "lavamoat:webapp:auto": "node ./development/generate-lavamoat-policies.js --devMode=true",
+    "lavamoat:webapp:auto:ci": "node ./development/generate-lavamoat-policies.js --parallel=false",
+    "lavamoat:auto": "yarn lavamoat:build:auto && yarn lavamoat:webapp:auto",
+    "lavamoat:auto:ci": "yarn lavamoat:build:auto && yarn lavamoat:webapp:auto:ci",
     "ts-migration:enumerate": "ts-node development/ts-migration-dashboard/scripts/write-list-of-files-to-convert.ts",
     "ts-migration:dashboard:watch": "ts-node development/ts-migration-dashboard/scripts/build.ts --watch",
     "ts-migration:dashboard:build": "ts-node development/ts-migration-dashboard/scripts/build.ts",

ui/pages/home/home.component.js

@@ -58,9 +58,6 @@ import BetaHomeFooter from './beta/beta-home-footer.component';
 import FlaskHomeFooter from './flask/flask-home-footer.component';
 ///: END:ONLY_INCLUDE_IN
 
-const LEARN_MORE_URL =
-  'https://metamask.zendesk.com/hc/en-us/articles/360045129011-Intro-to-MetaMask-v8-extension';
-
 function shouldCloseNotificationPopup({
   isNotification,
   totalUnapprovedCount,
@@ -526,8 +523,12 @@ export default class Home extends PureComponent {
         }}
         footer={
           <>
-            <a href={LEARN_MORE_URL} target="_blank" rel="noopener noreferrer">
-              {t('learnMore')}
+            <a
+              href={ZENDESK_URLS.USER_GUIDE_DAPPS}
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              {t('learnMoreUpperCase')}
             </a>
             <Button
               type="primary"