fix

RunOnFlux · Nov 15, 2024 · af870d6 · af870d6
1 parent 35988fb
commit af870d6
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/src/services/blockchains.ts b/src/services/blockchains.ts
@@ -291,12 +291,12 @@ const sepolia = {
       symbol: 'TEST-ETH',
       decimals: 18,
     },
-    {
-      contract: '0x690cc0235aBEA2cF89213E30D0F0Ea0fC054B909',
-      name: 'Fake Flux',
-      symbol: 'TEST-FLUX',
-      decimals: 8,
-    },
+    // {
+    //   contract: '0x690cc0235aBEA2cF89213E30D0F0Ea0fC054B909',
+    //   name: 'Fake Flux',
+    //   symbol: 'TEST-FLUX',
+    //   decimals: 8,
+    // },
   ],
 };
 

diff --git a/src/services/notificationService.ts b/src/services/notificationService.ts
@@ -12,6 +12,7 @@ admin.initializeApp({
 interface decodedTx {
   amount: string;
   receiver: string;
+  tokenSymbol?: string;
   token?: string;
   sender?: string;
   fee?: string;
@@ -33,7 +34,7 @@ async function sendNotificationKey(wkIdentity, data) {
             data.payload,
             data.chain,
           );
-        body = `A transaction of ${decodedTransaction.amount} ${decodedTransaction.token ? blockchains[data.chain].tokens.find((ttt) => ttt.contract.toLowerCase() === decodedTransaction.token.toLowerCase()).symbol : blockchains[data.chain].symbol} to ${decodedTransaction.receiver} has been initiated on your wallet.`;
+        body = `A transaction of ${decodedTransaction.amount} ${decodedTransaction.token ? decodedTransaction.tokenSymbol : blockchains[data.chain].symbol} to ${decodedTransaction.receiver} has been initiated on your wallet.`;
       }
     } catch (error) {
       log.error(error);

diff --git a/src/services/transactionDecoder.ts b/src/services/transactionDecoder.ts
@@ -68,6 +68,7 @@ async function decodeEVMTransactionForApproval(rawTx, chain = 'eth') {
       amount,
       fee: totalFeeWei.toFixed(),
       token: '',
+      tokenSymbol: '',
     };
 
     if (amount === '0') {
@@ -92,6 +93,7 @@ async function decodeEVMTransactionForApproval(rawTx, chain = 'eth') {
 
       if (token) {
         decimals = token.decimals;
+        txInfo.tokenSymbol = token.symbol;
       }
       const contractData = decodedData.args[2];
       // most likely we are dealing with a contract call, sending some erc20 token
@@ -112,6 +114,8 @@ async function decodeEVMTransactionForApproval(rawTx, chain = 'eth') {
           .dividedBy(new BigNumber(10 ** decimals))
           .toFixed();
       }
+    } else {
+      txInfo.tokenSymbol = blockchains[chain].symbol;
     }
 
     return txInfo;
@@ -123,6 +127,7 @@ async function decodeEVMTransactionForApproval(rawTx, chain = 'eth') {
       amount: 'decodingError',
       fee: 'decodingError',
       token: 'decodingError',
+      tokenSymbol: 'decodingError',
     };
     return txInfo;
   }
@@ -202,13 +207,15 @@ async function decodeTransactionForApproval(rawTx, chain = 'btc') {
     const txInfo = {
       receiver: txReceiver,
       amount,
+      tokenSymbol: blockchains[chain].symbol,
     };
     return txInfo;
   } catch (error) {
     log.error(error);
     return {
       receiver: 'decodingError',
       amount: 'decodingError',
+      tokenSymbol: 'decodingError',
     };
   }
 }