make defaultToken appear at the top of the owned section of the dropd…

…own with full renderable data regardless of whether swaps tokens are available
MetaMask · Oct 21, 2021 · a5171c4 · a5171c4
1 parent 6b22e5a
commit a5171c4
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/ui/hooks/useTokensToSearch.js b/ui/hooks/useTokensToSearch.js
@@ -122,7 +122,9 @@ export function useTokensToSearch({
     : [
         memoizedDefaultToken,
         ...shuffledTokenList.filter(
-          (token) => token.symbol !== memoizedDefaultToken.symbol,
+          (token) =>
+            token.symbol !== memoizedDefaultToken.symbol &&
+            token.address !== memoizedDefaultToken.address,
         ),
       ];
 
@@ -140,13 +142,13 @@ export function useTokensToSearch({
     };
 
     const memoizedSwapsAndUserTokensWithoutDuplicities = uniqBy(
-      [...memoizedTokensToSearch, ...memoizedUsersToken],
+      [memoizedDefaultToken, ...memoizedTokensToSearch, ...memoizedUsersToken],
       (token) => token.address.toLowerCase(),
     );
 
     memoizedSwapsAndUserTokensWithoutDuplicities.forEach((token) => {
       const renderableDataToken = getRenderableTokenData(
-        { ...token, ...usersTokensAddressMap[token.address.toLowerCase()] },
+        { ...usersTokensAddressMap[token.address.toLowerCase()], ...token },
         tokenConversionRates,
         conversionRate,
         currentCurrency,
@@ -186,6 +188,7 @@ export function useTokensToSearch({
     conversionRate,
     currentCurrency,
     memoizedTopTokens,
+    memoizedDefaultToken,
     chainId,
     tokenList,
     useTokenDetection,