From 61457bc24d17b5cc8bf63e174632f854510012fb Mon Sep 17 00:00:00 2001 From: "m.ray" <16125548+MadalinaRaicu@users.noreply.github.com> Date: Tue, 27 Dec 2022 09:10:09 -0500 Subject: [PATCH 1/2] fix(#2474): liquidity provisions table has incorrect supplied values (#2475) * fix(#2472): lp table supplied calculate bond account balance fixed * fix(#2472): unit tests in accounts-data-provider.spec.ts * fix(#2472): unit tests in accounts.mock.ts --- libs/accounts/src/lib/Accounts.graphql | 1 + libs/accounts/src/lib/__generated__/Accounts.ts | 3 ++- libs/accounts/src/lib/accounts-data-provider.spec.ts | 2 ++ libs/accounts/src/lib/accounts-data-provider.ts | 2 ++ libs/accounts/src/lib/accounts.mock.ts | 1 + libs/liquidity/src/lib/liquidity-table.tsx | 8 ++++---- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/libs/accounts/src/lib/Accounts.graphql b/libs/accounts/src/lib/Accounts.graphql index d1a83ed0b..ca7bb9ba3 100644 --- a/libs/accounts/src/lib/Accounts.graphql +++ b/libs/accounts/src/lib/Accounts.graphql @@ -31,5 +31,6 @@ subscription AccountEvents($partyId: ID) { balance assetId marketId + partyId } } diff --git a/libs/accounts/src/lib/__generated__/Accounts.ts b/libs/accounts/src/lib/__generated__/Accounts.ts index 0f40e9e85..6246bb756 100644 --- a/libs/accounts/src/lib/__generated__/Accounts.ts +++ b/libs/accounts/src/lib/__generated__/Accounts.ts @@ -17,7 +17,7 @@ export type AccountEventsSubscriptionVariables = Types.Exact<{ }>; -export type AccountEventsSubscription = { __typename?: 'Subscription', accounts: Array<{ __typename?: 'AccountUpdate', type: Types.AccountType, balance: string, assetId: string, marketId?: string | null }> }; +export type AccountEventsSubscription = { __typename?: 'Subscription', accounts: Array<{ __typename?: 'AccountUpdate', type: Types.AccountType, balance: string, assetId: string, marketId?: string | null, partyId: string }> }; export const AccountFieldsFragmentDoc = gql` fragment AccountFields on AccountBalance { @@ -83,6 +83,7 @@ export const AccountEventsDocument = gql` balance assetId marketId + partyId } } `; diff --git a/libs/accounts/src/lib/accounts-data-provider.spec.ts b/libs/accounts/src/lib/accounts-data-provider.spec.ts index 3b695fddd..752cd2dbf 100644 --- a/libs/accounts/src/lib/accounts-data-provider.spec.ts +++ b/libs/accounts/src/lib/accounts-data-provider.spec.ts @@ -26,6 +26,7 @@ describe('getId', () => { balance: '1', assetId: 'assetId', marketId: '', + partyId: '', }) ); expect( @@ -41,6 +42,7 @@ describe('getId', () => { balance: '1', assetId: 'assetId', marketId: 'testId', + partyId: 'partyId', }) ); }); diff --git a/libs/accounts/src/lib/accounts-data-provider.ts b/libs/accounts/src/lib/accounts-data-provider.ts index e33c844ce..db126049a 100644 --- a/libs/accounts/src/lib/accounts-data-provider.ts +++ b/libs/accounts/src/lib/accounts-data-provider.ts @@ -66,6 +66,7 @@ const update = ( balance: delta.balance, market: delta.marketId ? { id: delta.marketId } : null, asset: { id: delta.assetId }, + party: { id: delta.partyId }, }); } }); @@ -182,6 +183,7 @@ export const accountsDataProvider = makeDerivedDataProvider( if (asset) { return { ...account, + partyId: account.party?.id, asset: { ...asset, }, diff --git a/libs/accounts/src/lib/accounts.mock.ts b/libs/accounts/src/lib/accounts.mock.ts index 6f205c399..15ab0891b 100644 --- a/libs/accounts/src/lib/accounts.mock.ts +++ b/libs/accounts/src/lib/accounts.mock.ts @@ -122,6 +122,7 @@ export const accountEventsSubscription = ( balance: '100000000', assetId: 'asset-id', marketId: null, + partyId: 'vega-0', }, ], }; diff --git a/libs/liquidity/src/lib/liquidity-table.tsx b/libs/liquidity/src/lib/liquidity-table.tsx index 3209c6b9f..b46952eb9 100644 --- a/libs/liquidity/src/lib/liquidity-table.tsx +++ b/libs/liquidity/src/lib/liquidity-table.tsx @@ -43,10 +43,10 @@ export const LiquidityTable = forwardRef( if (!value) return '-'; return `${addDecimalsFormatNumber(value, assetDecimalPlaces ?? 0, 5)}`; }; - const stakeToCcySiskasFormatter = ({ value }: ValueFormatterParams) => { + const stakeToCcyVolumeFormatter = ({ value }: ValueFormatterParams) => { if (!value) return '-'; const newValue = new BigNumber(value) - .times(stakeToCcySiskas ?? 1) + .times(Number(stakeToCcySiskas) || 1) .toString(); return `${addDecimalsFormatNumber(newValue, assetDecimalPlaces ?? 0, 5)}`; }; @@ -121,7 +121,7 @@ export const LiquidityTable = forwardRef( headerTooltip={t( `The liquidity provider's obligation to the market, calculated as the liquidity commitment amount multiplied by the value of the stake_to_ccy_siskas network parameter to convert into units of liquidity volume. The obligation can be met by a combination of LP orders and limit orders on the order book.` )} - valueFormatter={stakeToCcySiskasFormatter} + valueFormatter={stakeToCcyVolumeFormatter} /> ( )} field="balance" type="rightAligned" - valueFormatter={stakeToCcySiskasFormatter} + valueFormatter={stakeToCcyVolumeFormatter} /> Date: Tue, 27 Dec 2022 10:18:42 -0500 Subject: [PATCH 2/2] fix: governance links to proposals (#2478) (#2480) * fix: governance links to proposals * fix: fix proposals link in governance.cy.js * fix: fix link for https://vega.xyz/governance --- apps/trading-e2e/src/integration/market-info.cy.ts | 4 ++-- apps/trading-e2e/src/integration/market-summary.cy.ts | 2 +- apps/trading-e2e/src/integration/markets.cy.ts | 2 +- libs/environment/src/hooks/use-links.ts | 10 +++++----- .../src/lib/proposals-list/use-column-defs.tsx | 2 +- libs/react-helpers/src/lib/links/links.ts | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/apps/trading-e2e/src/integration/market-info.cy.ts b/apps/trading-e2e/src/integration/market-info.cy.ts index 00ac31d66..b73a04ebb 100644 --- a/apps/trading-e2e/src/integration/market-info.cy.ts +++ b/apps/trading-e2e/src/integration/market-info.cy.ts @@ -183,12 +183,12 @@ describe('market info is displayed', { tags: '@smoke' }, () => { .first() .should('have.text', 'View governance proposal') .and('have.attr', 'href') - .and('contain', '/governance/market-0'); + .and('contain', '/proposals/market-0'); cy.getByTestId(externalLink) .eq(1) .should('have.text', 'Propose a change to market') .and('have.attr', 'href') - .and('contain', '/governance/propose/update-market'); + .and('contain', '/proposals/propose/update-market'); }); afterEach('close toggle', () => { diff --git a/apps/trading-e2e/src/integration/market-summary.cy.ts b/apps/trading-e2e/src/integration/market-summary.cy.ts index 165ae225c..f3c7bca86 100644 --- a/apps/trading-e2e/src/integration/market-summary.cy.ts +++ b/apps/trading-e2e/src/integration/market-summary.cy.ts @@ -49,7 +49,7 @@ describe('Market proposal notification', { tags: '@smoke' }, () => { cy.getByTestId('external-link').should( 'have.attr', 'href', - 'https://stagnet3.token.vega.xyz/governance/123' + 'https://stagnet3.token.vega.xyz/proposals/123' ); }); }); diff --git a/apps/trading-e2e/src/integration/markets.cy.ts b/apps/trading-e2e/src/integration/markets.cy.ts index c01038e16..0c53bff3c 100644 --- a/apps/trading-e2e/src/integration/markets.cy.ts +++ b/apps/trading-e2e/src/integration/markets.cy.ts @@ -106,7 +106,7 @@ describe('markets table', { tags: '@smoke' }, () => { .and( 'have.attr', 'href', - 'https://stagnet3.token.vega.xyz/governance/propose/new-market' + 'https://stagnet3.token.vega.xyz/proposals/propose/new-market' ); }); }); diff --git a/libs/environment/src/hooks/use-links.ts b/libs/environment/src/hooks/use-links.ts index a2952fb75..1600de413 100644 --- a/libs/environment/src/hooks/use-links.ts +++ b/libs/environment/src/hooks/use-links.ts @@ -88,12 +88,12 @@ export const useEtherscanLink = () => { export const BLOG = 'https://blog.vega.xyz/'; // Token pages -export const TOKEN_NEW_MARKET_PROPOSAL = '/governance/propose/new-market'; +export const TOKEN_NEW_MARKET_PROPOSAL = '/proposals/propose/new-market'; export const TOKEN_NEW_NETWORK_PARAM_PROPOSAL = - '/governance/propose/network-parameter'; -export const TOKEN_GOVERNANCE = '/governance'; -export const TOKEN_PROPOSALS = '/governance'; -export const TOKEN_PROPOSAL = '/governance/:id'; + '/proposals/propose/network-parameter'; +export const TOKEN_GOVERNANCE = '/proposals'; +export const TOKEN_PROPOSALS = '/proposals'; +export const TOKEN_PROPOSAL = '/proposals/:id'; // Explorer pages export const EXPLORER_TX = '/txs/:hash'; diff --git a/libs/governance/src/lib/proposals-list/use-column-defs.tsx b/libs/governance/src/lib/proposals-list/use-column-defs.tsx index 88fce616f..9bcdfe9f6 100644 --- a/libs/governance/src/lib/proposals-list/use-column-defs.tsx +++ b/libs/governance/src/lib/proposals-list/use-column-defs.tsx @@ -55,7 +55,7 @@ export const useColumnDefs = () => { const { change } = data?.terms || {}; if (instrumentGuard(change) && VEGA_TOKEN_URL) { if (data?.id) { - const link = `${VEGA_TOKEN_URL}/governance/${data.id}`; + const link = `${VEGA_TOKEN_URL}/proposals/${data.id}`; return ( {change.instrument.code} diff --git a/libs/react-helpers/src/lib/links/links.ts b/libs/react-helpers/src/lib/links/links.ts index 2d4445a9f..b46abd165 100644 --- a/libs/react-helpers/src/lib/links/links.ts +++ b/libs/react-helpers/src/lib/links/links.ts @@ -26,6 +26,6 @@ export const ExternalLinks = { }; export const TokenLinks = { - PROPOSAL_PAGE: ':tokenUrl/governance/:proposalId', - UPDATE_PROPOSAL_PAGE: ':tokenUrl/governance/propose/update-market', + PROPOSAL_PAGE: ':tokenUrl/proposals/:proposalId', + UPDATE_PROPOSAL_PAGE: ':tokenUrl/proposals/propose/update-market', };