Merge branch 'develop' into update/picker-network

MetaMask · Oct 2, 2023 · cc1026b · cc1026b
2 parents 3107566 + 0107c2c
commit cc1026b
Show file tree

Hide file tree

Showing 118 changed files with 2,951 additions and 1,738 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,7 +9,7 @@
 
 *                                    @MetaMask/extension-devs
 **/snaps/**                          @MetaMask/snaps-devs
-**/flask/**                          @MetaMask/snaps-devs
+**/flask/**                          @MetaMask/extension-devs @MetaMask/snaps-devs
 development/                         @MetaMask/extension-devs @kumavis
 lavamoat/                            @MetaMask/extension-devs @MetaMask/supply-chain @MetaMask/snaps-devs
 

diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -1062,12 +1062,6 @@ const state = {
     unapprovedEncryptionPublicKeyMsgCount: 0,
     unapprovedTypedMessages: {},
     unapprovedTypedMessagesCount: 0,
-    keyringTypes: [
-      KeyringType.imported,
-      KeyringType.hdKeyTree,
-      KeyringType.trezor,
-      KeyringType.ledger,
-    ],
     keyrings: [
       {
         type: KeyringType.hdKeyTree,

diff --git a/.yarn/patches/@metamask-keyring-controller-npm-8.0.0-806630ae4e.patch b/.yarn/patches/@metamask-keyring-controller-npm-8.0.0-806630ae4e.patch
diff --git a/.yarn/patches/@metamask-signature-controller-npm-5.3.0-225628460b.patch b/.yarn/patches/@metamask-signature-controller-npm-5.3.0-225628460b.patch
diff --git a/.yarn/patches/@metamask-signature-controller-npm-6.0.0-90e8e479a9.patch b/.yarn/patches/@metamask-signature-controller-npm-6.0.0-90e8e479a9.patch
@@ -0,0 +1,17 @@
+diff --git a/dist/SignatureController.js b/dist/SignatureController.js
+index 46d4b4d0553f86d368d30b7e90a9dc2e03d26ef9..e7063a3753bc3821e661c11132e33304b4fce416 100644
+--- a/dist/SignatureController.js
++++ b/dist/SignatureController.js
+@@ -280,8 +280,11 @@ _SignatureController_isEthSignEnabled = new WeakMap(), _SignatureController_getA
+                 resultCallbacks = acceptResult.resultCallbacks;
+             }
+             catch (_a) {
++                signaturePromise.catch(() => {
++                    // Expecting reject error but throwing manually rather than waiting
++                });
+                 __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_cancelAbstractMessage).call(this, messageManager, messageId);
+-                throw eth_rpc_errors_1.ethErrors.provider.userRejectedRequest('User rejected the request.');
++                throw eth_rpc_errors_1.ethErrors.provider.userRejectedRequest(`MetaMask ${messageName} Signature: User denied message signature.`);
+             }
+             yield signMessage(messageParamsWithId, signingOpts);
+             const signatureResult = yield signaturePromise;
diff --git a/app/_locales/de/messages.json b/app/_locales/de/messages.json
diff --git a/app/_locales/el/messages.json b/app/_locales/el/messages.json
diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json
diff --git a/app/_locales/es/messages.json b/app/_locales/es/messages.json
diff --git a/app/_locales/es_419/messages.json b/app/_locales/es_419/messages.json
diff --git a/app/_locales/fr/messages.json b/app/_locales/fr/messages.json