From b305ebe4f70e817130adbcf3458ecec9ddc08e90 Mon Sep 17 00:00:00 2001 From: Douglas Daniel Date: Mon, 4 Apr 2022 11:56:41 -0600 Subject: [PATCH] fix(wallet): txData type errors --- .../brave_wallet_ui/common/reducers/wallet_reducer.ts | 2 +- .../components/desktop/views/portfolio/index.tsx | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/components/brave_wallet_ui/common/reducers/wallet_reducer.ts b/components/brave_wallet_ui/common/reducers/wallet_reducer.ts index a8e44b08d276..26b153dc5b81 100644 --- 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 index 29fc36887311..fffc78b626e7 100644 --- 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(() => {