From 4b3977044fba6c311ebdccc48cc21697c1853b9a Mon Sep 17 00:00:00 2001
From: Guillaume Roux <guillaumeroux123@gmail.com>
Date: Wed, 13 Apr 2022 14:18:35 +0200
Subject: [PATCH] Swap : Fix undefined icon url (#14411)

---
 ui/hooks/useTokensToSearch.js | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/ui/hooks/useTokensToSearch.js b/ui/hooks/useTokensToSearch.js
index 55cadd863..7ecf4b3a8 100644
--- a/ui/hooks/useTokensToSearch.js
+++ b/ui/hooks/useTokensToSearch.js
@@ -61,19 +61,19 @@ export function getRenderableTokenData(
       symbol,
       false,
     ) || '';
-  let tokenAddress;
-  let tokenIconUrl;
-  if (process.env.TOKEN_DETECTION_V2) {
-    tokenAddress = address?.toLowerCase();
-    tokenIconUrl = tokenList[tokenAddress]?.iconUrl;
-  } else {
-    // token from dynamic api list is fetched when useTokenDetection is true
-    // And since the token.address from allTokens is checksumaddress
-    // token Address have to be changed to lowercase when we are using dynamic list
-    tokenAddress = useTokenDetection ? address?.toLowerCase() : address;
-    tokenIconUrl = useTokenDetection
-      ? tokenList[tokenAddress]?.iconUrl
-      : `images/contract/${tokenList[tokenAddress].iconUrl}`;
+
+  // token from dynamic api list is fetched when useTokenDetection is true
+  // And since the token.address from allTokens is checksumaddress
+  // token Address have to be changed to lowercase when we are using dynamic list
+  const tokenAddress =
+    useTokenDetection || process.env.TOKEN_DETECTION_V2
+      ? address?.toLowerCase()
+      : address;
+
+  let tokenIconUrl = tokenList[tokenAddress]?.iconUrl;
+
+  if (!process.env.TOKEN_DETECTION_V2 && !useTokenDetection && tokenIconUrl) {
+    tokenIconUrl = `images/contract/${tokenIconUrl}`;
   }
   const usedIconUrl = iconUrl || tokenIconUrl || token?.image;
   return {