cleanup

Co-authored-by: Copilot <copilot@github.com>

Author: n3ps

app/components/Views/UnifiedTransactionsView/UnifiedTransactionsView.tsx

@@ -138,8 +138,6 @@ const UnifiedTransactionsView = ({
   const selectedAccountGroupInternalAccounts = useSelector(
     selectSelectedAccountGroupInternalAccounts,
   );
-  const selectedAccountGroupInternalAccountsAddresses =
-    selectedAccountGroupInternalAccounts.map((account) => account.address);
   const selectedAccountGroupEvmAddress = useMemo(() => {
     const evmAccount = selectedAccountGroupInternalAccounts.find(
       (account) =>
@@ -181,52 +179,36 @@ const UnifiedTransactionsView = ({
     evmConfirmedItems: UnifiedItem[];
     chainFilteredNonEvmTransactionsForSelectedChain: NonEvmTransaction[];
   }>(() => {
-    // Deduplicate submitted by (address + chain + nonce) and drop if already confirmed
-    const seenSubmittedNonces = new Set<string>();
-    const submittedTxsFiltered = submittedTxs.filter((tx): tx is EvmTransaction => {
-      if (!isEvmTransaction(tx)) {
-        return false;
-      }
-
-      const { chainId: _chainId, txParams } = tx;
-      const hash = 'hash' in tx ? tx.hash : undefined;
-      const { from, nonce, actionId } = txParams || {};
-      // Some txs don't have nonce, like intent based swaps
-      const hasNonce = nonce !== undefined && nonce !== null;
-      if (
-        !selectedAccountGroupInternalAccountsAddresses.some((addr) =>
-          areAddressesEqual(from, addr),
-        )
-      ) {
-        return false;
-      }
-      const dedupeKeyPrefix = `${_chainId}-${String(from).toLowerCase()}`;
-      const dedupeKey = hasNonce
-        ? `${dedupeKeyPrefix}-${nonce}`
-        : `${dedupeKeyPrefix}-${actionId}`;
-      if (seenSubmittedNonces.has(dedupeKey)) {
-        return false;
-      }
+    const submittedTxsFiltered = submittedTxs.filter(
+      (tx): tx is EvmTransaction => {
+        if (!isEvmTransaction(tx)) {
+          return false;
+        }
 
-      const alreadyConfirmed = allConfirmedFiltered.find(
-        (confirmedTx) =>
-          (typeof hash === 'string' &&
-            confirmedTx.hash.toLowerCase() === hash.toLowerCase() &&
-            confirmedTx.txChainId === _chainId) ||
-          (hasNonce &&
-            confirmedTx.nonce === nonce &&
-            confirmedTx.txChainId === _chainId &&
-            Boolean(from) &&
-            areAddressesEqual(confirmedTx.from, from)),
-      );
+        const { chainId: _chainId, txParams } = tx;
+        const hash = 'hash' in tx ? tx.hash : undefined;
+        const { from, nonce } = txParams || {};
+        const hasNonce = nonce !== undefined && nonce !== null;
+
+        const alreadyConfirmed = allConfirmedFiltered.find(
+          (confirmedTx) =>
+            (typeof hash === 'string' &&
+              confirmedTx.hash.toLowerCase() === hash.toLowerCase() &&
+              confirmedTx.txChainId === _chainId) ||
+            (hasNonce &&
+              confirmedTx.nonce === nonce &&
+              confirmedTx.txChainId === _chainId &&
+              Boolean(from) &&
+              areAddressesEqual(confirmedTx.from, from)),
+        );
 
-      if (alreadyConfirmed) {
-        return false;
-      }
+        if (alreadyConfirmed) {
+          return false;
+        }
 
-      seenSubmittedNonces.add(dedupeKey);
-      return true;
-    });
+        return true;
+      },
+    );
 
     // EVM: pending/submitted first (desc), then confirmed (dedup outgoing)
     const evmPendingFirst = [...submittedTxsFiltered].sort(
@@ -271,7 +253,6 @@ const UnifiedTransactionsView = ({
     allConfirmedFiltered,
     submittedTxs,
     nonEvmTransactions,
-    selectedAccountGroupInternalAccountsAddresses,
     enabledEVMChainIds,
     enabledNonEVMChainIds,
     bridgeHistory,

app/selectors/multichainAccounts/accountTreeController.ts

@@ -430,13 +430,13 @@ export const selectAccountGroupEvmAccountAddresses = createSelector(
   [selectSelectedInternalAccount, selectAccountGroupEvmInternalAccounts],
   (selectedInternalAccount, groupEvmAccounts) => {
     const selectedEvmAccount =
-      selectedInternalAccount &&
-      isEvmAccountType(selectedInternalAccount.type)
-      ? selectedInternalAccount
-      : (groupEvmAccounts.find(
-          (account) =>
-            account.type === 'eip155:eoa' || account.type === 'eip155:erc4337',
-        ) ?? groupEvmAccounts[0]);
+      selectedInternalAccount && isEvmAccountType(selectedInternalAccount.type)
+        ? selectedInternalAccount
+        : (groupEvmAccounts.find(
+            (account) =>
+              account.type === 'eip155:eoa' ||
+              account.type === 'eip155:erc4337',
+          ) ?? groupEvmAccounts[0]);
 
     if (!selectedEvmAccount?.address) {
       return EMPTY_ARR as readonly CaipAccountId[];
@@ -470,6 +470,6 @@ export const selectSelectedAccountGroupWithInternalAccountsAddresses =
           }
           return null;
         })
-        .filter(Boolean);
+        .filter((address): address is string => Boolean(address));
     },
   );

app/selectors/transactionController.ts

@@ -5,11 +5,12 @@ import {
   selectPendingSmartTransactionsBySender,
   selectPendingSmartTransactionsForSelectedAccountGroup,
 } from './smartTransactionsController';
-import { selectSelectedAccountGroupInternalAccounts } from './multichainAccounts/accountTreeController';
+import { selectSelectedAccountGroupWithInternalAccountsAddresses } from './multichainAccounts/accountTreeController';
 import {
   TransactionMeta,
   TransactionType,
 } from '@metamask/transaction-controller';
+import { SmartTransaction } from '@metamask/smart-transactions-controller';
 import { Hex } from '@metamask/utils';
 import { areAddressesEqual } from '../util/address';
 
@@ -18,14 +19,49 @@ interface MetaMaskPayToken {
   chainId: Hex;
 }
 
-const PENDING_EVM_TRANSACTION_STATUSES = new Set([
+type LocalTransaction = TransactionMeta | SmartTransaction;
+
+const transactionPendingStatuses = new Set([
   'submitted',
   'signed',
   'unapproved',
   'approved',
   'pending',
 ]);
 
+function dedupeTransactions(
+  transactions: LocalTransaction[],
+  addresses: readonly string[],
+) {
+  const seenTransactions = new Set<string>();
+
+  return transactions.filter((transaction) => {
+    const { chainId, txParams } = transaction;
+    const { from, nonce, actionId } = txParams || {};
+    const hasNonce = nonce !== undefined && nonce !== null;
+
+    if (
+      !from ||
+      !addresses.some((address) => areAddressesEqual(from, address || ''))
+    ) {
+      return false;
+    }
+
+    // Extracted from UnifiedTransactionsView
+    const dedupeKeyPrefix = `${chainId}-${String(from).toLowerCase()}`;
+    const dedupeKey = hasNonce
+      ? `${dedupeKeyPrefix}-${nonce}`
+      : `${dedupeKeyPrefix}-${actionId}`;
+
+    if (seenTransactions.has(dedupeKey)) {
+      return false;
+    }
+
+    seenTransactions.add(dedupeKey);
+    return true;
+  });
+}
+
 function getNestedTransactionTypes(
   transaction: TransactionMeta,
 ): TransactionType[] {
@@ -139,20 +175,13 @@ export const selectLocalTransactions = createDeepEqualSelector(
   [
     selectNonReplacedTransactions,
     selectPendingSmartTransactionsForSelectedAccountGroup,
-    selectSelectedAccountGroupInternalAccounts,
+    selectSelectedAccountGroupWithInternalAccountsAddresses,
   ],
-  (
-    nonReplacedTransactions,
-    pendingSmartTransactions,
-    selectedAccountGroupInternalAccounts,
-  ) => {
-    const selectedAddresses = selectedAccountGroupInternalAccounts
-      .map((account) => account.address)
-      .filter(Boolean);
-
+  (nonReplacedTransactions, pendingSmartTransactions, addresses) => {
     const pendingTransactions = nonReplacedTransactions.filter(
       (transaction) => {
-        if (!PENDING_EVM_TRANSACTION_STATUSES.has(transaction.status)) {
+        // Extracted from UnifiedTransactionsView submittedTxs filter
+        if (!transactionPendingStatuses.has(transaction.status)) {
           return false;
         }
 
@@ -161,15 +190,17 @@ export const selectLocalTransactions = createDeepEqualSelector(
           return false;
         }
 
-        return selectedAddresses.some((address) =>
+        // Extracted from UnifiedTransactionsView submittedTxsFiltered filter
+        return addresses.some((address) =>
           areAddressesEqual(fromAddress, address),
         );
       },
     );
 
-    return [...pendingTransactions, ...pendingSmartTransactions].sort(
-      (a, b) => (b?.time ?? 0) - (a?.time ?? 0),
-    );
+    return dedupeTransactions(
+      [...pendingTransactions, ...pendingSmartTransactions],
+      addresses,
+    ).sort((a, b) => (b?.time ?? 0) - (a?.time ?? 0));
   },
 );
 

tests/api-mocking/helpers/mockHelpers.ts

@@ -465,17 +465,13 @@ export async function setupAccountsV2SupportedNetworksMock(
 
 /**
  * Registers a default empty history response for Accounts API v4 transactions.
- * Tests that need activity rows can override this with a test-specific mock.
  */
-export async function setupAccountsV4TransactionsMock(
-  server: Mockttp,
-): Promise<void> {
+export async function setupAccountsV4TransactionsMock(server: Mockttp) {
   await setupMockRequest(server, {
     requestMethod: 'GET',
     url: /^https:\/\/accounts\.api\.cx\.metamask\.io\/v4\/multiaccount\/transactions(\?.*)?$/,
     response: {
       data: [],
-      unprocessedNetworks: [],
       pageInfo: {
         count: 0,
         hasNextPage: false,