From 6aff25f31b4d1356b4f8f7734ac6edf37172fa08 Mon Sep 17 00:00:00 2001 From: Velenir Date: Mon, 5 Oct 2020 13:16:12 +0300 Subject: [PATCH] don't count reverted trades we don't display (#1480) --- src/components/OrdersWidget/index.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/OrdersWidget/index.tsx b/src/components/OrdersWidget/index.tsx index c3fe170cd..a8179d4da 100644 --- a/src/components/OrdersWidget/index.tsx +++ b/src/components/OrdersWidget/index.tsx @@ -123,6 +123,11 @@ const OrdersWidget: React.FC = ({ displayOnly }) => { [allTrades, displayOnly], ) + const settledAndNotRevertedTrades = useMemo( + () => trades.filter((trade) => trade && isTradeSettled(trade) && !isTradeReverted(trade)), + [trades], + ) + const tabList = useMemo[]>( () => [ { @@ -131,7 +136,7 @@ const OrdersWidget: React.FC = ({ displayOnly }) => { }, { type: 'trades', - count: trades.length, + count: settledAndNotRevertedTrades.length, }, { type: 'closed', @@ -142,7 +147,7 @@ const OrdersWidget: React.FC = ({ displayOnly }) => { classifiedOrders.active.orders.length, classifiedOrders.active.pendingOrders.length, classifiedOrders.closed.orders.length, - trades.length, + settledAndNotRevertedTrades.length, ], ) @@ -301,11 +306,6 @@ const OrdersWidget: React.FC = ({ displayOnly }) => { [deleteOrders, forceOrdersRefresh, markedForDeletion, selectedTab, setClassifiedOrders], ) - const settledAndNotRevertedTrades = useMemo( - () => trades.filter((trade) => trade && isTradeSettled(trade) && !isTradeReverted(trade)), - [trades], - ) - const { filteredData: filteredTrades, handlers: { handleSearch: handleTradesSearch, clearFilters: clearTradesFilters },