Merge branch 'develop' into feature/MMI-2514-update-the-info-tab

MetaMask · Mar 1, 2023 · d5c1160 · d5c1160
2 parents 9013bad + 56cba09
commit d5c1160
Show file tree

Hide file tree

Showing 189 changed files with 4,044 additions and 4,858 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -177,6 +177,8 @@ workflows:
             - test-mozilla-lint-flask
             - test-e2e-chrome
             - test-e2e-firefox
+            - test-e2e-chrome-nft
+            - test-e2e-firefox-nft
             - test-e2e-chrome-snaps
             - test-e2e-firefox-snaps
             - test-storybook
@@ -817,7 +819,7 @@ jobs:
           destination: test-artifacts
       - store_test_results:
           path: test/test-results/e2e.xml
-          
+
   test-e2e-firefox-snaps:
     executor: node-browsers
     parallelism: 2

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