Merge pull request #11351 from brave/fallback-to-full-token-list

Fallback to FullTokenList in TransactionParser

Author: Douglashdaniel

components/brave_wallet_ui/common/hooks/transaction-parser.test.ts

@@ -502,4 +502,85 @@ describe('useTransactionParser hook', () => {
       })
     })
   })
+  describe('check for token symbol', () => {
+    describe.each([
+      ['ERC20Approve', TransactionType.ERC20Approve],
+      ['ERC20Transfer', TransactionType.ERC20Transfer],
+      ['ERC721TransferFrom', TransactionType.ERC721TransferFrom],
+      ['ERC721SafeTransferFrom', TransactionType.ERC721SafeTransferFrom]
+    ])('%s', (_, txType) => {
+      it('should be empty', () => {
+        const { result: { current: transactionParser } } = renderHook(() => useTransactionParser(
+          mockNetwork, [mockAccount], [], [mockERC20Token]
+        ))
+
+        const mockTransactionInfo = getMockedTransactionInfo()
+        const parsedTransaction = transactionParser({
+          ...mockTransactionInfo,
+          txType,
+          txData: {
+            ...mockTransactionInfo.txData,
+            baseData: {
+              ...mockTransactionInfo.txData.baseData,
+              to: 'test'
+            }
+          },
+          txArgs: [
+            'mockRecipient',
+            '0xde0b6b3a7640000'
+          ]
+        })
+
+        expect(parsedTransaction.symbol).toEqual('')
+      })
+      it('Gets token symbol from visibleList, should be DOG', () => {
+        const { result: { current: transactionParser } } = renderHook(() => useTransactionParser(
+          mockNetwork, [mockAccount], [], [mockERC20Token]
+        ))
+
+        const mockTransactionInfo = getMockedTransactionInfo()
+        const parsedTransaction = transactionParser({
+          ...mockTransactionInfo,
+          txType,
+          txData: {
+            ...mockTransactionInfo.txData,
+            baseData: {
+              ...mockTransactionInfo.txData.baseData,
+              to: 'mockContractAddress'
+            }
+          },
+          txArgs: [
+            'mockRecipient',
+            '0xde0b6b3a7640000'
+          ]
+        })
+
+        expect(parsedTransaction.symbol).toEqual('DOG')
+      })
+      it('Gets token symbol from fallback fullTokenList, should be DOG', () => {
+        const { result: { current: transactionParser } } = renderHook(() => useTransactionParser(
+          mockNetwork, [mockAccount], [], [], [mockERC20Token]
+        ))
+
+        const mockTransactionInfo = getMockedTransactionInfo()
+        const parsedTransaction = transactionParser({
+          ...mockTransactionInfo,
+          txType,
+          txData: {
+            ...mockTransactionInfo.txData,
+            baseData: {
+              ...mockTransactionInfo.txData.baseData,
+              to: 'mockContractAddress'
+            }
+          },
+          txArgs: [
+            'mockRecipient',
+            '0xde0b6b3a7640000'
+          ]
+        })
+
+        expect(parsedTransaction.symbol).toEqual('DOG')
+      })
+    })
+  })
 })

components/brave_wallet_ui/common/hooks/transaction-parser.ts

@@ -98,8 +98,9 @@ export function useTransactionParser (
   const parseTransactionFees = useTransactionFeesParser(selectedNetwork, findSpotPrice(selectedNetwork.symbol))
 
   const findToken = React.useCallback((contractAddress: string) => {
-    return visibleTokens.find((token) => token.contractAddress.toLowerCase() === contractAddress.toLowerCase())
-  }, [visibleTokens])
+    const checkVisibleList = visibleTokens.find((token) => token.contractAddress.toLowerCase() === contractAddress.toLowerCase())
+    return checkVisibleList ?? (fullTokenList?.find((token) => token.contractAddress.toLowerCase() === contractAddress.toLowerCase()))
+  }, [visibleTokens, fullTokenList])
 
   /**
    * Checks if a given address is a known contract address from our token