Merge remote-tracking branch 'origin' into feature/ngrave-copy

.circleci/config.yml

@@ -1037,14 +1037,16 @@ jobs:
       - run:
           name: test:e2e:chrome
           command: |
-            if .circleci/scripts/test-run-e2e.sh
-            then
-              timeout 20m yarn test:e2e:chrome --retries 2 || echo "Temporarily suppressing MV3 e2e test failures"
+            export ENABLE_MV3=true
+            if .circleci/scripts/test-run-e2e.sh; then
+              timeout 20m yarn test:e2e:chrome --retries 2
             fi
           no_output_timeout: 5m
       - store_artifacts:
           path: test-artifacts
           destination: test-artifacts
+      - store_test_results:
+                path: test/test-results/e2e
 
   test-e2e-chrome-rpc:
     executor: node-browsers-medium

.depcheckrc.yml

@@ -62,6 +62,8 @@ ignores:
   - 'jest-environment-jsdom'
   # babel
   - '@babel/plugin-transform-logical-assignment-operators'
+  # trezor
+  - 'ts-mixer'
 
 # files depcheck should not parse
 ignorePatterns:

.github/CODEOWNERS

@@ -52,8 +52,8 @@ privacy-snapshot.json                @MetaMask/extension-privacy-reviewers
 # who were involved with the Codespaces project.
 .devcontainer/                       @MetaMask/library-admins @HowardBraham @plasmacorral
 
-# Confirmations UX team to own code for confirmations on UI.
-ui/pages/confirmations               @MetaMask/confirmations-ux @MetaMask/confirmations-system-team
+# Confirmations team to own code for confirmations on UI.
+ui/pages/confirmations               @MetaMask/confirmations
 
 # MMI team is responsible for code related with Institutioanl version of MetaMask
 ui/pages/institutional               @MetaMask/mmi

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -105,6 +105,7 @@ body:
        - GridPlus Lattice1
        - AirGap Vault
        - imToken
+       - OneKey
        - Other (please elaborate in the "Additional Context" section)
  - type: textarea
    id: additional

.metamaskrc.dist

@@ -21,7 +21,8 @@ BLOCKAID_PUBLIC_KEY=
 ; SELENIUM_HEADLESS=
 ; Set this to 1 to make chrome e2e tests disable DoH/DoT and use system DNS
 ; SELENIUM_USE_SYSTEM_DNS=
-
+; Set this to true to enable the snap path for the Firefox WebDriver (Linux)
+; FIREFOX_SNAP=
 
 ENABLE_CONFIRMATION_REDESIGN=
 

.vscode/package.json-schema.json

@@ -32,6 +32,16 @@
               "description": "Defines which dependencies' scripts are allowed to run upon install. If this setting is true, the scripts are allowed. If false, the scripts are not allowed. Run `yarn allow-scripts auto` to add a dependency to this list (defaults to false)."
             }
           }
+        },
+        "resolutions": {
+          "type": "object",
+          "required": ["ts-mixer@npm:^6.0.3"],
+          "properties": {
+            "ts-mixer@npm:^6.0.3": {
+              "type": "string",
+              "description": "ts-mixer exports a `browser` field that points to the ESM version, but our build system can't process it. This resolution and patch file forces the CommonJS version to be used instead."
+            }
+          }
         }
       }
     }

.yarn/patches/@trezor-connect-web-npm-9.2.2-a4de8e45fc.patch

@@ -0,0 +1,43 @@
+diff --git a/lib/index.js b/lib/index.js
+index 82a21b70dc18597fdbb1c5bfdbebb10f615c723d..04edf4b3a8a5a2bebda8bf907225b502ab5c30ad 100644
+--- a/lib/index.js
++++ b/lib/index.js
+@@ -109,7 +109,9 @@ const init = async (settings = {}) => {
+     _log.enabled = !!_settings.debug;
+     window.addEventListener('message', handleMessage);
+     window.addEventListener('unload', dispose);
+-    await iframe.init(_settings);
++    var modifiedSettings = Object.assign({}, _settings);
++    modifiedSettings.env = 'webextension';
++    await iframe.init(modifiedSettings);
+     if (_settings.sharedLogger !== false) {
+         iframe.initIframeLogger();
+     }
+@@ -125,7 +127,9 @@ const call = async (params) => {
+         }
+         _popupManager.request();
+         try {
+-            await init(_settings);
++            var modifiedSettings = Object.assign({}, _settings);
++            modifiedSettings.env = 'webextension';
++            await init(modifiedSettings);
+         }
+         catch (error) {
+             if (_popupManager) {
+diff --git a/lib/popup/index.js b/lib/popup/index.js
+index 6948bdb73b381bb72fb8b87fe2006d0046b65acb..d8f80f77728a18a851da3f03a5ed956cb46fe8e6 100644
+--- a/lib/popup/index.js
++++ b/lib/popup/index.js
+@@ -272,9 +272,11 @@ class PopupManager extends events_1.default {
+                 this.popupPromise.resolve();
+             }
+             (_b = this.iframeHandshakePromise) === null || _b === void 0 ? void 0 : _b.promise.then(payload => {
++                var modifiedSettings = Object.assign({}, this.settings);
++                modifiedSettings.env = 'webextension';
+                 this.channel.postMessage({
+                     type: events_2.POPUP.INIT,
+-                    payload: Object.assign(Object.assign({}, payload), { settings: this.settings }),
++                    payload: Object.assign(Object.assign({}, payload), { settings: modifiedSettings }),
+                 });
+             });
+         }

.yarn/patches/@trezor-schema-utils-npm-1.0.1-70c2a68232.patch → .yarn/patches/@trezor-schema-utils-npm-1.0.2-7dd48689b2.patch

@@ -1,5 +1,5 @@
 diff --git a/lib/index.js b/lib/index.js
-index b7a810396d6c0dad839fc08f1e192f5df134879f..93cb54be0f33c77e9f801f1c23330eb0fc65bb38 100644
+index b7a810396d6c0dad839fc08f1e192f5df134879f..14c6b3afaf1ca1d2805bea6c136cf9e48881db33 100644
 --- a/lib/index.js
 +++ b/lib/index.js
 @@ -4,7 +4,7 @@ exports.Optional = exports.Type = exports.AssertWeak = exports.Assert = exports.

.yarn/patches/ts-mixer-npm-6.0.4-5d9747bdf5.patch

@@ -0,0 +1,12 @@
+diff --git a/package.json b/package.json
+index 0f83178c00d4168f35241589d2e77c8a874ed4bd..f0ff8911f5366f9cb05c64e73fe38c4b3e9a74a7 100644
+--- a/package.json
++++ b/package.json
+@@ -4,7 +4,6 @@
+   "description": "A very small TypeScript library that provides tolerable Mixin functionality.",
+   "main": "dist/cjs/index.js",
+   "module": "dist/esm/index.js",
+-  "browser": "dist/esm/index.js",
+   "unpkg": "dist/esm/index.min.js",
+   "types": "dist/types/index.d.ts",
+   "files": [

README.md

@@ -133,6 +133,7 @@ Note: The `yarn start:test` command (which initiates the testDev build type) has
 Once you have your test build ready, choose the browser for your e2e tests:
 
 - For Firefox, run `yarn test:e2e:firefox`.
+  - Note:  If you are running Firefox as a snap package on Linux, ensure you enable the appropriate environment variable: `FIREFOX_SNAP=true yarn test:e2e:firefox`
 - For Chrome, run `yarn test:e2e:chrome`.
 
 These scripts support additional options for debugging. Use `--help`to see all available options.