From 31ffa306eb2cd51f703232ed9123ae7ced1d1ff2 Mon Sep 17 00:00:00 2001 From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com> Date: Wed, 11 Jan 2023 12:10:35 -0500 Subject: [PATCH] fix(#2554): close out formatting (#2584) * fix(#2530): fix use order close out - formatting to be done in component * fix: format number in console-lite --- .../src/app/components/deal-ticket/deal-ticket-steps.tsx | 3 ++- libs/deal-ticket/src/hooks/use-order-closeout.spec.tsx | 4 ++-- libs/deal-ticket/src/hooks/use-order-closeout.ts | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/console-lite/src/app/components/deal-ticket/deal-ticket-steps.tsx b/apps/console-lite/src/app/components/deal-ticket/deal-ticket-steps.tsx index c1f9fa4a2..0447ed982 100644 --- a/apps/console-lite/src/app/components/deal-ticket/deal-ticket-steps.tsx +++ b/apps/console-lite/src/app/components/deal-ticket/deal-ticket-steps.tsx @@ -83,10 +83,11 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => { order, }); - const estCloseOut = useOrderCloseOut({ + const closeOut = useOrderCloseOut({ order, market, }); + const estCloseOut = closeOut && formatNumber(closeOut, market.decimalPlaces); const slippage = useCalculateSlippage({ marketId: market.id, order }); const [slippageValue, setSlippageValue] = useState( slippage ? parseFloat(slippage) : 0 diff --git a/libs/deal-ticket/src/hooks/use-order-closeout.spec.tsx b/libs/deal-ticket/src/hooks/use-order-closeout.spec.tsx index cf6508357..df16ea2ad 100644 --- a/libs/deal-ticket/src/hooks/use-order-closeout.spec.tsx +++ b/libs/deal-ticket/src/hooks/use-order-closeout.spec.tsx @@ -71,7 +71,7 @@ describe('useOrderCloseOut', () => { wrapper: MockedProvider, } ); - expect(result.current).toEqual('1.00'); + expect(result.current).toEqual('1'); }); it('should return proper empty value', () => { @@ -88,6 +88,6 @@ describe('useOrderCloseOut', () => { wrapper: MockedProvider, } ); - expect(result.current).toEqual('0.00'); + expect(result.current).toEqual('0'); }); }); diff --git a/libs/deal-ticket/src/hooks/use-order-closeout.ts b/libs/deal-ticket/src/hooks/use-order-closeout.ts index 72d183a97..f6f6dd32d 100644 --- a/libs/deal-ticket/src/hooks/use-order-closeout.ts +++ b/libs/deal-ticket/src/hooks/use-order-closeout.ts @@ -1,6 +1,6 @@ import { BigNumber } from 'bignumber.js'; import type { OrderSubmissionBody } from '@vegaprotocol/wallet'; -import { addDecimal, formatNumber } from '@vegaprotocol/react-helpers'; +import { addDecimal } from '@vegaprotocol/react-helpers'; import * as Schema from '@vegaprotocol/types'; import type { MarketDealTicket } from '@vegaprotocol/market-list'; import { @@ -49,7 +49,7 @@ export const useOrderCloseOut = ({ order, market }: Props): string | null => { .minus(generalAccountBalance); const closeOut = marginDifference.div(volume).plus(markPrice); if (closeOut.isPositive()) { - return formatNumber(closeOut, market.decimalPlaces); + return closeOut.toString(); } return null; };