fix: crash when transaction.tokenAddress is null

VenusProtocol · Jul 20, 2023 · 563511a · 563511a
1 parent cda2c1c
commit 563511a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/src/clients/api/queries/getTransactions/types.ts b/src/clients/api/queries/getTransactions/types.ts
@@ -8,5 +8,5 @@ export interface TransactionResponse {
   to: string;
   transactionHash: string;
   logIndex: string;
-  tokenAddress: string;
+  tokenAddress: string | null;
 }
diff --git a/src/utilities/getTokenByAddress.ts b/src/utilities/getTokenByAddress.ts
@@ -1,15 +1,18 @@
 import { Token } from 'types';
+import { areAddressesEqual } from 'utilities';
 
 import { TOKENS } from 'constants/tokens';
 
-const getTokenByAddress = (address: string) => {
+const getTokenByAddress = (address?: string | null) => {
   let token: Token | undefined;
 
   Object.keys(TOKENS)
     .filter(key => Object.prototype.hasOwnProperty.call(TOKENS, key))
     .forEach(tokenId => {
       const currentToken = TOKENS[tokenId as keyof typeof TOKENS];
-      if (currentToken?.address.toLowerCase() === address.toLowerCase()) {
+      if (!address) {
+        token = TOKENS.bnb;
+      } else if (areAddressesEqual(currentToken?.address, address)) {
         token = currentToken;
       }
     });

diff --git a/src/utilities/getVTokenByAddress.ts b/src/utilities/getVTokenByAddress.ts
@@ -2,8 +2,8 @@ import { VToken } from 'types';
 
 import { VBEP_TOKENS } from 'constants/tokens';
 
-const getVTokenByAddress = (address: string) =>
-  address.toLowerCase() in VBEP_TOKENS
+const getVTokenByAddress = (address?: string | null) =>
+  !!address && address.toLowerCase() in VBEP_TOKENS
     ? (VBEP_TOKENS[address.toLowerCase() as keyof typeof VBEP_TOKENS] as VToken)
     : undefined;