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

MetaMask · Mar 22, 2023 · abba078 · abba078
2 parents 47809c9 + 735f86c
commit abba078
Show file tree

Hide file tree

Showing 52 changed files with 1,445 additions and 745 deletions.
diff --git a/.metamaskrc.dist b/.metamaskrc.dist
@@ -7,6 +7,7 @@ PUBNUB_PUB_KEY=
 PUBNUB_SUB_KEY=
 PORTFOLIO_URL=
 TRANSACTION_SECURITY_PROVIDER=
+MULTICHAIN=
 
 ; Set this to test changes to the phishing warning page.
 PHISHING_WARNING_PAGE_URL=
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -1179,9 +1179,12 @@ const state = {
         accounts: [
           '0x64a845a5b02460acf8a3d84503b0d68d028b4bb4',
           '0xb19ac54efa18cc3a14a5b821bfec73d284bf0c5e',
-          '0x9d0ba4ddac06032527b140912ec808ab9451b788',
         ],
       },
+      {
+        type: KeyringType.ledger,
+        accounts: ['0x9d0ba4ddac06032527b140912ec808ab9451b788'],
+      },
     ],
     networkConfigurations: {
       'test-networkConfigurationId-1': {

diff --git a/app/_locales/en/messages.json b/app/_locales/en/messages.json