Resimulate changes

Author: OGPoyraz

app/scripts/metamask-controller.js

@@ -3930,8 +3930,8 @@ export default class MetamaskController extends EventEmitter {
       abortTransactionSigning:
         txController.abortTransactionSigning.bind(txController),
       getLayer1GasFee: txController.getLayer1GasFee.bind(txController),
-      updateTransactionFocus:
-        txController.updateTransactionFocus.bind(txController),
+      setTransactionActive:
+        txController.setTransactionActive.bind(txController),
 
       // decryptMessageController
       decryptMessage: this.decryptMessageController.decryptMessage.bind(

package.json

@@ -254,7 +254,7 @@
     "tslib@npm:^2.3.1": "~2.6.0",
     "tslib@npm:^2.4.0": "~2.6.0",
     "tslib@npm:^2.6.2": "~2.6.0",
-    "@metamask/transaction-controller@npm:^43.0.0": "npm:@metamask-previews/transaction-controller@43.0.0-preview-bd04b248"
+    "@metamask/transaction-controller@npm:^43.0.0": "npm:@metamask-previews/transaction-controller@44.0.0-preview-d21875e1"
   },
   "dependencies": {
     "@babel/runtime": "patch:@babel/runtime@npm%3A7.25.9#~/.yarn/patches/@babel-runtime-npm-7.25.9-fe8c62510a.patch",

ui/pages/confirmations/hooks/useTransactionFocusEffect.test.ts

@@ -3,7 +3,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import { useDispatch } from 'react-redux';
 import { useConfirmContext } from '../context/confirm';
 import { useWindowFocus } from '../../../hooks/useWindowFocus';
-import { updateTransactionFocus } from '../../../store/actions';
+import { setTransactionActive } from '../../../store/actions';
 import { type Confirmation } from '../types/confirm';
 import { useTransactionFocusEffect } from './useTransactionFocusEffect';
 
@@ -21,7 +21,7 @@ jest.mock('../../../hooks/useWindowFocus', () => ({
 }));
 
 jest.mock('../../../store/actions', () => ({
-  updateTransactionFocus: jest.fn(),
+  setTransactionActive: jest.fn(),
 }));
 
 const mockConfirmation: Confirmation = {
@@ -37,9 +37,9 @@ const confirmContextMock = {
 
 describe('useTransactionFocusEffect', () => {
   const dispatchMock = jest.fn();
-  const updateTransactionFocusMock =
-    updateTransactionFocus as jest.MockedFunction<
-      typeof updateTransactionFocus
+  const setTransactionActiveMock =
+    setTransactionActive as jest.MockedFunction<
+      typeof setTransactionActive
     >;
   const useConfirmContextMock = useConfirmContext as jest.MockedFunction<
     typeof useConfirmContext
@@ -56,15 +56,15 @@ describe('useTransactionFocusEffect', () => {
     useWindowFocusMock.mockReturnValue(true);
     useConfirmContextMock.mockReturnValue(confirmContextMock);
 
-    updateTransactionFocusMock.mockClear();
+    setTransactionActiveMock.mockClear();
     dispatchMock.mockClear();
   });
 
   it('should focus the confirmation when window is focused and type is valid', () => {
     renderHook(() => useTransactionFocusEffect());
 
     expect(dispatchMock).toHaveBeenCalledWith(
-      updateTransactionFocus('1', true),
+      setTransactionActive('1', true),
     );
   });
 
@@ -84,10 +84,10 @@ describe('useTransactionFocusEffect', () => {
     rerender();
 
     expect(dispatchMock).toHaveBeenCalledWith(
-      updateTransactionFocus('1', false),
+      setTransactionActive('1', false),
     );
     expect(dispatchMock).toHaveBeenCalledWith(
-      updateTransactionFocus('2', true),
+      setTransactionActive('2', true),
     );
   });
 
@@ -99,7 +99,7 @@ describe('useTransactionFocusEffect', () => {
     rerender();
 
     expect(dispatchMock).toHaveBeenCalledWith(
-      updateTransactionFocus('1', false),
+      setTransactionActive('1', false),
     );
   });
 
@@ -134,10 +134,10 @@ describe('useTransactionFocusEffect', () => {
       rerender();
 
       expect(dispatchMock).toHaveBeenCalledWith(
-        updateTransactionFocus('1', false),
+        setTransactionActive('1', false),
       );
       expect(dispatchMock).toHaveBeenCalledWith(
-        updateTransactionFocus('2', true),
+        setTransactionActive('2', true),
       );
     });
   });

ui/pages/confirmations/hooks/useTransactionFocusEffect.ts

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { TransactionType } from '@metamask/transaction-controller';
-import { updateTransactionFocus } from '../../../store/actions';
+import { setTransactionActive } from '../../../store/actions';
 import { useConfirmContext } from '../context/confirm';
 import { useWindowFocus } from '../../../hooks/useWindowFocus';
 
@@ -29,7 +29,7 @@ export const useTransactionFocusEffect = () => {
 
   const setTransactionFocus = useCallback(
     async (transactionId: string, isFocused: boolean) => {
-      await dispatch(updateTransactionFocus(transactionId, isFocused));
+      await dispatch(setTransactionActive(transactionId, isFocused));
     },
     [dispatch],
   );

ui/store/actions.ts

@@ -6063,11 +6063,11 @@ export async function sendMultichainTransaction(
   });
 }
 
-export async function updateTransactionFocus(
+export async function setTransactionActive(
   transactionId: string,
   isFocused: boolean,
 ): ThunkAction<void, MetaMaskReduxState, unknown, AnyAction> {
-  await submitRequestToBackground('updateTransactionFocus', [
+  await submitRequestToBackground('setTransactionActive', [
     transactionId,
     isFocused,
   ]);

yarn.lock

@@ -6484,9 +6484,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@metamask/transaction-controller@npm:@metamask-previews/transaction-controller@43.0.0-preview-bd04b248":
-  version: 43.0.0-preview-bd04b248
-  resolution: "@metamask-previews/transaction-controller@npm:43.0.0-preview-bd04b248"
+"@metamask/transaction-controller@npm:@metamask-previews/transaction-controller@44.0.0-preview-43593c4e":
+  version: 44.0.0-preview-43593c4e
+  resolution: "@metamask-previews/transaction-controller@npm:44.0.0-preview-43593c4e"
   dependencies:
     "@ethereumjs/common": "npm:^3.2.0"
     "@ethereumjs/tx": "npm:^4.2.0"
@@ -6500,7 +6500,7 @@ __metadata:
     "@metamask/metamask-eth-abis": "npm:^3.1.1"
     "@metamask/nonce-tracker": "npm:^6.0.0"
     "@metamask/rpc-errors": "npm:^7.0.2"
-    "@metamask/utils": "npm:^11.0.1"
+    "@metamask/utils": "npm:^11.1.0"
     async-mutex: "npm:^0.5.0"
     bn.js: "npm:^5.2.1"
     eth-method-registry: "npm:^4.0.0"
@@ -6509,12 +6509,12 @@ __metadata:
     uuid: "npm:^8.3.2"
   peerDependencies:
     "@babel/runtime": ^7.0.0
-    "@metamask/accounts-controller": ^21.0.0
+    "@metamask/accounts-controller": ^22.0.0
     "@metamask/approval-controller": ^7.0.0
     "@metamask/eth-block-tracker": ">=9"
     "@metamask/gas-fee-controller": ^22.0.0
     "@metamask/network-controller": ^22.0.0
-  checksum: 10/1c3cf580cbe450aebec4e886605ca2d7f710896e2c0bff857979777c3e9b73076c42b30f21f7aa95aade8f0f0ac814a2c3bf3088295f490734701ddb032e604b
+  checksum: 10/f07c20bd1f0552cea777c433797bc105a045f9d71b52f53698a6a72b6ef0add556dcf2acb44025499c929a9cdb1c3e766c5115e4abbdf9c81dcf11f68d027b1b
   languageName: node
   linkType: hard
 
@@ -6578,6 +6578,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@metamask/utils@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "@metamask/utils@npm:11.1.0"
+  dependencies:
+    "@ethereumjs/tx": "npm:^4.2.0"
+    "@metamask/superstruct": "npm:^3.1.0"
+    "@noble/hashes": "npm:^1.3.1"
+    "@scure/base": "npm:^1.1.3"
+    "@types/debug": "npm:^4.1.7"
+    debug: "npm:^4.3.4"
+    pony-cause: "npm:^2.1.10"
+    semver: "npm:^7.5.4"
+    uuid: "npm:^9.0.1"
+  checksum: 10/756f13987881fe26adaa0a54354bc5af20cedee4dd228a736d481697dc634adb9e6e54d8f1dcc1d487b2376ab4ba8c576ecbb24beab2fb63aff721d0d5c0f5fe
+  languageName: node
+  linkType: hard
+
 "@metamask/utils@npm:^8.1.0, @metamask/utils@npm:^8.2.0, @metamask/utils@npm:^8.3.0":
   version: 8.5.0
   resolution: "@metamask/utils@npm:8.5.0"