diff --git a/libs/market-info/src/components/market-info/info-key-value-table.tsx b/libs/market-info/src/components/market-info/info-key-value-table.tsx index b78c259b4..17114f0ce 100644 --- a/libs/market-info/src/components/market-info/info-key-value-table.tsx +++ b/libs/market-info/src/components/market-info/info-key-value-table.tsx @@ -1,19 +1,20 @@ import { - t, addDecimalsFormatNumber, - formatNumberPercentage, formatNumber, + formatNumberPercentage, + t, } from '@vegaprotocol/react-helpers'; import { - KeyValueTableRow, KeyValueTable, + KeyValueTableRow, Tooltip, } from '@vegaprotocol/ui-toolkit'; import BigNumber from 'bignumber.js'; import startCase from 'lodash/startCase'; -import type { ReactNode } from 'react'; + import { tooltipMapping } from './tooltip-mapping'; +import type { ReactNode } from 'react'; interface RowProps { field: string; value: unknown; @@ -39,7 +40,9 @@ const Row = ({ return value; } if (decimalPlaces) { - return `${addDecimalsFormatNumber(value, decimalPlaces)} ${assetSymbol}`; + return `${parseFloat( + addDecimalsFormatNumber(value, decimalPlaces) + )} ${assetSymbol}`; } if (asPercentage) { return formatNumberPercentage(new BigNumber(value).times(100)); diff --git a/libs/market-info/src/components/market-info/info-market.tsx b/libs/market-info/src/components/market-info/info-market.tsx index 5b0018e9f..d1920061c 100644 --- a/libs/market-info/src/components/market-info/info-market.tsx +++ b/libs/market-info/src/components/market-info/info-market.tsx @@ -1,31 +1,36 @@ -import { useMemo } from 'react'; +import { AssetDetailsTable, useAssetDataProvider } from '@vegaprotocol/assets'; +import { useEnvironment } from '@vegaprotocol/environment'; +import { totalFeesPercentage } from '@vegaprotocol/market-list'; import { formatNumber, t, useDataProvider, useYesterday, } from '@vegaprotocol/react-helpers'; -import { AsyncRenderer, Splash, Accordion } from '@vegaprotocol/ui-toolkit'; -import pick from 'lodash/pick'; -import BigNumber from 'bignumber.js'; -import { totalFeesPercentage } from '@vegaprotocol/market-list'; import { AccountType, Interval, MarketStateMapping, MarketTradingModeMapping, } from '@vegaprotocol/types'; -import { MarketInfoTable } from './info-key-value-table'; -import { ExternalLink } from '@vegaprotocol/ui-toolkit'; -import { generatePath } from 'react-router-dom'; -import { useEnvironment } from '@vegaprotocol/environment'; -import { Link as UiToolkitLink } from '@vegaprotocol/ui-toolkit'; +import { + Accordion, + AsyncRenderer, + ExternalLink, + Link as UiToolkitLink, + Splash, +} from '@vegaprotocol/ui-toolkit'; +import BigNumber from 'bignumber.js'; +import pick from 'lodash/pick'; import Link from 'next/link'; -import { marketInfoDataProvider } from './market-info-data-provider'; -import { AssetDetailsTable, useAssetDataProvider } from '@vegaprotocol/assets'; -import type { MarketInfoQuery } from './__generated___/MarketInfo'; -import { getMarketExpiryDateFormatted } from '../market-expires'; +import { useMemo } from 'react'; +import { generatePath } from 'react-router-dom'; +import { getMarketExpiryDateFormatted } from '../market-expires'; +import { MarketInfoTable } from './info-key-value-table'; +import { marketInfoDataProvider } from './market-info-data-provider'; + +import type { MarketInfoQuery } from './__generated___/MarketInfo'; const Links = { PROPOSAL_PAGE: ':tokenUrl/governance/:proposalId', }; @@ -271,7 +276,20 @@ export const Info = ({ market, onSelect }: InfoProps) => { ...(market.data?.priceMonitoringBounds || []).map((trigger, i) => ({ title: t(`Price monitoring bound ${i + 1}`), content: ( - + <> + + + ), })), { diff --git a/libs/orders/src/lib/components/order-list/order-list.tsx b/libs/orders/src/lib/components/order-list/order-list.tsx index 2d15eee42..8265e7b04 100644 --- a/libs/orders/src/lib/components/order-list/order-list.tsx +++ b/libs/orders/src/lib/components/order-list/order-list.tsx @@ -1,5 +1,5 @@ import { - addDecimal, + addDecimalsFormatNumber, getDateTimeFormat, isNumeric, negativeClassNames, @@ -157,7 +157,8 @@ export const OrderListTable = forwardRef( : '-' : ''; return ( - prefix + addDecimal(value, data.market.positionDecimalPlaces) + prefix + + addDecimalsFormatNumber(value, data.market.positionDecimalPlaces) ); }} /> @@ -204,10 +205,10 @@ export const OrderListTable = forwardRef( const size = new BigNumber(data.size); const remaining = new BigNumber(value); const fills = size.minus(remaining); - return `${addDecimal(fills.toString(), dps)}/${addDecimal( - size.toString(), + return `${addDecimalsFormatNumber( + fills.toString(), dps - )}`; + )}/${addDecimalsFormatNumber(size.toString(), dps)}`; }} /> ( ) { return '-'; } - return addDecimal(value, data.market.decimalPlaces); + return addDecimalsFormatNumber(value, data.market.decimalPlaces); }} />