From 27f821c51c090c241eb3495120ad9d07b1e51e4b Mon Sep 17 00:00:00 2001 From: tjs Date: Thu, 17 Nov 2022 17:47:22 -0500 Subject: [PATCH] simplify balance click feature --- components/shared/BalancesTable.tsx | 4 ---- components/trade/AdvancedTradeForm.tsx | 20 +++++++------------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/components/shared/BalancesTable.tsx b/components/shared/BalancesTable.tsx index 55d6af40..7b905371 100644 --- a/components/shared/BalancesTable.tsx +++ b/components/shared/BalancesTable.tsx @@ -223,13 +223,11 @@ const Balance = ({ bank }: { bank: Bank }) => { if (balance > 0) { if (type === 'quote') { set((s) => { - s.tradeForm.side = 'buy' s.tradeForm.baseSize = (balance / price).toString() s.tradeForm.quoteSize = balance.toString() }) } else { set((s) => { - s.tradeForm.side = 'sell' s.tradeForm.baseSize = balance.toString() s.tradeForm.quoteSize = (balance * price).toString() }) @@ -237,13 +235,11 @@ const Balance = ({ bank }: { bank: Bank }) => { } else { if (type === 'quote') { set((s) => { - s.tradeForm.side = 'sell' s.tradeForm.baseSize = (balance / price).toString() s.tradeForm.quoteSize = balance.toString() }) } else { set((s) => { - s.tradeForm.side = 'buy' s.tradeForm.baseSize = balance.toString() s.tradeForm.quoteSize = (balance * price).toString() }) diff --git a/components/trade/AdvancedTradeForm.tsx b/components/trade/AdvancedTradeForm.tsx index c841c9c7..2dc7c7aa 100644 --- a/components/trade/AdvancedTradeForm.tsx +++ b/components/trade/AdvancedTradeForm.tsx @@ -192,19 +192,13 @@ const AdvancedTradeForm = () => { const group = mangoStore.getState().group if (!group || !selectedMarket) return if (selectedMarket instanceof Serum3Market) { - if (tradeForm.tradeType === 'Limit') { - const baseBank = group?.getFirstBankByTokenIndex( - selectedMarket.baseTokenIndex - ) - if (baseBank.uiPrice) { - const price = baseBank.uiPrice.toString() - set((s) => { - s.tradeForm.price = price - }) - } - } else { + const baseBank = group?.getFirstBankByTokenIndex( + selectedMarket.baseTokenIndex + ) + if (baseBank.uiPrice) { + const price = baseBank.uiPrice.toString() set((s) => { - s.tradeForm.price = '' + s.tradeForm.price = price }) } } else { @@ -212,7 +206,7 @@ const AdvancedTradeForm = () => { s.tradeForm.price = selectedMarket._uiPrice.toString() }) } - }, [set, selectedMarket, tradeForm]) + }, [set, selectedMarket]) const handlePlaceOrder = useCallback(async () => { const client = mangoStore.getState().client