Merge branch 'main' into fix/font-size-increase

Author: brianacnguyen

.github/workflows/get-release-timelines.yml

@@ -6,13 +6,13 @@ on:
       version:
         required: true
         type: string
-        description: 'The version of the release'
+        description: The version of the release
 
 jobs:
   get-release-timelines:
-    uses: metamask/github-tools/.github/workflows/get-release-timelines.yml@3e0b0204e41b576263b9060945de3b3b9b8c5448
+    uses: metamask/github-tools/.github/workflows/get-release-timelines.yml@13b73c8c7dd15f38bacc1bb95401fe11914c6629
     with:
-      version: ${{ github.event.inputs.version }}
+      version: ${{ inputs.version }}
     secrets:
-      RUNWAY_APP_ID: ''
-      RUNWAY_API_KEY: ''
+      RUNWAY_APP_ID: ${{ secrets.RUNWAY_APP_ID }}
+      RUNWAY_API_KEY: ${{ secrets.RUNWAY_API_KEY }}

.madgerc

@@ -24,7 +24,6 @@
   },
   "allowedCircularGlob": [
     "ui/pages/confirmations/**",
-    "ui/pages/notifications/**",
     "ui/ducks/**",
     "ui/selectors/**",
     "ui/hooks/**",

.storybook/test-data.js

@@ -718,12 +718,6 @@ const state = {
       },
       tokenNetworkFilter: {},
     },
-    incomingTransactionsPreferences: {
-      [CHAIN_IDS.MAINNET]: true,
-      [CHAIN_IDS.GOERLI]: false,
-      [CHAIN_IDS.OPTIMISM_TESTNET]: false,
-      [CHAIN_IDS.AVALANCHE_TESTNET]: true,
-    },
     firstTimeFlowType: FirstTimeFlowType.create,
     completedOnboarding: true,
     knownMethodData: {

.yarn/patches/@metamask-signature-controller-npm-26.0.0-ecbc8b6cda.patch

@@ -0,0 +1,30 @@
+diff --git a/dist/utils/validation.cjs b/dist/utils/validation.cjs
+index eb116f75643a6607af10eb1669aaabfb48159826..349937fca246b26deac4a428fb3ad93dc7e18a6e 100644
+--- a/dist/utils/validation.cjs
++++ b/dist/utils/validation.cjs
+@@ -150,7 +150,9 @@ function validateAddress(address, propertyName) {
+ function validateVerifyingContract({ data, internalAccounts, origin, }) {
+     const verifyingContract = data?.domain?.verifyingContract;
+     const isExternal = origin && origin !== approval_controller_1.ORIGIN_METAMASK;
+-    if (isExternal &&
++    if (verifyingContract &&
++        typeof verifyingContract === 'string' &&
++        isExternal &&
+         internalAccounts.some((internalAccount) => internalAccount.toLowerCase() === verifyingContract.toLowerCase())) {
+         throw new Error(`External signature requests cannot use internal accounts as the verifying contract.`);
+     }
+diff --git a/dist/utils/validation.mjs b/dist/utils/validation.mjs
+index 58b55c134527537c0ef1f44876afcf2939e9ed53..d4af6e8a1e8fff08e422ebfa6b9f444dc24c8632 100644
+--- a/dist/utils/validation.mjs
++++ b/dist/utils/validation.mjs
+@@ -145,7 +145,9 @@ function validateAddress(address, propertyName) {
+ function validateVerifyingContract({ data, internalAccounts, origin, }) {
+     const verifyingContract = data?.domain?.verifyingContract;
+     const isExternal = origin && origin !== ORIGIN_METAMASK;
+-    if (isExternal &&
++    if (verifyingContract &&
++        typeof verifyingContract === 'string' &&
++        isExternal &&
+         internalAccounts.some((internalAccount) => internalAccount.toLowerCase() === verifyingContract.toLowerCase())) {
+         throw new Error(`External signature requests cannot use internal accounts as the verifying contract.`);
+     }

CHANGELOG.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [12.15.1]
+### Fixed
+- Re-fix state corruption resulting in inability to create/add accounts – previously fixed in 12.14.2 ([31274])(https://github.com/MetaMask/metamask-extension/pull/31274))
+
 ## [12.15.0]
 ### Added
 - When switching network, alert the user and get approval if there are pending requests from origin. ([#30674](https://github.com/MetaMask/metamask-extension/pull/30674))
@@ -5880,7 +5884,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 - Added the ability to restore accounts from seed words.
 
 
-[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.15.0...HEAD
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.15.1...HEAD
+[12.15.1]: https://github.com/MetaMask/metamask-extension/compare/v12.15.0...v12.15.1
 [12.15.0]: https://github.com/MetaMask/metamask-extension/compare/v12.14.2...v12.15.0
 [12.14.2]: https://github.com/MetaMask/metamask-extension/compare/v12.14.1...v12.14.2
 [12.14.1]: https://github.com/MetaMask/metamask-extension/compare/v12.14.0...v12.14.1