fix showing symbol custom token

RunOnFlux · Nov 15, 2024 · ee1fc5b · ee1fc5b
1 parent f37db59
commit ee1fc5b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/src/components/TransactionRequest/TransactionRequest.tsx b/src/components/TransactionRequest/TransactionRequest.tsx
@@ -24,6 +24,7 @@ const TransactionRequest = (props: {
   const [receiverAddress, setReceiverAddress] = useState('');
   const [senderAddress, setSenderAddress] = useState('');
   const [token, setToken] = useState('');
+  const [tokenSymbol, setTokenSymbol] = useState('');
   const [fee, setFee] = useState('');
   const [authenticationOpen, setAuthenticationOpen] = useState(false);
   const blockchainConfig = blockchains[props.chain];
@@ -71,6 +72,7 @@ const TransactionRequest = (props: {
         setReceiverAddress(txInfo.receiver);
         setSenderAddress(txInfo.sender);
         setToken(txInfo.token || '');
+        setTokenSymbol(txInfo.tokenSymbol);
         if (
           (props.utxos && props.utxos.length) ||
           blockchains[props.chain].chainType === 'evm'
@@ -136,12 +138,7 @@ const TransactionRequest = (props: {
             {' ' +
               sendingAmount +
               ' ' +
-              (token
-                ? blockchainConfig.tokens.find(
-                    (ttt) =>
-                      ttt.contract.toLocaleLowerCase() === token.toLowerCase(),
-                  )?.symbol
-                : blockchainConfig.symbol) +
+              (token ? tokenSymbol : blockchainConfig.symbol) +
               ' '}
           </Text>
           <Text style={[Fonts.textSmall, Fonts.textCenter]}>

diff --git a/src/lib/transactions.ts b/src/lib/transactions.ts
@@ -21,6 +21,7 @@ interface tokenInfo {
   receiver: string;
   amount: string;
   fee: string;
+  tokenSymbol: string;
   token?: string;
 }
 
@@ -124,6 +125,7 @@ export async function decodeTransactionForApproval(
       receiver: txReceiver,
       amount,
       fee,
+      tokenSymbol: blockchains[chain].symbol,
     };
     return txInfo;
   } catch (error) {
@@ -133,6 +135,7 @@ export async function decodeTransactionForApproval(
       receiver: 'decodingError',
       amount: 'decodingError',
       fee: 'decodingError',
+      tokenSymbol: 'decodingError',
     };
     return txInfo;
   }
@@ -216,6 +219,7 @@ export async function decodeEVMTransactionForApproval(
       amount,
       fee: totalFeeWei.toFixed(),
       token: '',
+      tokenSymbol: '',
     };
 
     if (amount === '0') {
@@ -239,6 +243,7 @@ export async function decodeEVMTransactionForApproval(
 
       if (token) {
         decimals = token.decimals;
+        txInfo.tokenSymbol = token.symbol;
       }
       const contractData: `0x${string}` = decodedData.args[2] as `0x${string}`;
       // most likely we are dealing with a contract call, sending some erc20 token
@@ -259,6 +264,8 @@ export async function decodeEVMTransactionForApproval(
           .dividedBy(new BigNumber(10 ** decimals))
           .toFixed();
       }
+    } else {
+      txInfo.tokenSymbol = blockchains[chain].symbol;
     }
 
     return txInfo;
@@ -270,6 +277,7 @@ export async function decodeEVMTransactionForApproval(
       amount: 'decodingError',
       fee: 'decodingError',
       token: 'decodingError',
+      tokenSymbol: 'decodingError',
     };
     return txInfo;
   }