From cee9430a8d5dd03c1ce9851cad4beadd9370902b Mon Sep 17 00:00:00 2001
From: Kristof Csillag <kristof@oasisprotocol.org>
Date: Thu, 20 Jul 2023 18:26:41 +0200
Subject: [PATCH] When listing token balances, use locally available data

(Instead of sending another request to look up the token data.)
---
 .changelog/762.internal.md                             | 1 +
 src/app/pages/AccountDetailsPage/AccountTokensCard.tsx | 9 ++++-----
 2 files changed, 5 insertions(+), 5 deletions(-)
 create mode 100644 .changelog/762.internal.md

diff --git a/.changelog/762.internal.md b/.changelog/762.internal.md
new file mode 100644
index 0000000000..7b300d613f
--- /dev/null
+++ b/.changelog/762.internal.md
@@ -0,0 +1 @@
+When listing token balances, use locally available data
diff --git a/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx b/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx
index cef2f65373..983c31f6ea 100644
--- a/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx
+++ b/src/app/pages/AccountDetailsPage/AccountTokensCard.tsx
@@ -75,7 +75,7 @@ export const AccountTokensCard: FC<AccountTokensCardProps> = ({ scope, address,
         content: (
           <TokenLink
             scope={scope}
-            address={item.token_contract_addr}
+            address={item.token_contract_addr_eth}
             name={item.token_name || t('common.missing')}
           />
         ),
@@ -83,9 +83,8 @@ export const AccountTokensCard: FC<AccountTokensCardProps> = ({ scope, address,
       },
       {
         content: (
-          <LinkableDiv id={item.token_contract_addr}>
-            {/* TODO remove temporal workaround when token_contract_addr_eth becomes available as part of RuntimeEvmBalance */}
-            <DelayedContractLink scope={scope} oasisAddress={item.token_contract_addr} />
+          <LinkableDiv id={item.token_contract_addr_eth}>
+            <ContractLink scope={scope} address={item.token_contract_addr_eth} />
           </LinkableDiv>
         ),
         key: 'hash',
@@ -101,7 +100,7 @@ export const AccountTokensCard: FC<AccountTokensCardProps> = ({ scope, address,
         key: 'ticker',
       },
     ],
-    highlight: item.token_contract_addr === locationHash,
+    highlight: item.token_contract_addr_eth === locationHash,
   }))
 
   return (