Merge branch 'develop' into 230920-update-readme-dev-build

.circleci/config.yml

@@ -125,6 +125,9 @@ workflows:
       - prep-build-test-flask:
           requires:
             - prep-deps
+      - prep-build-test-mmi:
+          requires:
+            - prep-deps
       - prep-build-storybook:
           requires:
             - prep-deps
@@ -162,6 +165,12 @@ workflows:
       - test-e2e-firefox-snaps-flask:
           requires:
             - prep-build-test-flask
+      - test-e2e-chrome-mmi:
+          requires:
+            - prep-build-test-mmi
+      - test-e2e-chrome-rpc-mmi:
+          requires:
+            - prep-build-test-mmi
       - test-e2e-chrome-mv3:
           requires:
             - prep-build-test-mv3
@@ -248,6 +257,8 @@ workflows:
             - test-e2e-firefox-snaps
             - test-e2e-chrome-snaps-flask
             - test-e2e-firefox-snaps-flask
+            - test-e2e-chrome-mmi
+            - test-e2e-chrome-rpc-mmi
             - test-storybook
       - benchmark:
           requires:
@@ -579,6 +590,27 @@ jobs:
             - dist-test-flask
             - builds-test-flask
 
+  prep-build-test-mmi:
+    executor: node-browsers-medium-plus
+    steps:
+      - run: *shallow-git-clone
+      - attach_workspace:
+          at: .
+      - run:
+          name: Build extension for testing
+          command: yarn build:test:mmi
+      - run:
+          name: Move test build to 'dist-test' to avoid conflict with production build
+          command: mv ./dist ./dist-test-mmi
+      - run:
+          name: Move test zips to 'builds-test' to avoid conflict with production build
+          command: mv ./builds ./builds-test-mmi
+      - persist_to_workspace:
+          root: .
+          paths:
+            - dist-test-mmi
+            - builds-test-mmi
+
   prep-build-test-mv3:
     executor: node-browsers-medium-plus
     steps:
@@ -855,6 +887,42 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e.xml
 
+  test-e2e-chrome-rpc-mmi:
+    executor: node-browsers
+    steps:
+      - checkout
+      - run:
+          name: Re-Install Chrome
+          command: ./.circleci/scripts/chrome-install.sh
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-mmi ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-mmi ./builds
+      - run:
+          name: test:e2e:chrome:rpc
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              yarn test:e2e:chrome:rpc --retries 2 --debug --build-type=mmi
+            fi
+          no_output_timeout: 20m
+      - run:
+          name: Merge JUnit report
+          command: |
+            if [ "$(ls -A test/test-results/e2e)" ]; then
+              yarn test:e2e:report
+            fi
+          when: always
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - store_test_results:
+          path: test/test-results/e2e.xml
+
   test-e2e-firefox-snaps:
     executor: node-browsers
     parallelism: 4
@@ -1003,6 +1071,43 @@ jobs:
       - store_test_results:
           path: test/test-results/e2e.xml
 
+  test-e2e-chrome-mmi:
+    executor: node-browsers
+    parallelism: 4
+    steps:
+      - run: *shallow-git-clone
+      - run:
+          name: Re-Install Chrome
+          command: ./.circleci/scripts/chrome-install.sh
+      - attach_workspace:
+          at: .
+      - run:
+          name: Move test build to dist
+          command: mv ./dist-test-mmi ./dist
+      - run:
+          name: Move test zips to builds
+          command: mv ./builds-test-mmi ./builds
+      - run:
+          name: test:e2e:chrome:mmi
+          command: |
+            if .circleci/scripts/test-run-e2e.sh
+            then
+              yarn test:e2e:chrome:mmi --retries 2 --debug --build-type=mmi
+            fi
+          no_output_timeout: 20m
+      - run:
+          name: Merge JUnit report
+          command: |
+            if [ "$(ls -A test/test-results/e2e)" ]; then
+              yarn test:e2e:report
+            fi
+          when: always
+      - store_artifacts:
+          path: test-artifacts
+          destination: test-artifacts
+      - store_test_results:
+          path: test/test-results/e2e.xml
+
   test-e2e-firefox:
     executor: node-browsers-medium-plus
     parallelism: 8

README.md

@@ -109,6 +109,16 @@ Single e2e tests can be run with `yarn test:e2e:single test/e2e/tests/TEST_NAME.
 For example, to run the `account-details` tests using Chrome, with debug logging and with the browser set to remain open upon failure, you would use:
 `yarn test:e2e:single test/e2e/tests/account-details.spec.js --browser=chrome --debug --leave-running`
 
+#### Running specific builds types e2e test
+
+Differnt build types have different e2e tests sets. In order to run them look in the `packaje.json` file. You will find:
+```console
+    "test:e2e:chrome:mmi": "SELENIUM_BROWSER=chrome node test/e2e/run-all.js --mmi",
+    "test:e2e:chrome:snaps": "SELENIUM_BROWSER=chrome node test/e2e/run-all.js --snaps",
+    "test:e2e:chrome:mv3": "SELENIUM_BROWSER=chrome node test/e2e/run-all.js --mv3",
+```
+Note: MMI runs a subset of MetaMask's e2e tests. To facilitate this, we have appended the `@no-mmi` tags to the names of those tests that are not applicable to this build type.
+
 ### Changing dependencies
 
 Whenever you change dependencies (adding, removing, or updating, either in `package.json` or `yarn.lock`), there are various files that must be kept up-to-date.

app/scripts/controllers/mmi-controller.js

@@ -345,7 +345,7 @@ export default class MMIController extends EventEmitter {
 
     // FIXME: status maps are not a thing anymore
     this.custodyController.storeCustodyStatusMap(
-      custodian.name,
+      custodian.envName,
       keyring.getStatusMap(),
     );
 

app/scripts/controllers/preferences.js

@@ -66,6 +66,9 @@ export default class PreferencesController {
       ///: BEGIN:ONLY_INCLUDE_IN(blockaid)
       securityAlertsEnabled: false,
       ///: END:ONLY_INCLUDE_IN
+      ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
+      addSnapAccountEnabled: false,
+      ///: END:ONLY_INCLUDE_IN
       advancedGasFee: {},
 
       // WARNING: Do not use feature flags for security-sensitive things.
@@ -240,6 +243,20 @@ export default class PreferencesController {
   }
   ///: END:ONLY_INCLUDE_IN
 
+  ///: BEGIN:ONLY_INCLUDE_IN(keyring-snaps)
+  /**
+   * Setter for the `addSnapAccountEnabled` property.
+   *
+   * @param {boolean} addSnapAccountEnabled - Whether or not the user wants to
+   * enable the "Add Snap accounts" button.
+   */
+  setAddSnapAccountEnabled(addSnapAccountEnabled) {
+    this.store.updateState({
+      addSnapAccountEnabled,
+    });
+  }
+  ///: END:ONLY_INCLUDE_IN
+
   /**
    * Setter for the `advancedGasFee` property
    *