Merge branch 'develop' into component-library-storybook

MetaMask · Jun 5, 2023 · a0de350 · a0de350
2 parents 8cdc881 + 16e07b5
commit a0de350
Show file tree

Hide file tree

Showing 91 changed files with 1,587 additions and 643 deletions.
diff --git a/.yarn/patches/@metamask-signature-controller-npm-2.0.0-f441f2596e.patch b/.yarn/patches/@metamask-signature-controller-npm-2.0.0-f441f2596e.patch
@@ -0,0 +1,15 @@
+diff --git a/dist/SignatureController.js b/dist/SignatureController.js
+index 59dc5974218e8d073b65969154f35ada3fd9e8ab..5b16d09dcacf49caa15d11c9db7c34569eb36412 100644
+--- a/dist/SignatureController.js
++++ b/dist/SignatureController.js
+@@ -302,9 +302,9 @@ _SignatureController_keyringController = new WeakMap(), _SignatureController_isE
+         const messageId = msgParams.metamaskId;
+         try {
+             const cleanMessageParams = yield messageManager.approveMessage(msgParams);
++            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_acceptApproval).call(this, messageId);
+             const signature = yield getSignature(cleanMessageParams);
+             messageManager.setMessageStatusSigned(messageId, signature);
+-            __classPrivateFieldGet(this, _SignatureController_instances, "m", _SignatureController_acceptApproval).call(this, messageId);
+             return __classPrivateFieldGet(this, _SignatureController_getAllState, "f").call(this);
+         }
+         catch (error) {
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/fr/messages.json b/app/_locales/fr/messages.json
diff --git a/app/_locales/hi/messages.json b/app/_locales/hi/messages.json
diff --git a/app/_locales/id/messages.json b/app/_locales/id/messages.json
diff --git a/app/_locales/it/messages.json b/app/_locales/it/messages.json
diff --git a/app/_locales/ja/messages.json b/app/_locales/ja/messages.json
diff --git a/app/_locales/ko/messages.json b/app/_locales/ko/messages.json
diff --git a/app/_locales/pt/messages.json b/app/_locales/pt/messages.json
diff --git a/app/_locales/ru/messages.json b/app/_locales/ru/messages.json
diff --git a/app/_locales/tl/messages.json b/app/_locales/tl/messages.json
diff --git a/app/_locales/tr/messages.json b/app/_locales/tr/messages.json
diff --git a/app/_locales/vi/messages.json b/app/_locales/vi/messages.json
diff --git a/app/_locales/zh_CN/messages.json b/app/_locales/zh_CN/messages.json