diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx index ac7297b8c..bff248f4c 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx @@ -11,7 +11,7 @@ import { getFeeLevels, sumLiquidityCommitted, marketLiquidityDataProvider, - liquidityProvisionsDataProvider, + lpAggregatedDataProvider, } from '@vegaprotocol/liquidity'; import type { MarketLpQuery } from '@vegaprotocol/liquidity'; @@ -34,10 +34,10 @@ const formatMarket = (data: MarketLpQuery) => { }; export const lpDataProvider = makeDerivedDataProvider( - [marketLiquidityDataProvider, liquidityProvisionsDataProvider], - ([market, providers]) => ({ + [marketLiquidityDataProvider, lpAggregatedDataProvider], + ([market, lpAggregatedData]) => ({ market: { ...formatMarket(market) }, - liquidityProviders: providers || [], + liquidityProviders: lpAggregatedData || [], }) ); diff --git a/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx b/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx index 942862426..ea9cea89c 100644 --- a/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx +++ b/apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx @@ -4,7 +4,10 @@ import { AgGridColumn } from 'ag-grid-react'; import type { GetRowIdParams } from 'ag-grid-community'; import { t } from '@vegaprotocol/react-helpers'; -import type { LiquidityProvisionFieldsFragment } from '@vegaprotocol/liquidity'; +import type { + LiquidityProviderFeeShareFieldsFragment, + LiquidityProvisionFieldsFragment, +} from '@vegaprotocol/liquidity'; import { formatWithAsset } from '@vegaprotocol/liquidity'; import { Grid } from '../../grid'; @@ -24,7 +27,8 @@ export const LPProvidersGrid = ({ liquidityProviders, settlementAsset, }: { - liquidityProviders: LiquidityProvisionFieldsFragment[]; + liquidityProviders: LiquidityProvisionFieldsFragment & + LiquidityProviderFeeShareFieldsFragment[]; settlementAsset: { decimals?: number; symbol?: string; @@ -55,7 +59,14 @@ export const LPProvidersGrid = ({ valueFormatter={formatToHours} field="createdAt" /> - + { + const valueOr0 = value ? value : ''; + return `${parseInt(valueOr0) * 100}%`; + }} + />