fix: activity list improvements when selecting nonevm (#38529)

## **Description**

When a Solana account is selected, EVM swap transactions from the same
account group were not showing in the activity list. Additionally, swap
transactions were displaying incomplete information like "Swap to"
instead of "Swap ETH to USDC".

This PR fixes both issues by:
- Fetching EVM transactions for the account group's EVM address when a
non-EVM account is selected
- Using `initialTransaction` instead of `primaryTransaction` for bridge
history lookups (matching the behavior of `useTransactionDisplayData`)
- Using `getAllNetworkTransactions` in the swap details page so
transactions can be found regardless of which account is selected

## **Changelog**

CHANGELOG entry: Fixed swap transactions not appearing in activity list
when Solana account is selected

## **Related issues**

Fixes: #36361

## **Manual testing steps**

1. Create or use an account group that has both an EVM account and a
Solana account
2. Do a swap from the EVM account (e.g. ETH to USDC on Base)
3. Switch to the Solana account in the same group
4. Go to the Activity tab
5. Verify the swap transaction appears with correct info (e.g. "Swap ETH
to USDC")
6. Click on the swap transaction
7. Verify the swap details page shows all information (status,
timestamp, amounts, gas fee, nonce)

## **Screenshots/Recordings**

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

### **Before**

<!-- [screenshots/recordings] -->


https://github.com/user-attachments/assets/b514adc4-1054-4541-a481-b865f602d5b5

### **After**

<!-- [screenshots/recordings] -->



https://github.com/user-attachments/assets/3e65c6eb-bb5c-4b4d-8134-1ca2dc6fa06e



## **Pre-merge author checklist**

- [x] I've followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask
Extension Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/main/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

## **Pre-merge reviewer checklist**

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.


<!-- CURSOR_SUMMARY -->
---

> [!NOTE]
> Shows EVM swap/smart transactions from the account group when a
non‑EVM account is selected and fixes bridge/swap details by using
initialTransaction and querying all-network transactions.
> 
> - **Activity list (unified)**:
> - Fetch and display EVM swaps/smart txs for the account group's EVM
address when a non‑EVM account is selected, using
`getAllNetworkTransactions` and `smartTransactions` with nonce grouping
via `groupAndSortTransactionsByNonce` and `PENDING_STATUS_HASH`
filtering.
> - Exclude `incoming` type, dedupe against smart tx nonces, and filter
by enabled networks across namespaces.
> - Maintain unified list with non‑EVM items; render smart transactions
via `SmartTransactionListItem`.
> - **Bridge/Swap display data**:
> - Switch bridge history lookups and token display fields to
`initialTransaction`.
> - **Tx details page**:
> - Use `getAllNetworkTransactions` to locate `src`/approval txs so
details load regardless of selected account.
> 
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
d31df26. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->

---------

Co-authored-by: SteP-n-s <[email protected]>

Author: ghgoodreau

ui/components/app/transaction-list/unified-transaction-list.component.js

@@ -15,7 +15,11 @@ import { TransactionType as KeyringTransactionType } from '@metamask/keyring-api
 import {
   nonceSortedCompletedTransactionsSelectorAllChains,
   nonceSortedPendingTransactionsSelectorAllChains,
+  getAllNetworkTransactions,
+  groupAndSortTransactionsByNonce,
+  smartTransactionsListSelector,
 } from '../../../selectors/transactions';
+import { getInternalAccountBySelectedAccountGroupAndCaip } from '../../../selectors/multichain-accounts/account-tree';
 import {
   getSelectedAccount,
   getSelectedMultichainNetworkChainId,
@@ -31,7 +35,12 @@ import SmartTransactionListItem from '../transaction-list-item/smart-transaction
 import {
   TOKEN_CATEGORY_HASH,
   TransactionKind,
+  PENDING_STATUS_HASH,
 } from '../../../helpers/constants/transactions';
+import {
+  SmartTransactionStatus,
+  TransactionGroupCategory,
+} from '../../../../shared/constants/transaction';
 import { SWAPS_CHAINID_CONTRACT_ADDRESS_MAP } from '../../../../shared/constants/swaps';
 import { isEqualCaseInsensitive } from '../../../../shared/modules/string-utils';
 import {
@@ -75,7 +84,6 @@ import {
   KEYRING_TRANSACTION_STATUS_KEY,
   useMultichainTransactionDisplay,
 } from '../../../hooks/useMultichainTransactionDisplay';
-import { TransactionGroupCategory } from '../../../../shared/constants/transaction';
 ///: END:ONLY_INCLUDE_IF
 
 import { endTrace, TraceName } from '../../../../shared/lib/trace';
@@ -429,18 +437,115 @@ export default function UnifiedTransactionList({
   );
   ///: END:ONLY_INCLUDE_IF
 
-  const unfilteredPendingTransactionsAllChains = useSelector(
-    nonceSortedPendingTransactionsSelectorAllChains,
+  const accountGroupEvmAccount = useSelector((state) =>
+    getInternalAccountBySelectedAccountGroupAndCaip(state, 'eip155:1'),
   );
+  const groupEvmAddress = accountGroupEvmAccount?.address?.toLowerCase();
 
-  const unfilteredPendingTransactions = useMemo(() => {
-    return unfilteredPendingTransactionsAllChains;
-  }, [unfilteredPendingTransactionsAllChains]);
+  const bridgeHistoryItems = useSelector(selectBridgeHistoryForAccountGroup);
 
-  const unfilteredCompletedTransactionsAllChains = useSelector(
+  const pendingFromSelectedAccount = useSelector(
+    nonceSortedPendingTransactionsSelectorAllChains,
+  );
+  const completedFromSelectedAccount = useSelector(
     nonceSortedCompletedTransactionsSelectorAllChains,
   );
 
+  const needsGroupEvmTransactions =
+    groupEvmAddress &&
+    groupEvmAddress !== selectedAccount?.address?.toLowerCase();
+
+  const allTransactions = useSelector(getAllNetworkTransactions);
+
+  const allSmartTransactionsState = useSelector(
+    (state) => state.metamask.smartTransactionsState?.smartTransactions,
+  );
+  const smartTransactionsForSelected = useSelector(
+    smartTransactionsListSelector,
+  );
+
+  const smartTransactions = useMemo(() => {
+    if (!needsGroupEvmTransactions) {
+      return smartTransactionsForSelected ?? [];
+    }
+
+    if (!allSmartTransactionsState || !groupEvmAddress) {
+      return [];
+    }
+
+    const allSmartTxs = Object.values(allSmartTransactionsState).flat();
+
+    const filtered = allSmartTxs.filter((stx) => {
+      const fromAddress = stx?.txParams?.from?.toLowerCase();
+      const isSwapType =
+        stx.type === TransactionType.swap ||
+        stx.type === TransactionType.swapApproval;
+
+      return fromAddress === groupEvmAddress && isSwapType;
+    });
+
+    return filtered.map((stx) => ({
+      ...stx,
+      id: stx.uuid,
+      isSmartTransaction: true,
+      status: stx.status?.startsWith('cancelled')
+        ? SmartTransactionStatus.cancelled
+        : stx.status,
+    }));
+  }, [
+    needsGroupEvmTransactions,
+    smartTransactionsForSelected,
+    allSmartTransactionsState,
+    groupEvmAddress,
+  ]);
+
+  const unfilteredPendingTransactions = useMemo(() => {
+    if (needsGroupEvmTransactions) {
+      const evmTxs = [...allTransactions, ...(smartTransactions ?? [])]
+        .filter((tx) => tx.txParams?.from?.toLowerCase() === groupEvmAddress)
+        .filter((tx) => tx.type !== TransactionType.incoming)
+        .filter((tx) => tx.status in PENDING_STATUS_HASH);
+
+      return groupAndSortTransactionsByNonce(evmTxs);
+    }
+
+    return pendingFromSelectedAccount;
+  }, [
+    needsGroupEvmTransactions,
+    pendingFromSelectedAccount,
+    allTransactions,
+    smartTransactions,
+    groupEvmAddress,
+  ]);
+
+  const unfilteredCompletedTransactionsAllChains = useMemo(() => {
+    if (needsGroupEvmTransactions) {
+      const smartTxs = smartTransactions ?? [];
+      const smartTxNonces = new Set(
+        smartTxs.map((tx) => tx.txParams?.nonce).filter((n) => n !== undefined),
+      );
+
+      const evmTxs = [...allTransactions, ...smartTxs]
+        .filter((tx) => tx.txParams?.from?.toLowerCase() === groupEvmAddress)
+        .filter((tx) => tx.type !== TransactionType.incoming)
+        .filter((tx) => !(tx.status in PENDING_STATUS_HASH))
+        .filter(
+          (tx) =>
+            tx.isSmartTransaction || !smartTxNonces.has(tx.txParams?.nonce),
+        );
+
+      return groupAndSortTransactionsByNonce(evmTxs);
+    }
+
+    return completedFromSelectedAccount;
+  }, [
+    needsGroupEvmTransactions,
+    completedFromSelectedAccount,
+    allTransactions,
+    smartTransactions,
+    groupEvmAddress,
+  ]);
+
   const enabledNetworksForAllNamespaces = useSelector(
     getAllEnabledNetworksForAllNamespaces,
   );
@@ -537,7 +642,6 @@ export default function UnifiedTransactionList({
     getSelectedMultichainNetworkConfiguration,
   );
 
-  const bridgeHistoryItems = useSelector(selectBridgeHistoryForAccountGroup);
   const selectedBridgeHistoryItem = useSelector((state) =>
     selectBridgeHistoryItemForTxMetaId(state, selectedTransaction?.id),
   );

ui/pages/bridge/hooks/useBridgeTokenDisplayData.ts

@@ -16,46 +16,45 @@ import {
  * @param transactionGroup - A Bridge transaction group
  */
 export function useBridgeTokenDisplayData(transactionGroup: TransactionGroup) {
-  const { primaryTransaction } = transactionGroup;
+  const { initialTransaction } = transactionGroup;
 
-  // If the primary transaction is a bridge transaction, use the bridge history item for the primary transaction id
-  // Otherwise, assume that the primary transaction is an approval transaction and use the bridge history item that has the approvalTxId
-  const bridgeHistoryItemForPrimaryTxId = useSelector((state) =>
-    selectBridgeHistoryItemForTxMetaId(state, primaryTransaction.id),
+  const bridgeHistoryItemForInitialTxId = useSelector((state) =>
+    selectBridgeHistoryItemForTxMetaId(state, initialTransaction.id),
   );
   const bridgeHistoryItemWithApprovalTxId = useSelector((state) =>
-    selectBridgeHistoryForApprovalTxId(state, primaryTransaction.id),
+    selectBridgeHistoryForApprovalTxId(state, initialTransaction.id),
   );
+
   const bridgeHistoryItem: BridgeHistoryItem | undefined =
-    bridgeHistoryItemForPrimaryTxId ?? bridgeHistoryItemWithApprovalTxId;
+    bridgeHistoryItemForInitialTxId ?? bridgeHistoryItemWithApprovalTxId;
 
   // Display currency can be fiat or a token
   const displayCurrencyAmount = useTokenFiatAmount(
     bridgeHistoryItem?.quote.srcAsset.address ??
-      primaryTransaction.sourceTokenAddress,
+      initialTransaction.sourceTokenAddress,
     bridgeHistoryItem?.pricingData?.amountSent ??
-      primaryTransaction.sourceTokenAmount,
+      initialTransaction.sourceTokenAmount,
     bridgeHistoryItem?.quote.srcAsset.symbol ??
-      primaryTransaction.sourceTokenSymbol,
+      initialTransaction.sourceTokenSymbol,
     {},
     true,
-    primaryTransaction.chainId,
+    initialTransaction.chainId,
   );
 
   return {
     category:
-      primaryTransaction.type === TransactionType.bridge
+      initialTransaction.type === TransactionType.bridge
         ? TransactionGroupCategory.bridge
         : TransactionGroupCategory.swap,
     displayCurrencyAmount,
     sourceTokenSymbol:
       bridgeHistoryItem?.quote.srcAsset.symbol ??
-      primaryTransaction.sourceTokenSymbol,
+      initialTransaction.sourceTokenSymbol,
     sourceTokenAmountSent:
       bridgeHistoryItem?.pricingData?.amountSent ??
-      primaryTransaction.sourceTokenAmount,
+      initialTransaction.sourceTokenAmount,
     destinationTokenSymbol:
       bridgeHistoryItem?.quote.destAsset.symbol ??
-      primaryTransaction.destinationTokenSymbol,
+      initialTransaction.destinationTokenSymbol,
   };
 }

ui/pages/bridge/transaction-details/transaction-details.tsx

@@ -45,10 +45,8 @@ import {
 import { formatDate } from '../../../helpers/utils/util';
 import { ConfirmInfoRowDivider as Divider } from '../../../components/app/confirm/info/row';
 import { useI18nContext } from '../../../hooks/useI18nContext';
-import {
-  getNativeTokenInfo,
-  selectedAddressTxListSelectorAllChain,
-} from '../../../selectors';
+import { getNativeTokenInfo } from '../../../selectors';
+import { getAllNetworkTransactions } from '../../../selectors/transactions';
 import {
   MetaMetricsContextProp,
   MetaMetricsEventCategory,
@@ -96,22 +94,20 @@ const CrossChainSwapTxDetails = ({
   const rootState = useSelector((state) => state);
 
   const srcTxMetaId = params?.srcTxMetaId;
-  const selectedAddressTxList = useSelector(
-    selectedAddressTxListSelectorAllChain,
+  const allTransactions = useSelector(
+    getAllNetworkTransactions,
   ) as TransactionMeta[];
 
   const transactionGroup: TransactionGroup | null =
     location?.state?.transactionGroup || null;
   const isEarliestNonce: boolean | null =
     location?.state?.isEarliestNonce || null;
-  const srcChainTxMeta = selectedAddressTxList.find(
-    (tx) => tx.id === srcTxMetaId,
-  );
+  const srcChainTxMeta = allTransactions.find((tx) => tx.id === srcTxMetaId);
   // Even if user is still on /tx-details/txMetaId, we want to be able to show the bridge history item
   const bridgeHistoryItem = useSelector((state) =>
     selectBridgeHistoryItemForTxMetaId(state, srcTxMetaId),
   );
-  const approvalTxMeta = selectedAddressTxList.find(
+  const approvalTxMeta = allTransactions.find(
     (tx) => tx.id === bridgeHistoryItem?.approvalTxId,
   );