fix: use transaction address to get lock for custom nonce

ui/hooks/useMMICustodySendTransaction.ts

@@ -34,9 +34,9 @@ export function useMMICustodySendTransaction() {
   const accountType = useSelector(getAccountType);
   const mostRecentOverviewPage = useSelector(getMostRecentOverviewPage);
 
-  const { currentConfirmation } = useConfirmContext() as unknown as {
-    currentConfirmation: TransactionMeta | undefined;
-  };
+  const { currentConfirmation } = useConfirmContext<
+    TransactionMeta | undefined
+  >();
   const { from } = getConfirmationSender(currentConfirmation);
   const fromChecksumHexAddress = toChecksumHexAddress(from || '');
 

ui/pages/confirmations/components/confirm/info/approve/approve-static-simulation/approve-static-simulation.tsx

@@ -25,9 +25,8 @@ import { useIsNFT } from '../hooks/use-is-nft';
 export const ApproveStaticSimulation = () => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { decimals: initialDecimals } = useAssetDetails(
     transactionMeta?.txParams?.to,

ui/pages/confirmations/components/confirm/info/approve/approve.tsx

@@ -18,9 +18,8 @@ import { RevokeStaticSimulation } from './revoke-static-simulation/revoke-static
 import { SpendingCap } from './spending-cap/spending-cap';
 
 const ApproveInfo = () => {
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { isNFT } = useIsNFT(transactionMeta);
 

ui/pages/confirmations/components/confirm/info/approve/edit-spending-cap-modal/edit-spending-cap-modal.tsx

@@ -47,9 +47,8 @@ export const EditSpendingCapModal = ({
 
   const dispatch = useDispatch();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { userBalance, tokenSymbol, decimals } = useAssetDetails(
     transactionMeta.txParams.to,

ui/pages/confirmations/components/confirm/info/approve/revoke-static-simulation/revoke-static-simulation.tsx

@@ -12,9 +12,8 @@ import StaticSimulation from '../../shared/static-simulation/static-simulation';
 export const RevokeStaticSimulation = () => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { chainId } = transactionMeta;
 

ui/pages/confirmations/components/confirm/info/approve/spending-cap/spending-cap.tsx

@@ -28,9 +28,8 @@ const SpendingCapGroup = ({
 }) => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { spendingCap, formattedSpendingCap, value } =
     useApproveTokenSimulation(transactionMeta, decimals);
@@ -81,9 +80,8 @@ export const SpendingCap = ({
 }) => {
   const t = useI18nContext();
 
-  const { currentConfirmation: transactionMeta } = useConfirmContext() as {
-    currentConfirmation: TransactionMeta;
-  };
+  const { currentConfirmation: transactionMeta } =
+    useConfirmContext<TransactionMeta>();
 
   const { userBalance, tokenSymbol, decimals } = useAssetDetails(
     transactionMeta.txParams.to,

ui/pages/confirmations/components/confirm/info/shared/advanced-details/advanced-details.tsx

@@ -1,5 +1,7 @@
 import React, { useEffect } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
+import { TransactionMeta } from '@metamask/transaction-controller';
+
 import {
   ConfirmInfoRow,
   ConfirmInfoRowText,
@@ -17,15 +19,23 @@ import {
   updateCustomNonce,
 } from '../../../../../../../store/actions';
 import { selectConfirmationAdvancedDetailsOpen } from '../../../../../selectors/preferences';
+import { useConfirmContext } from '../../../../../context/confirm';
+import { isSignatureTransactionType } from '../../../../../utils';
 import { TransactionData } from '../transaction-data/transaction-data';
 
 const NonceDetails = () => {
+  const { currentConfirmation } = useConfirmContext<TransactionMeta>();
   const t = useI18nContext();
   const dispatch = useDispatch();
 
   useEffect(() => {
-    dispatch(getNextNonce());
-  }, [dispatch]);
+    if (
+      currentConfirmation &&
+      !isSignatureTransactionType(currentConfirmation)
+    ) {
+      dispatch(getNextNonce(currentConfirmation.txParams.from));
+    }
+  }, [currentConfirmation, dispatch]);
 
   const enableCustomNonce = useSelector(getUseNonceField);
   const nextNonce = useSelector(getNextSuggestedNonce);

ui/pages/confirmations/confirm-approve/confirm-approve.js

@@ -66,7 +66,7 @@ export default function ConfirmApprove({
   isSetApproveForAll,
 }) {
   const dispatch = useDispatch();
-  const { txParams: { data: transactionData } = {} } = transaction;
+  const { txParams: { data: transactionData, from } = {} } = transaction;
 
   const currentCurrency = useSelector(getCurrentCurrency);
   const nativeCurrency = useSelector(getNativeCurrency);
@@ -266,7 +266,7 @@ export default function ConfirmApprove({
               updateCustomNonce={(value) => {
                 dispatch(updateCustomNonce(value));
               }}
-              getNextNonce={() => dispatch(getNextNonce())}
+              getNextNonce={() => dispatch(getNextNonce(from))}
               showCustomizeNonceModal={({
                 /* eslint-disable no-shadow */
                 useNonceField,

ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.component.js

@@ -217,6 +217,7 @@ export default class ConfirmTransactionBase extends Component {
       mostRecentOverviewPage,
       txData,
       getNextNonce,
+      fromAddress,
     } = this.props;
 
     const {
@@ -236,7 +237,7 @@ export default class ConfirmTransactionBase extends Component {
       transactionStatus === TransactionStatus.confirmed;
 
     if (txData.id !== prevTxData.id) {
-      getNextNonce();
+      getNextNonce(fromAddress);
     }
 
     if (
@@ -413,6 +414,7 @@ export default class ConfirmTransactionBase extends Component {
       tokenSymbol,
       isUsingPaymaster,
       isSigningOrSubmitting,
+      fromAddress,
     } = this.props;
 
     const { t } = this.context;
@@ -447,7 +449,7 @@ export default class ConfirmTransactionBase extends Component {
 
       updateCustomNonce(inputValue);
 
-      getNextNonce();
+      getNextNonce(fromAddress);
     };
 
     const renderTotalMaxAmount = ({
@@ -1012,6 +1014,7 @@ export default class ConfirmTransactionBase extends Component {
     this._isMounted = true;
     const {
       toAddress,
+      fromAddress,
       txData: { origin, chainId: txChainId } = {},
       getNextNonce,
       tryReverseResolveAddress,
@@ -1041,7 +1044,7 @@ export default class ConfirmTransactionBase extends Component {
       },
     });
 
-    getNextNonce();
+    getNextNonce(fromAddress);
     if (toAddress) {
       tryReverseResolveAddress(toAddress);
     }

ui/pages/confirmations/confirm-transaction-base/confirm-transaction-base.container.js

@@ -429,7 +429,7 @@ export const mapDispatchToProps = (dispatch) => {
     fetchSmartTransactionsLiveness: () => {
       dispatch(fetchSmartTransactionsLiveness());
     },
-    getNextNonce: () => dispatch(getNextNonce()),
+    getNextNonce: (address) => dispatch(getNextNonce(address)),
     setNextNonce: (val) => dispatch(setNextNonce(val)),
     setDefaultHomeActiveTabName: (tabName) =>
       dispatch(setDefaultHomeActiveTabName(tabName)),

ui/pages/confirmations/token-allowance/token-allowance.js

@@ -347,12 +347,12 @@ export default function TokenAllowance({
   };
 
   const handleNextNonce = useCallback(() => {
-    dispatch(getNextNonce());
-  }, [getNextNonce, dispatch]);
+    dispatch(getNextNonce(txData.txParams.from));
+  }, [dispatch, txData.txParams.from]);
 
   useEffect(() => {
-    dispatch(getNextNonce());
-  }, [getNextNonce, dispatch]);
+    dispatch(getNextNonce(txData.txParams.from));
+  }, [dispatch, txData.txParams.from]);
 
   const handleUpdateCustomNonce = (value) => {
     dispatch(updateCustomNonce(value));

ui/store/actions.ts

@@ -4374,16 +4374,13 @@ export function setNextNonce(nextNonce: string): PayloadAction<string> {
  * accidental usage of a stale nonce as the call to getNextNonce only works for
  * the currently selected address.
  *
+ * @param address - address for which nonce lock shouuld be obtained.
  * @returns
  */
-export function getNextNonce(): ThunkAction<
-  Promise<string>,
-  MetaMaskReduxState,
-  unknown,
-  AnyAction
-> {
+export function getNextNonce(
+  address,
+): ThunkAction<Promise<string>, MetaMaskReduxState, unknown, AnyAction> {
   return async (dispatch, getState) => {
-    const { address } = getSelectedInternalAccount(getState());
     const networkClientId = getSelectedNetworkClientId(getState());
     let nextNonce;
     try {