Merge branch 'develop' into 17191-onboarding-unit-tests-creation-succ…

…cessful
MetaMask · Mar 23, 2023 · ed5ea12 · ed5ea12
2 parents 6aebcd6 + 99bdf84
commit ed5ea12
Show file tree

Hide file tree

Showing 144 changed files with 3,397 additions and 1,821 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/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [10.26.2]
+### Changed
+- Sign in with Ethereum: re-enable warning UI for mismatched domains / disable domain binding ([#18200](https://github.com/MetaMask/metamask-extension/pull/18200))
+
 ## [10.26.1]
 ### Fixed
 - Fix main build by modifying desktop build steps ([#18112](https://github.com/MetaMask/metamask-extension/pull/18112))
@@ -3532,7 +3536,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Uncategorized
 - Added the ability to restore accounts from seed words.
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.26.1...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v10.26.2...HEAD
+[10.26.2]: https://github.com/MetaMask/metamask-extension/compare/v10.26.1...v10.26.2
 [10.26.1]: https://github.com/MetaMask/metamask-extension/compare/v10.26.0...v10.26.1
 [10.26.0]: https://github.com/MetaMask/metamask-extension/compare/v10.25.0...v10.26.0
 [10.25.0]: https://github.com/MetaMask/metamask-extension/compare/v10.24.2...v10.25.0

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