Skip to content

fix: cp-12.17.3 fix repeated re-rendering of approve row in simulations section #32658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 9, 2025
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { useCallback, useState } from 'react';
import React, { useCallback, useMemo, useState } from 'react';
import {
TransactionMeta,
TransactionType,
Expand Down Expand Up @@ -63,18 +63,22 @@ export function BatchSimulationDetails() {
return null;
}

const finalBalanceChanges = approveBalanceChanges?.map((change) => ({
...change,
onEdit:
change.asset.standard === TokenStandard.ERC20
? () => handleEdit(change)
: undefined,
}));
const approveRows: StaticRow[] = useMemo(() => {
const finalBalanceChanges = approveBalanceChanges?.map((change) => ({
...change,
onEdit:
change.asset.standard === TokenStandard.ERC20
? () => handleEdit(change)
: undefined,
}));

const approveRow: StaticRow = {
label: t('confirmSimulationApprove'),
balanceChanges: finalBalanceChanges ?? [],
};
return [
{
label: t('confirmSimulationApprove'),
balanceChanges: finalBalanceChanges ?? [],
},
];
}, [approveBalanceChanges, handleEdit]);

const nestedTransactionToEdit =
nestedTransactionIndexToEdit === undefined
Expand All @@ -94,7 +98,7 @@ export function BatchSimulationDetails() {
)}
<SimulationDetails
transaction={transactionMeta}
staticRows={[approveRow]}
staticRows={approveRows}
isTransactionsRedesign
enableMetrics
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
TransactionMeta,
} from '@metamask/transaction-controller';
import { add0x } from '@metamask/utils';
import { useMemo } from 'react';

import { useConfirmContext } from '../../../../context/confirm';
import { useAsyncResult } from '../../../../../../hooks/useAsync';
import { getTokenStandardAndDetails } from '../../../../../../store/actions';
Expand Down Expand Up @@ -40,18 +42,20 @@ export function useBatchApproveBalanceChanges() {
},
});

const finalBalanceChanges = (balanceChanges ?? []).map<ApprovalBalanceChange>(
(change, index) => {
const simulation = simulationBalanceChanges?.[index];

return {
...change,
isApproval: true,
isAllApproval: simulation?.isAll ?? false,
isUnlimitedApproval: simulation?.isUnlimited ?? false,
nestedTransactionIndex: simulation?.nestedTransactionIndex ?? -1,
};
},
const finalBalanceChanges = useMemo(
() =>
(balanceChanges ?? []).map<ApprovalBalanceChange>((change, index) => {
const simulation = simulationBalanceChanges?.[index];

return {
...change,
isApproval: true,
isAllApproval: simulation?.isAll ?? false,
isUnlimitedApproval: simulation?.isUnlimited ?? false,
nestedTransactionIndex: simulation?.nestedTransactionIndex ?? -1,
};
}),
[balanceChanges, simulationBalanceChanges],
);

const pending = pendingSimulationChanges || pendingBalanceChanges;
Expand All @@ -66,7 +70,7 @@ function useBatchApproveSimulationBalanceChanges({
}) {
return useAsyncResult(
async () => buildSimulationTokenBalanceChanges({ nestedTransactions }),
[nestedTransactions],
[JSON.stringify(nestedTransactions)],
);
}

Expand Down
Loading