chore(runway): cherry-pick feat: fetch all tokens for bridge input (#16029)

- feat: cp-7.47.0 fetch all tokens for bridge input (#15993)

Author: runway-github[bot]

CHANGELOG.md

@@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+- feat(bridge): add "hardware wallets not supported" error when attempting Solana swap/bridge ([#15743](https://github.com/MetaMask/metamask-mobile/pull/15743))
+- feat(bridge): fetch all tokens for bridge input([#15993](https://github.com/MetaMask/metamask-mobile/pull/15993))
 - fix(bridge): don't show currency value unless amount is above zero ([#15798](https://github.com/MetaMask/metamask-mobile/pull/15798))
 
 

app/components/UI/Bridge/hooks/useTokens.ts

@@ -1,6 +1,5 @@
 import { useTokensWithBalance } from './useTokensWithBalance';
 import { Hex, CaipChainId } from '@metamask/utils';
-import { useMemo } from 'react';
 import { useTopTokens } from './useTopTokens';
 import { BridgeToken } from '../types';
 
@@ -27,32 +26,29 @@ export function useTokens({
     chainIds: balanceChainIds
   });
 
-  const { topTokens, pending } = useTopTokens({ chainId: topTokensChainId });
+  const { topTokens, remainingTokens, pending } = useTopTokens({ chainId: topTokensChainId });
 
-  const topTokensFiltered = useMemo(() =>
-    topTokens
-      // filter out tokens that are already in the tokensWithBalance array
-      ?.filter((token) => !tokensWithBalance.some(
-        (t) => t.address === token.address && t.chainId === token.chainId
-      )) ?? [],
-    [topTokens, tokensWithBalance]
-  );
+  const getTokenKey = (token: { address: string; chainId: Hex | CaipChainId }) => `${token.address}-${token.chainId}`;
 
-  const uniqueTokens = useMemo(
-    () => [...tokensWithBalance, ...topTokensFiltered],
-    [tokensWithBalance, topTokensFiltered]
+  // Create Sets for O(1) lookups
+  const tokensWithBalanceSet = new Set(
+    tokensWithBalance.map(token => getTokenKey(token))
   );
-
-  const filteredTokens = useMemo(
-    () => uniqueTokens.filter((token) => {
-      // filter out tokens that are in the tokensToExclude array
-      const isSelectedToken = tokensToExclude?.some(
-        (t) => t.address === token.address && t.chainId === token.chainId
-      );
-      return !isSelectedToken;
-    }),
-    [uniqueTokens, tokensToExclude]
+  const excludedTokensSet = new Set(
+    tokensToExclude?.map(token => getTokenKey(token)) ?? []
   );
 
-  return { tokens: filteredTokens, pending };
+  // Combine and filter tokens in a single pass
+  const tokensWithoutBalance = (topTokens ?? []).concat(remainingTokens ?? []).filter(token => {
+    const tokenKey = getTokenKey(token);
+    return !tokensWithBalanceSet.has(tokenKey);
+  });
+
+  // Combine tokens with balance and filtered tokens and filter out excluded tokens
+  const tokens = tokensWithBalance.concat(tokensWithoutBalance).filter(token => {
+    const tokenKey = getTokenKey(token);
+    return !excludedTokensSet.has(tokenKey);
+  });
+
+  return { tokens, pending };
 }

app/components/UI/Bridge/hooks/useTopTokens/index.ts

@@ -19,7 +19,11 @@ interface UseTopTokensProps {
   chainId?: Hex | CaipChainId;
 }
 
-export const useTopTokens = ({ chainId }: UseTopTokensProps): { topTokens: BridgeToken[] | undefined, pending: boolean } => {
+export const useTopTokens = ({ chainId }: UseTopTokensProps): { 
+  topTokens: BridgeToken[] | undefined, 
+  remainingTokens: BridgeToken[] | undefined,
+  pending: boolean 
+} => {
   const swapsChainCache: SwapsControllerState['chainCache'] = useSelector(selectChainCache);
   const swapsTopAssets = useMemo(
     () => (chainId ? swapsChainCache[chainId]?.topAssets : null),
@@ -104,12 +108,13 @@ export const useTopTokens = ({ chainId }: UseTopTokensProps): { topTokens: Bridg
   }, [chainId]);
 
   // Merge the top assets from the Swaps API with the token data from the bridge API
-  const topTokens = useMemo(() => {
+  const { topTokens, remainingTokens } = useMemo(() => {
     if (!bridgeTokens) {
-      return [];
+      return { topTokens: [], remainingTokens: [] };
     }
 
     const result: BridgeToken[] = [];
+    const remainingTokensList: BridgeToken[] = [];
     const addedAddresses = new Set<string>();
     const topAssetAddrs = topAssetsFromFeatureFlags || swapsTopAssets?.map((asset) => asset.address) || [];
 
@@ -146,13 +151,23 @@ export const useTopTokens = ({ chainId }: UseTopTokensProps): { topTokens: Bridg
     // Then add remaining unique bridge tokens until we reach the limit
     if (result.length < MAX_TOP_TOKENS) {
       for (const token of Object.values(bridgeTokens)) {
-        if (result.length >= MAX_TOP_TOKENS) break;
-        addTokenIfNotExists(token);
+        if (result.length >= MAX_TOP_TOKENS) {
+          remainingTokensList.push(token);
+        } else {
+          addTokenIfNotExists(token);
+        }
       }
     }
 
-    return result;
+    return { 
+      topTokens: result, 
+      remainingTokens: remainingTokensList
+    };
   }, [bridgeTokens, swapsTopAssets, topAssetsFromFeatureFlags]);
 
-  return { topTokens, pending: chainId ? (bridgeTokensPending || swapsTopAssetsPending) : false };
+  return { 
+    topTokens, 
+    remainingTokens,
+    pending: chainId ? (bridgeTokensPending || swapsTopAssetsPending) : false 
+  };
 };