Merge pull request #12876 from brave/fix-txData-type-errors

fix(wallet): txData type errors
brave · Apr 5, 2022 · 026ab29 · 026ab29
2 parents 81861b0 + b305ebe
commit 026ab29
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/components/brave_wallet_ui/common/reducers/wallet_reducer.ts b/components/brave_wallet_ui/common/reducers/wallet_reducer.ts
@@ -350,7 +350,7 @@ export const createWalletReducer = (initialState: WalletState) => {
       return payload[account.address]
     }).flat(1)
 
-    const filteredTransactions = newPendingTransactions?.filter((tx: BraveWallet.TransactionInfo) => tx.txStatus === BraveWallet.TransactionStatus.Unapproved) ?? []
+    const filteredTransactions = newPendingTransactions?.filter((tx: BraveWallet.TransactionInfo) => tx?.txStatus === BraveWallet.TransactionStatus.Unapproved) ?? []
 
     const sortedTransactionList = sortTransactionByDate(filteredTransactions)
 

diff --git a/components/brave_wallet_ui/components/desktop/views/portfolio/index.tsx b/components/brave_wallet_ui/components/desktop/views/portfolio/index.tsx
@@ -212,10 +212,13 @@ const Portfolio = (props: Props) => {
   }, [accounts, transactions, selectedAssetsNetwork])
 
   const selectedAssetTransactions = React.useMemo((): BraveWallet.TransactionInfo[] => {
-    const filteredTransactions = transactionsByNetwork.filter((tx) => {
-      return parseTransaction(tx).symbol === selectedAsset?.symbol ? tx : []
-    })
-    return sortTransactionByDate(filteredTransactions, 'descending')
+    if (selectedAsset) {
+      const filteredTransactions = transactionsByNetwork.filter((tx) => {
+        return parseTransaction(tx).symbol === selectedAsset?.symbol ? tx : []
+      })
+      return sortTransactionByDate(filteredTransactions, 'descending')
+    }
+    return []
   }, [selectedAsset, transactionsByNetwork])
 
   const fullAssetBalances = React.useMemo(() => {