LaconicNetwork/vega-frontend-monorepo
6
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

feat: use market code instead of market name in fills and account's breakdown table

Browse Source
This commit is contained in:
Bartłomiej Głownia
2023-08-09 11:00:58 +02:00
parent a5af129a3a
commit ba6afffd93
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/trading-e2e/src/integration/trading-fills.cy.ts
+1 -1
View File
@@ -53,7 +53,7 @@ describe('fills', { tags: '@regression' }, () => {
cy.getByTestId(tabFills).contains('Market');
cy.getByTestId(tabFills)
.get(
'[role="gridcell"][col-id="market.tradableInstrument.instrument.name"]'
'[role="gridcell"][col-id="market.tradableInstrument.instrument.code"]'
)
.each(($marketSymbol) => {
cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
libs/accounts/src/lib/breakdown-table.spec.tsx
+3 -1
View File
@@ -23,6 +23,7 @@ const singleRow = {
instrument: {
__typename: 'Instrument',
name: 'BTCUSD Monthly (30 Jun 2022)',
code: 'BTCUSD.MF21',
},
},
id: '10cd0a793ad2887b340940337fa6d97a212e0e517fe8e9eab2b5ef3a38633f35',
@@ -57,7 +58,7 @@ describe('BreakdownTable', () => {
});
const cells = await screen.findAllByRole('gridcell');
const expectedValues = [
'BTCUSD Monthly (30 Jun 2022)',
'BTCUSD.MF21',
'Margin',
'1,256.00 (50%)',
'1,256.00',
@@ -118,6 +119,7 @@ describe('BreakdownTable', () => {
instrument: {
__typename: 'Instrument',
name: 'BTCUSD Monthly (30 Jun 2022)',
code: 'BTCUSD.MF21',
},
},
},
libs/accounts/src/lib/breakdown-table.tsx
+2 -2
View File
@@ -31,12 +31,12 @@ const BreakdownTable = forwardRef<AgGridReact, BreakdownTableProps>(
const defs: ColDef[] = [
{
headerName: t('Market'),
field: 'market.tradableInstrument.instrument.name',
field: 'market.tradableInstrument.instrument.code',
valueFormatter: ({
value,
}: VegaValueFormatterParams<
AccountFields,
'market.tradableInstrument.instrument.name'
'market.tradableInstrument.instrument.code'
>) => {
if (!value) return 'None';
return value;
libs/fills/src/lib/fills-table.spec.tsx
+4 -4
View File
@@ -20,7 +20,7 @@ describe('FillsTable', () => {
positionDecimalPlaces: 5,
tradableInstrument: {
instrument: {
name: 'test market',
code: 'test market',
product: {
settlementAsset: {
decimals: 2,
@@ -71,7 +71,7 @@ describe('FillsTable', () => {
render(<FillsTable partyId={partyId} rowData={[{ ...buyerFill }]} />);
const cells = screen.getAllByRole('gridcell');
const expectedValues = [
buyerFill.market?.tradableInstrument.instrument.name || '',
buyerFill.market?.tradableInstrument.instrument.code || '',
'+3.00',
'1.00 BTC',
'3.00 BTC',
@@ -106,7 +106,7 @@ describe('FillsTable', () => {
const cells = screen.getAllByRole('gridcell');
const expectedValues = [
buyerFill.market?.tradableInstrument.instrument.name || '',
buyerFill.market?.tradableInstrument.instrument.code || '',
'-3.00',
'1.00 BTC',
'3.00 BTC',
@@ -141,7 +141,7 @@ describe('FillsTable', () => {
const cells = screen.getAllByRole('gridcell');
const expectedValues = [
buyerFill.market?.tradableInstrument.instrument.name || '',
buyerFill.market?.tradableInstrument.instrument.code || '',
'-3.00',
'1.00 BTC',
'3.00 BTC',
libs/fills/src/lib/fills-table.tsx
+1 -1
View File
@@ -47,7 +47,7 @@ export const FillsTable = forwardRef<AgGridReact, Props>(
() => [
{
headerName: t('Market'),
field: 'market.tradableInstrument.instrument.name',
field: 'market.tradableInstrument.instrument.code',
cellRenderer: 'MarketNameCell',
cellRendererParams: { idPath: 'market.id', onMarketClick },
},