Merge branch 'develop' into fix-sonarcloud

MetaMask · Oct 3, 2024 · 07a82cb · 07a82cb
2 parents a9e4f59 + 537b3fe
commit 07a82cb
Show file tree

Hide file tree

Showing 256 changed files with 4,982 additions and 2,232 deletions.
diff --git a/.storybook/test-data.js b/.storybook/test-data.js
@@ -676,7 +676,7 @@ const state = {
     welcomeScreenSeen: false,
     currentLocale: 'en',
     preferences: {
-      useNativeCurrencyAsPrimaryCurrency: true,
+      showNativeTokenAsMainBalance: true,
     },
     incomingTransactionsPreferences: {
       [CHAIN_IDS.MAINNET]: true,

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/bn/messages.json b/app/_locales/bn/messages.json
diff --git a/app/_locales/ca/messages.json b/app/_locales/ca/messages.json
diff --git a/app/_locales/cs/messages.json b/app/_locales/cs/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/en_GB/messages.json b/app/_locales/en_GB/messages.json