Merge branch 'develop' into 17191/onboarding-unit-tests-create-new-vault

MetaMask · Mar 22, 2023 · 47809c9 · 47809c9
2 parents 9a68b05 + b9f00ba
commit 47809c9
Show file tree

Hide file tree

Showing 100 changed files with 1,122 additions and 330 deletions.
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -1,5 +1,5 @@
 import { draftTransactionInitialState } from '../ui/ducks/send';
-import { HardwareKeyringTypes } from '../shared/constants/hardware-wallets';
+import { KeyringType } from '../shared/constants/keyring';
 
 const state = {
   invalidCustomNetwork: {
@@ -1168,14 +1168,14 @@ const state = {
     unapprovedTypedMessages: {},
     unapprovedTypedMessagesCount: 0,
     keyringTypes: [
-      HardwareKeyringTypes.imported,
-      HardwareKeyringTypes.hdKeyTree,
-      HardwareKeyringTypes.trezor,
-      HardwareKeyringTypes.ledger,
+      KeyringType.imported,
+      KeyringType.hdKeyTree,
+      KeyringType.trezor,
+      KeyringType.ledger,
     ],
     keyrings: [
       {
-        type: HardwareKeyringTypes.hdKeyTree,
+        type: KeyringType.hdKeyTree,
         accounts: [
           '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
           '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',

diff --git a/app/_locales/am/messages.json b/app/_locales/am/messages.json
diff --git a/app/_locales/ar/messages.json b/app/_locales/ar/messages.json
diff --git a/app/_locales/bg/messages.json b/app/_locales/bg/messages.json
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
diff --git a/app/_locales/da/messages.json b/app/_locales/da/messages.json
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/et/messages.json b/app/_locales/et/messages.json
diff --git a/app/_locales/fa/messages.json b/app/_locales/fa/messages.json
diff --git a/app/_locales/fi/messages.json b/app/_locales/fi/messages.json