Compare commits

...
Author SHA1 Message Date
Madalina Raicu 99f05ebe57 fix: create custom ID for liquidity provision entries 2022-11-14 13:08:31 -05:00
Madalina Raicu 41ca079814 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-13 20:04:39 -05:00
Madalina Raicu 38c76f24a3 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-11 16:35:08 +00:00
Madalina Raicu ab1308316f Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-11 10:44:16 +00:00
Madalina Raicu 3f3c0e18ab Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-08 16:14:53 +00:00
Madalina Raicu 29e7a9de03 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-08 10:11:34 +00:00
Madalina Raicu 8b4d8895fc Merge branches 'develop' and 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-07 10:28:44 +00:00
Madalina Raicu 36b2f9a5a9 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-06 12:56:19 +00:00
Madalina Raicu 962f5041ec Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-04 11:56:17 +00:00
Madalina Raicu 2c881cf35e Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-02 16:25:45 +00:00
Madalina Raicu 94c6bdf234 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-11-01 11:26:55 +00:00
Madalina Raicu 0855d3bae6 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-28 11:03:07 +01:00
Madalina Raicu 2fcee815e5 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-27 15:01:57 +01:00
Madalina Raicu 3aab601180 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-26 15:35:12 +01:00
Madalina Raicu 8561c1d0bc Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-26 10:34:30 +01:00
Madalina Raicu e0f5f43777 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-25 08:00:09 +01:00
Madalina Raicu 81ff3ceff0 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-23 00:38:55 +01:00
Madalina Raicu 5f9287a220 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-21 16:20:36 +01:00
Madalina Raicu 76827b239a Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-18 13:25:22 +01:00
Madalina Raicu 464b964cba Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-12 15:42:39 +01:00
Madalina Raicu 2c0287be32 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-10 09:28:15 +01:00
Madalina Raicu 0f60018ab4 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-07 16:36:10 +01:00
Madalina Raicu 934d75643f Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-05 21:24:40 +01:00
Madalina Raicu 1eb8565739 Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop 2022-10-05 17:36:48 +01:00
2 changed files with 31 additions and 3 deletions
@@ -25,6 +25,8 @@ import type {
LiquidityProvisionsUpdateSubscription,
} from './__generated__/MarketLiquidity';
import type { Account } from '@vegaprotocol/accounts';
import type { IterableElement } from 'type-fest';
export const liquidityProvisionsDataProvider = makeDataProvider<
LiquidityProvisionsQuery,
LiquidityProvisionFieldsFragment[],
@@ -39,8 +41,8 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
) => {
return produce(data, (draft) => {
deltas?.forEach((delta) => {
const id = delta.partyID;
const index = draft.findIndex((a) => a.party.id === id);
const id = getId(delta);
const index = draft.findIndex((a) => getId(a) === id);
if (index !== -1) {
draft[index].commitmentAmount = delta.commitmentAmount;
draft[index].fee = delta.fee;
@@ -76,6 +78,31 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
},
});
function isLpProvision(
entry:
| LiquidityProvisionFieldsFragment
| IterableElement<
LiquidityProvisionsUpdateSubscription['liquidityProvisions']
>
): entry is LiquidityProvisionFieldsFragment {
return (
(entry as LiquidityProvisionFieldsFragment).__typename ===
'LiquidityProvision' ||
Boolean((entry as LiquidityProvisionFieldsFragment).party?.id)
);
}
export const getId = (
entry:
| LiquidityProvisionFieldsFragment
| IterableElement<
LiquidityProvisionsUpdateSubscription['liquidityProvisions']
>
) =>
isLpProvision(entry)
? `${entry.party.id}${entry.status}${entry.createdAt}`
: `${entry.partyID}${entry.status}${entry.createdAt}`;
export const marketLiquidityDataProvider = makeDataProvider<
MarketLpQuery,
MarketLpQuery,
+2 -1
View File
@@ -16,6 +16,7 @@ import BigNumber from 'bignumber.js';
import type { Schema } from '@vegaprotocol/types';
import { LiquidityProvisionStatusMapping } from '@vegaprotocol/types';
import type { LiquidityProvisionData } from './liquidity-data-provider';
import { getId } from './liquidity-data-provider';
const percentageFormatter = ({ value }: ValueFormatterParams) => {
if (!value) return '-';
@@ -55,7 +56,7 @@ export const LiquidityTable = forwardRef<AgGridReact, LiquidityTableProps>(
<AgGrid
style={{ width: '100%', height: '100%' }}
overlayNoRowsTemplate={t('No liquidity provisions')}
getRowId={({ data }) => data.party.id}
getRowId={({ data }) => getId(data)}
rowHeight={34}
ref={ref}
tooltipShowDelay={500}