Merge remote-tracking branch 'origin/master' into merge-hotfix-v12.4.2

.yarnrc.yml

@@ -120,15 +120,9 @@ npmAuditIgnoreAdvisories:
   # upon old versions of ethereumjs-utils.
   - 'ethereum-cryptography (deprecation)'
 
-  # Currently only dependent on deprecated @metamask/types as it is brought in
-  # by @metamask/keyring-api. Updating the dependency in keyring-api will
-  # remove this.
-  - '@metamask/types (deprecation)'
-
-  # @metamask/keyring-api also depends on @metamask/snaps-ui which is
-  # deprecated. Replacing that dependency with @metamask/snaps-sdk will remove
-  # this.
-  - '@metamask/snaps-ui (deprecation)'
+  # Currently in use for the network list drag and drop functionality.
+  # Maintenance has stopped and the project will be archived in 2025.
+  - 'react-beautiful-dnd (deprecation)'
 
 npmRegistries:
   'https://npm.pkg.github.com':

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ## [12.5.0]
+## [12.4.2]
+### Fixed
+- Fix a problem where certain name lookup Snaps would not be triggered ([#27880](https://github.com/MetaMask/metamask-extension/pull/27880))
 
 ## [12.4.1]
 ### Fixed
@@ -5148,6 +5151,8 @@ Update styles and spacing on the critical error page  ([#20350](https://github.c
 
 [Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.5.0...HEAD
 [12.5.0]: https://github.com/MetaMask/metamask-extension/compare/v12.4.1...v12.5.0
+[Unreleased]: https://github.com/MetaMask/metamask-extension/compare/v12.4.2...HEAD
+[12.4.2]: https://github.com/MetaMask/metamask-extension/compare/v12.4.1...v12.4.2
 [12.4.1]: https://github.com/MetaMask/metamask-extension/compare/v12.4.0...v12.4.1
 [12.4.0]: https://github.com/MetaMask/metamask-extension/compare/v12.3.1...v12.4.0
 [12.3.1]: https://github.com/MetaMask/metamask-extension/compare/v12.3.0...v12.3.1

shared/modules/hexstring-utils.test.js

@@ -1,5 +1,5 @@
 import { toChecksumAddress } from 'ethereumjs-util';
-import { isPossibleAddress, isValidHexAddress } from './hexstring-utils';
+import { isValidHexAddress, isPossibleAddress } from './hexstring-utils';
 
 describe('hexstring utils', function () {
   describe('isPossibleAddress', function () {

ui/ducks/send/send.js

@@ -109,6 +109,7 @@ import {
   isBurnAddress,
   isPossibleAddress,
   isValidHexAddress,
+  isPossibleAddress,
   toChecksumHexAddress,
 } from '../../../shared/modules/hexstring-utils';
 import { isSmartContractAddress } from '../../helpers/utils/transactions.util';

ui/ducks/send/send.test.js

@@ -768,7 +768,7 @@ describe('Send Slice', () => {
       it('should not error with an invalid address error when user input is not a valid hex string', () => {
         const tokenAssetTypeState = {
           ...INITIAL_SEND_STATE_FOR_EXISTING_DRAFT,
-          recipientInput: '0xValidateError',
+          recipientInput: '0xAAAA6BF26964aF9D7eEd9e03E53415D37aA96045',
         };
         const action = {
           type: 'send/validateRecipientUserInput',