test: skip because of ag-error

Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>

.github/workflows/ci-cd-trigger.yml

@@ -152,10 +152,15 @@ jobs:
               projects+=' "multisig-signer" '
             fi
             if echo "$affected" | grep -q static; then
-              echo "Static are affected"
+              echo "static is affected"
               echo "Deploying static on s3"
               projects+=' "static" '
             fi
+            if echo "$affected" | grep -q ui-toolkit; then
+              echo "ui-toolkit is affected"
+              echo "Deploying ui-toolkit on s3"
+              projects+=' "ui-toolkit" '
+            fi
           fi
 
           projects_e2e=${projects_e2e%?}

.github/workflows/publish-dist.yml

@@ -78,6 +78,10 @@ jobs:
               envName="mainnet"
               bucketName="static.vega.xyz"
             fi
+            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
+              envName="mainnet"
+              bucketName="ui.vega.rocks"
+            fi
           elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
             envName="mainnet"
           elif [[ "${{ matrix.app}}" = "trading" ]] && [[ "${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }}" = "true" ]]; then
@@ -118,6 +122,9 @@ jobs:
           if [ "${{ matrix.app }}" = "trading" ]; then
             yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
             DIST_LOCATION=dist/apps/trading/exported
+          elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
+            NODE_ENV=production yarn nx run ui-toolkit:build-storybook
+            DIST_LOCATION=dist/storybook/ui-toolkit
           else
             yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
             DIST_LOCATION=dist/apps/${{ matrix.app }}
@@ -152,6 +159,8 @@ jobs:
 
       - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
+        continue-on-error: true
+        id: ghcr-push
         if: ${{ github.event_name == 'pull_request' || (matrix.app == 'trading' && github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') ) }}
         with:
           context: .
@@ -165,6 +174,8 @@ jobs:
 
       - name: Publish dist as docker image (docker hub)
         uses: docker/build-push-action@v3
+        continue-on-error: true
+        id: dockerhub-push
         if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         with:
           context: .
@@ -177,6 +188,33 @@ jobs:
             vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
             vegaprotocol/${{ matrix.app }}:mainnet
 
+      - name: Publish dist as docker image (ghcr - retry)
+        uses: docker/build-push-action@v3
+        if: ${{ steps.ghcr-push.outcome == 'failure' }}
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            ENV_NAME=${{ env.ENV_NAME }}
+          tags: |
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
+
+      - name: Publish dist as docker image (docker hub - retry)
+        uses: docker/build-push-action@v3
+        if: ${{ steps.dockerhub-push.outcome == 'failure' }}
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            ENV_NAME=${{ env.ENV_NAME }}
+          tags: |
+            vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
+            vegaprotocol/${{ matrix.app }}:mainnet
+
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master

apps/governance/src/i18n/translations/dev.json

@@ -824,5 +824,7 @@
   "disclaimer5": "No developer of the Vega Governance App accepts any responsibility for, or liability to users in connection with their use of the Vega Governance App.",
   "multisigContractLink": "Ethereum Multisig Contract",
   "multisigContractIncorrect": "is incorrectly configured. Validator and delegator rewards will be penalised until this is resolved.",
-  "learnMore": "Learn more"
+  "learnMore": "Learn more",
+  "AllValidators": "All validators",
+  "AllProposals": "All proposals"
 }

apps/governance/src/routes/proposals/components/proposal/proposal.spec.tsx

@@ -1,3 +1,4 @@
+import { MemoryRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
@@ -41,19 +42,35 @@ jest.mock('../list-asset', () => ({
   ListAsset: () => <div data-testid="proposal-list-asset"></div>,
 }));
 
+const renderComponent = (proposal: ProposalQuery['proposal']) => {
+  render(
+    <MemoryRouter>
+      <Proposal
+        restData={{}}
+        proposal={proposal as ProposalQuery['proposal']}
+      />
+    </MemoryRouter>
+  );
+};
+
 it('Renders with data-testid', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  renderComponent(proposal);
+
   expect(await screen.findByTestId('proposal')).toBeInTheDocument();
 });
 
+it('Renders with a link back to "all proposals"', async () => {
+  const proposal = generateProposal();
+  renderComponent(proposal);
+
+  expect(await screen.findByTestId('all-proposals-link')).toBeInTheDocument();
+});
+
 it('renders each section', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  renderComponent(proposal);
+
   expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
@@ -80,8 +97,7 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
       },
     },
   });
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  renderComponent(proposal);
+
   expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });

apps/governance/src/routes/proposals/components/proposal/proposal.tsx

@@ -2,7 +2,7 @@ import {
   NetworkParams,
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
-import { AsyncRenderer, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
@@ -13,6 +13,10 @@ import { ProposalTerms } from '../proposal-terms';
 import { ProposalVotesTable } from '../proposal-votes-table';
 import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
+import { Link } from 'react-router-dom';
+import Routes from '../../../routes';
+import React from 'react';
+import { useTranslation } from 'react-i18next';
 
 export enum ProposalType {
   PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -29,6 +33,7 @@ export interface ProposalProps {
 }
 
 export const Proposal = ({ proposal, restData }: ProposalProps) => {
+  const { t } = useTranslation();
   const { params, loading, error } = useNetworkParams([
     NetworkParams.governance_proposal_market_minVoterBalance,
     NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -81,6 +86,15 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
   return (
     <AsyncRenderer data={params} loading={loading} error={error}>
       <section data-testid="proposal">
+        <div
+          className="flex items-center gap-1"
+          data-testid="all-proposals-link"
+        >
+          <Icon name={'chevron-left'} />
+          <Link className="underline" to={Routes.PROPOSALS}>
+            {t('AllProposals')}
+          </Link>
+        </div>
         <ProposalHeader proposal={proposal} isListItem={false} />
 
         <div className="my-10">

apps/governance/src/routes/staking/node/node.tsx

@@ -107,7 +107,7 @@ export const StakingNode = ({ data, previousEpochData }: StakingNodeProps) => {
       <div className="flex items-center gap-1">
         <Icon name={'chevron-left'} />
         <Link className="underline" to={Routes.VALIDATORS}>
-          {t('All validators')}
+          {t('AllValidators')}
         </Link>
       </div>
       <Heading

apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx

@@ -7,31 +7,30 @@ import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import {
   getFeeLevels,
   sumLiquidityCommitted,
-  marketLiquidityDataProvider,
   lpAggregatedDataProvider,
 } from '@vegaprotocol/liquidity';
-import type { MarketLpQuery } from '@vegaprotocol/liquidity';
+import { marketWithDataProvider } from '@vegaprotocol/markets';
+import type { MarketWithData } from '@vegaprotocol/markets';
 
 import { Market } from './market';
 import { Header } from './header';
 import { LPProvidersGrid } from './providers';
 
-const formatMarket = (data: MarketLpQuery) => {
+const formatMarket = (market: MarketWithData) => {
   return {
-    name: data?.market?.tradableInstrument.instrument.name,
+    name: market?.tradableInstrument.instrument.name,
     symbol:
-      data?.market?.tradableInstrument.instrument.product.settlementAsset
-        .symbol,
+      market?.tradableInstrument.instrument.product.settlementAsset.symbol,
     settlementAsset:
-      data?.market?.tradableInstrument.instrument.product.settlementAsset,
-    targetStake: data?.market?.data?.targetStake,
-    tradingMode: data?.market?.data?.marketTradingMode,
-    trigger: data?.market?.data?.trigger,
+      market?.tradableInstrument.instrument.product.settlementAsset,
+    targetStake: market?.data?.targetStake,
+    tradingMode: market?.data?.marketTradingMode,
+    trigger: market?.data?.trigger,
   };
 };
 
 export const lpDataProvider = makeDerivedDataProvider(
-  [marketLiquidityDataProvider, lpAggregatedDataProvider],
+  [marketWithDataProvider, lpAggregatedDataProvider],
   ([market, lpAggregatedData]) => ({
     market: { ...formatMarket(market) },
     liquidityProviders: lpAggregatedData || [],

apps/trading-e2e/src/integration/closed-markets.cy.ts

@@ -450,3 +450,17 @@ describe('Closed markets', { tags: '@smoke' }, () => {
       .should('have.text', 'View on Explorer');
   });
 });
+
+describe('no closed markets', { tags: '@smoke', testIsolation: true }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Closed markets"]').click();
+  });
+
+  it('can see no markets message', () => {
+    // 6001-MARK-034
+    cy.getByTestId('tab-closed-markets').should('contain.text', 'No markets');
+  });
+});

apps/trading-e2e/src/integration/market-all.cy.ts

@@ -1,7 +1,10 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import type { MarketsQuery } from '@vegaprotocol/markets';
 import * as Schema from '@vegaprotocol/types';
 
 const rowSelector =
   '[data-testid="tab-all-markets"] .ag-center-cols-container .ag-row';
+const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';
 
 describe('markets all table', { tags: '@smoke' }, () => {
   beforeEach(() => {
@@ -60,7 +63,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
     // 6001-MARK-035
     cy.get(rowSelector)
       .first()
-      .find('[col-id="tradableInstrument.instrument.code"]')
+      .find(colInstrumentCode)
       .should('have.text', 'SOLUSD');
 
     //  6001-MARK-036
@@ -155,6 +158,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
   });
 
   it('able to open and sort full market list - market page', () => {
+    // 6001-MARK-064
     const ExpectedSortedMarkets = [
       'AAPL.MF21',
       'BTCUSD.MF21',
@@ -167,8 +171,38 @@ describe('markets all table', { tags: '@smoke' }, () => {
     cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
     for (let i = 0; i < ExpectedSortedMarkets.length; i++) {
       cy.get(`[row-index=${i}]`)
-        .find('[col-id="tradableInstrument.instrument.code"]')
+        .find(colInstrumentCode)
         .should('have.text', ExpectedSortedMarkets[i]);
     }
   });
+
+  it('can drag and drop columns', () => {
+    // 6001-MARK-065
+    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
+    cy.get(colInstrumentCode)
+      .realMouseDown()
+      .realMouseMove(700, 15)
+      .realMouseUp();
+    cy.get(colInstrumentCode).should(($element) => {
+      const attributeValue = $element.attr('aria-colindex');
+      expect(attributeValue).not.to.equal('1');
+    });
+  });
+});
+
+describe('no all markets', { tags: '@smoke', testIsolation: true }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    const markets: MarketsQuery = {};
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Markets', markets);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+  });
+
+  it('can see no markets message', () => {
+    // 6001-MARK-048
+    cy.getByTestId('tab-all-markets').should('contain.text', 'No markets');
+  });
 });

apps/trading-e2e/src/integration/market-liquidity.cy.ts

@@ -0,0 +1,326 @@
+import { checkSorting } from '@vegaprotocol/cypress';
+import * as Schema from '@vegaprotocol/types';
+
+const liquidityTab = 'Liquidity';
+const rowSelector =
+  '[data-testid="tab-liquidity"] .ag-center-cols-container .ag-row';
+const rowSelectorLiquidityActive =
+  '[data-testid="tab-active"] .ag-center-cols-container .ag-row';
+const rowSelectorLiquidityInactive =
+  '[data-testid="tab-inactive"] .ag-center-cols-container .ag-row';
+const marketSummaryBlock = 'header-summary';
+const itemValue = 'item-value';
+const itemHeader = 'item-header';
+const colCommitmentAmount = '[col-id="commitmentAmount"]';
+const colAverageEntryValuation = '[col-id="averageEntryValuation"]';
+const colEquityLikeShare = '[col-id="equityLikeShare"]';
+const colFee = '[col-id="fee"]';
+const colCommitmentAmount_1 = '[col-id="commitmentAmount_1"]';
+const colBalance = '[col-id="balance"]';
+const colStatus = '[col-id="status"]';
+const colCreatedAt = '[col-id="createdAt"] button';
+const colUpdatedAt = '[col-id="updatedAt"] button';
+
+const headers = [
+  'Party',
+  'Commitment (tDAI)',
+  'Share',
+  'Proposed fee',
+  'Market valuation at entry',
+  'Obligation',
+  'Supplied',
+  'Status',
+  'Created',
+  'Updated',
+];
+
+describe('liquidity table - trading', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockSubscription();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.visit('/#/markets/market-0');
+    cy.wait('@MarketData');
+    cy.getByTestId(liquidityTab).click();
+    cy.wait('@LiquidityProvisions');
+  });
+
+  it('can see table headers', () => {
+    // 5002-LIQP-001
+    cy.getByTestId('tab-liquidity').within(($headers) => {
+      cy.wrap($headers)
+        .get('.ag-header-cell-text')
+        .each(($header, i) => {
+          cy.wrap($header).should('have.text', headers[i]);
+        });
+    });
+  });
+
+  it('renders liquidity table correctly', () => {
+    // 5002-LIQP-002
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="party.id"]')
+      .should(
+        'have.text',
+        '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
+      );
+
+    cy.get(rowSelector)
+      .first()
+      .find(colCommitmentAmount)
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colEquityLikeShare)
+      .should('have.text', '100.00%');
+
+    cy.get(rowSelector).first().find(colFee).should('have.text', '0.09%');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colAverageEntryValuation)
+      .should('have.text', '685,852.93692');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colCommitmentAmount_1)
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector)
+      .first()
+      .find(colBalance)
+      .scrollIntoView()
+      .should('have.text', '4,000.00');
+
+    cy.get(rowSelector).first().find(colStatus).should('have.text', 'Active');
+
+    cy.get(rowSelector).first().find(colCreatedAt).should('not.be.empty');
+    cy.get(rowSelector).first().find(colUpdatedAt).should('not.be.empty');
+  });
+  it.skip('liquidity status column should be sorted properly', () => {
+    // 5002-LIQP-003
+    const liquidityColDefault = ['Active', 'Pending'];
+    const liquidityColAsc = ['Active', 'Pending'];
+    const liquidityColDesc = ['Pending', 'Active'];
+    checkSorting(
+      'status',
+      liquidityColDefault,
+      liquidityColAsc,
+      liquidityColDesc
+    );
+  });
+});
+
+describe('liquidity table view', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockSubscription();
+    cy.mockTradingPage(
+      Schema.MarketState.STATE_ACTIVE,
+      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
+      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
+    );
+    cy.visit('/#/liquidity/market-0');
+    cy.wait('@LiquidityProvisions');
+  });
+
+  it('can see header title', () => {
+    // 5002-LIQP-004
+    // 5002-LIQP-005
+    cy.getByTestId('header-title')
+      .should('contain.text', 'BTCUSD.MF21 liquidity provision')
+      .and('contain.text', 'Go to trading');
+  });
+
+  it('can see target stake', () => {
+    // 5002-LIQP-006
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('target-stake').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Target stake');
+        cy.getByTestId(itemValue).should('have.text', '10.00 tDAI').realHover();
+      });
+    });
+    cy.getByTestId('tooltip-content').should(
+      'contain.text',
+      `The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.`
+    );
+  });
+
+  it('can see supplied stake', () => {
+    // 5002-LIQP-007
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('supplied-stake').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Supplied stake');
+        cy.getByTestId(itemValue).should('have.text', '0.01 tDAI').realHover();
+      });
+    });
+    cy.getByTestId('tooltip-content').should(
+      'contain.text',
+      'The current amount of liquidity supplied for this market.'
+    );
+  });
+
+  it('can see liquidity supplied', () => {
+    //// 5002-LIQP-008
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-supplied').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
+        cy.getByTestId('indicator').should('be.visible');
+        cy.getByTestId(itemValue).should('have.text', '0.10%').realHover();
+      });
+    });
+  });
+
+  it('can see market id', () => {
+    // 5002-LIQP-009
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-market-id').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Market ID');
+        cy.getByTestId(itemValue).should('have.text', 'market-0');
+      });
+    });
+  });
+
+  it('can see market id', () => {
+    // 5002-LIQP-010
+    cy.getByTestId(marketSummaryBlock).within(() => {
+      cy.getByTestId('liquidity-learn-more').within(() => {
+        cy.getByTestId(itemHeader).should('have.text', 'Learn more');
+        cy.getByTestId(itemValue).should('have.text', 'Providing liquidity');
+        cy.getByTestId('external-link')
+          .should('have.attr', 'href')
+          .and(
+            'include',
+            'https://docs.vega.xyz/testnet/concepts/liquidity/provision'
+          );
+      });
+    });
+  });
+
+  describe('liquidity table view', { tags: '@smoke' }, () => {
+    it('can see table headers', () => {
+      cy.getByTestId('tab-active').within(($headers) => {
+        cy.wrap($headers)
+          .get('.ag-header-cell-text')
+          .each(($header, i) => {
+            cy.wrap($header).should('have.text', headers[i]);
+          });
+      });
+    });
+
+    it('renders liquidity active table correctly', () => {
+      // 5002-LIQP-011
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find('[col-id="party.id"]')
+        .should(
+          'have.text',
+          '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
+        );
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCommitmentAmount)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colEquityLikeShare)
+        .should('have.text', '100.00%');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colFee)
+        .should('have.text', '0.09%');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colAverageEntryValuation)
+        .should('have.text', '685,852.93692');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCommitmentAmount_1)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colBalance)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colStatus)
+        .should('have.text', 'Active');
+
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colCreatedAt)
+        .should('not.be.empty');
+      cy.get(rowSelectorLiquidityActive)
+        .first()
+        .find(colUpdatedAt)
+        .should('not.be.empty');
+    });
+
+    it('renders liquidity inactive table correctly', () => {
+      //// 5002-LIQP-012
+      cy.getByTestId('Inactive').click();
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find('[col-id="party.id"]')
+        .should(
+          'have.text',
+          'cc464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
+        );
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCommitmentAmount)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colEquityLikeShare)
+        .should('have.text', '100.00%');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colFee)
+        .should('have.text', '0.40%');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colAverageEntryValuation)
+        .should('have.text', '685,852.93692');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCommitmentAmount_1)
+        .should('have.text', '4,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colBalance)
+        .should('have.text', '2,000.00');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colStatus)
+        .should('have.text', 'Pending');
+
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colCreatedAt)
+        .should('not.be.empty');
+      cy.get(rowSelectorLiquidityInactive)
+        .first()
+        .find(colUpdatedAt)
+        .should('not.be.empty');
+    });
+  });
+});

apps/trading-e2e/src/integration/market-selector.cy.ts

@@ -25,6 +25,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
     cy.wait('@MarketsCandles');
   });
 
+  // 6001-MARK-066
   it('can toggle the sidebar', () => {
     cy.getByTestId('market-selector').should('be.visible');
     cy.getByTestId('sidebar-toggle').click();
@@ -67,6 +68,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
       .each((item, i) => {
         const market = data[i];
         // 6001-MARK-021
+        // 6001-MARK-022
         expect(item.find('h3').text()).equals(market.code);
         expect(
           item.find('[data-testid="market-selector-data-row"]').eq(0).text()
@@ -84,8 +86,19 @@ describe('markets selector', { tags: '@smoke' }, () => {
       });
   });
 
-  // 6001-MARK-27
+  it('can see all markets link', () => {
+    // 6001-MARK-026
+    cy.getByTestId('market-selector').within(() => {
+      cy.getByTestId('all-markets-link')
+        .should('be.visible')
+        .and('have.text', 'All markets')
+        .and('have.attr', 'href')
+        .and('contain', '#/markets/all');
+    });
+  });
+
   it('can use the filter options', () => {
+    // 6001-MARK-027
     // product type
     cy.getByTestId('product-Spot').click();
     cy.getByTestId(list).contains('Spot markets coming soon.');
@@ -94,7 +107,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
     cy.getByTestId('product-Future').click();
     cy.getByTestId(list).find('a').should('have.length', 4);
 
-    // 6001-MARK-29
+    // 6001-MARK-029
     cy.getByTestId(searchInput).clear().type('btc');
     cy.getByTestId(list).find('a').should('have.length', 2);
     cy.getByTestId(list).find('a').eq(1).contains('BTCUSD.MF21');
@@ -103,4 +116,29 @@ describe('markets selector', { tags: '@smoke' }, () => {
     cy.getByTestId(searchInput).clear();
     cy.getByTestId(list).find('a').should('have.length', 4);
   });
+
+  it('can sort by by top gaining and top losing market', () => {
+    // 6001-MARK-030
+    // 6001-MARK-031
+    // 6001-MARK-032
+    // 6001-MARK-033
+    cy.getByTestId(' sort-trigger').click();
+    cy.getByTestId('sort-item-Gained')
+      .contains('Top gaining')
+      .should('be.visible');
+    cy.getByTestId('sort-item-Lost')
+      .contains('Top losing')
+      .should('be.visible');
+    cy.getByTestId('sort-item-New')
+      .contains('New markets')
+      .should('be.visible');
+  });
+
+  it('can filter by settlement asset', () => {
+    // 6001-MARK-028
+    cy.getByTestId('asset-trigger').click();
+    cy.getByTestId('asset-id-asset-3').contains('tBTC').click();
+    cy.getByTestId(list).find('a').should('have.length', 1);
+    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
+  });
 });

apps/trading-e2e/src/integration/markets-proposed.cy.ts

@@ -1,16 +1,16 @@
-import { checkSorting } from '@vegaprotocol/cypress';
+import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
+import type { ProposalsListQuery } from '@vegaprotocol/proposals';
 
 const rowSelector =
   '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row';
+const colMarketId = '[col-id="market"]';
 
 describe('markets proposed table', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.clearLocalStorage().then(() => {
-      cy.mockTradingPage();
-      cy.mockSubscription();
-      cy.visit('/#/markets/all');
-      cy.get('[data-testid="Proposed markets"]').click();
-    });
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Proposed markets"]').click();
   });
 
   it('can see table headers', () => {
@@ -35,10 +35,7 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
 
   it('renders markets correctly', () => {
     // 6001-MARK-049
-    cy.get(rowSelector)
-      .first()
-      .find('[col-id="market"]')
-      .should('have.text', 'ETHUSD');
+    cy.get(rowSelector).first().find(colMarketId).should('have.text', 'ETHUSD');
 
     //  6001-MARK-050
     cy.get(rowSelector)
@@ -119,6 +116,7 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
       );
   });
   it('proposed markets tab should be sorted properly', () => {
+    // 6001-MARK-062
     cy.get('[data-testid="Proposed markets"]').click({ force: true });
     const marketColDefault = [
       'ETHUSD',
@@ -196,4 +194,31 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
     ];
     checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
   });
+
+  it('can drag and drop columns', () => {
+    // 6001-MARK-063
+    cy.get(colMarketId).realMouseDown().realMouseMove(700, 15).realMouseUp();
+    cy.get(colMarketId).should(($element) => {
+      const attributeValue = $element.attr('aria-colindex');
+      expect(attributeValue).not.to.equal('1');
+    });
+  });
+});
+
+describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    const proposal: ProposalsListQuery = {};
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ProposalsList', proposal);
+    });
+    cy.mockSubscription();
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Proposed markets"]').click();
+  });
+
+  it('can see no markets message', () => {
+    // 6001-MARK-061
+    cy.getByTestId('tab-proposed-markets').should('contain.text', 'No markets');
+  });
 });

apps/trading-e2e/src/integration/order-book.cy.ts

@@ -0,0 +1,102 @@
+const orderbookTab = 'Orderbook';
+const orderbookTable = 'tab-orderbook';
+const askPrice = 'price-9894585';
+const bidPrice = 'price-9889001';
+const askVolume = 'ask-vol-9894585';
+const bidVolume = 'bid-vol-9889001';
+const askCumulative = 'cumulative-vol-9894585';
+const bidCumulative = 'cumulative-vol-9889001';
+const midPrice = 'middle-mark-price-4612690000';
+const priceResolution = 'resolution';
+const dealTicketPrice = 'order-price';
+const resPrice = 'price-990';
+
+describe('order book', { tags: '@smoke' }, () => {
+  before(() => {
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+  });
+
+  beforeEach(() => {
+    cy.mockTradingPage();
+  });
+
+  it('show order book', () => {
+    // 6003-ORDB-001
+    // 6003-ORDB-002
+    cy.getByTestId(orderbookTab).click();
+    cy.getByTestId(orderbookTable).should('be.visible');
+    cy.getByTestId(orderbookTable).should('not.be.empty');
+  });
+
+  it('show orders prices', () => {
+    // 6003-ORDB-003
+    cy.getByTestId(askPrice).should('have.text', '98.94585');
+    cy.getByTestId(bidPrice).should('have.text', '98.89001');
+  });
+
+  it('show prices volumes', () => {
+    // 6003-ORDB-004
+    cy.getByTestId(askVolume).should('have.text', '1');
+    cy.getByTestId(bidVolume).should('have.text', '1');
+  });
+
+  it('show prices cumulative volumes', () => {
+    // 6003-ORDB-005
+    cy.getByTestId(askCumulative).should('have.text', '39');
+    cy.getByTestId(bidCumulative).should('have.text', '7');
+  });
+
+  it('show mid price', () => {
+    // 6003-ORDB-006
+    cy.getByTestId(midPrice).should('have.text', '46,126.90');
+  });
+
+  it('sort prices descending', () => {
+    // 6003-ORDB-007
+    const prices: number[] = [];
+    cy.getByTestId(orderbookTable).within(() => {
+      cy.get('[data-testid*=price]')
+        .each(($el) => {
+          prices.push(Number($el.text()));
+        })
+        .then(() => {
+          expect(prices).to.deep.equal(prices.sort((a, b) => b - a));
+        });
+    });
+  });
+
+  it('copy price to deal ticket form', () => {
+    // 6003-ORDB-009
+    cy.getByTestId(askPrice).click();
+    cy.getByTestId(dealTicketPrice).should('have.value', '98.94585');
+  });
+
+  it('change price resolution', () => {
+    // 6003-ORDB-008
+    const resolutions = [
+      '0.00000',
+      '0.0000',
+      '0.000',
+      '0.00',
+      '0.0',
+      '0',
+      '10',
+      '100',
+      '1,000',
+      '10,000',
+    ];
+    cy.getByTestId(priceResolution)
+      .find('option')
+      .each(($el, index) => {
+        expect($el.text()).to.equal(resolutions[index]);
+      });
+
+    cy.getByTestId(priceResolution).select('0.0');
+    cy.getByTestId(resPrice).should('have.text', '99.0');
+    cy.getByTestId(askPrice).should('not.exist');
+    cy.getByTestId(bidPrice).should('not.exist');
+  });
+});

apps/trading-e2e/src/integration/trading-accounts.cy.ts

@@ -133,6 +133,7 @@ describe('accounts', { tags: '@smoke' }, () => {
         });
       }
     });
+    // 7001-COLL-010
     it('sorting by asset', () => {
       cy.getByTestId('Collateral').click();
       const marketsSortedDefault = ['tBTC', 'tEURO', 'tDAI', 'tBTC'];

apps/trading-e2e/src/support/trading.ts

@@ -31,6 +31,8 @@ import {
   protocolUpgradeProposalsQuery,
   blockStatisticsQuery,
   networkParamQuery,
+  liquidityProvisionsQuery,
+  liquidityProviderFeeShareQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
 import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
@@ -158,6 +160,12 @@ const mockTradingPage = (
   );
   aliasGQLQuery(req, 'Trades', tradesQuery());
   aliasGQLQuery(req, 'Chart', chartQuery());
+  aliasGQLQuery(req, 'LiquidityProvisions', liquidityProvisionsQuery());
+  aliasGQLQuery(
+    req,
+    'LiquidityProviderFeeShare',
+    liquidityProviderFeeShareQuery
+  );
   aliasGQLQuery(req, 'Candles', candlesQuery());
   aliasGQLQuery(req, 'Withdrawals', withdrawalsQuery());
   aliasGQLQuery(req, 'NetworkParams', networkParamsQuery());

apps/trading/client-pages/liquidity/liquidity.tsx

@@ -150,6 +150,7 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
       <HeaderStat
         heading={t('Target stake')}
         description={tooltipMapping['targetStake']}
+        testId="target-stake"
       >
         <div>
           {targetStake
@@ -163,6 +164,7 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
       <HeaderStat
         heading={t('Supplied stake')}
         description={tooltipMapping['suppliedStake']}
+        testId="supplied-stake"
       >
         <div>
           {suppliedStake
@@ -178,10 +180,10 @@ const LiquidityViewHeader = memo(({ marketId }: { marketId?: string }) => {
 
         {formatNumberPercentage(percentage, 2)}
       </HeaderStat>
-      <HeaderStat heading={t('Market ID')}>
+      <HeaderStat heading={t('Market ID')} testId="liquidity-market-id">
         <div className="break-word">{marketId}</div>
       </HeaderStat>
-      <HeaderStat heading={t('Learn more')}>
+      <HeaderStat heading={t('Learn more')} testId="liquidity-learn-more">
         {DocsLinks ? (
           <ExternalLink href={DocsLinks.LIQUIDITY}>
             {t('Providing liquidity')}

apps/trading/client-pages/market/market-selector.tsx

@@ -151,7 +151,11 @@ export const MarketSelector = ({
       </div>
       <div className="px-4 py-2">
         <span className="inline-block border-b border-black dark:border-white">
-          <Link to={'/markets/all'} className="flex items-center gap-x-2">
+          <Link
+            to={'/markets/all'}
+            data-testid="all-markets-link"
+            className="flex items-center gap-x-2"
+          >
             {t('All markets')}
             <VegaIcon name={VegaIconNames.ARROW_RIGHT} />
           </Link>

libs/cypress/mock.ts

@@ -28,3 +28,4 @@ export * from '../trades/src/lib/trades.mock';
 export * from '../withdraws/src/lib/withdrawal.mock';
 export * from '../proposals/src/lib/protocol-upgrade-proposals/protocol-statistics-proposals.mock';
 export * from '../proposals/src/lib/protocol-upgrade-proposals/block-statistics.mock';
+export * from '../liquidity/src/lib/liquidity.mock';

libs/liquidity/src/lib/MarketLiquidity.graphql

@@ -1,39 +1,3 @@
-# MarketLp
-
-query MarketLp($marketId: ID!) {
-  market(id: $marketId) {
-    id
-    decimalPlaces
-    positionDecimalPlaces
-    tradableInstrument {
-      instrument {
-        code
-        name
-        product {
-          ... on Future {
-            settlementAsset {
-              id
-              symbol
-              decimals
-            }
-          }
-        }
-      }
-    }
-    data {
-      market {
-        id
-      }
-      marketTradingMode
-      suppliedStake
-      openInterest
-      targetStake
-      trigger
-      marketValueProxy
-    }
-  }
-}
-
 # Liquidity Provisions
 
 fragment LiquidityProvisionFields on LiquidityProvision {

libs/liquidity/src/lib/__generated__/MarketLiquidity.ts

@@ -3,13 +3,6 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type MarketLpQueryVariables = Types.Exact<{
-  marketId: Types.Scalars['ID'];
-}>;
-
-
-export type MarketLpQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', code: string, name: string, product: { __typename?: 'Future', settlementAsset: { __typename?: 'Asset', id: string, symbol: string, decimals: number } } } }, data?: { __typename?: 'MarketData', marketTradingMode: Types.MarketTradingMode, suppliedStake?: string | null, openInterest: string, targetStake?: string | null, trigger: Types.AuctionTrigger, marketValueProxy: string, market: { __typename?: 'Market', id: string } } | null } | null };
-
 export type LiquidityProvisionFieldsFragment = { __typename?: 'LiquidityProvision', createdAt: any, updatedAt?: any | null, commitmentAmount: string, fee: string, status: Types.LiquidityProvisionStatus, party: { __typename?: 'Party', id: string, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string } } | null> | null } | null } };
 
 export type LiquidityProvisionsQueryVariables = Types.Exact<{
@@ -65,69 +58,6 @@ export const LiquidityProviderFeeShareFieldsFragmentDoc = gql`
   averageEntryValuation
 }
     `;
-export const MarketLpDocument = gql`
-    query MarketLp($marketId: ID!) {
-  market(id: $marketId) {
-    id
-    decimalPlaces
-    positionDecimalPlaces
-    tradableInstrument {
-      instrument {
-        code
-        name
-        product {
-          ... on Future {
-            settlementAsset {
-              id
-              symbol
-              decimals
-            }
-          }
-        }
-      }
-    }
-    data {
-      market {
-        id
-      }
-      marketTradingMode
-      suppliedStake
-      openInterest
-      targetStake
-      trigger
-      marketValueProxy
-    }
-  }
-}
-    `;
-
-/**
- * __useMarketLpQuery__
- *
- * To run a query within a React component, call `useMarketLpQuery` and pass it any options that fit your needs.
- * When your component renders, `useMarketLpQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useMarketLpQuery({
- *   variables: {
- *      marketId: // value for 'marketId'
- *   },
- * });
- */
-export function useMarketLpQuery(baseOptions: Apollo.QueryHookOptions<MarketLpQuery, MarketLpQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<MarketLpQuery, MarketLpQueryVariables>(MarketLpDocument, options);
-      }
-export function useMarketLpLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarketLpQuery, MarketLpQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<MarketLpQuery, MarketLpQueryVariables>(MarketLpDocument, options);
-        }
-export type MarketLpQueryHookResult = ReturnType<typeof useMarketLpQuery>;
-export type MarketLpLazyQueryHookResult = ReturnType<typeof useMarketLpLazyQuery>;
-export type MarketLpQueryResult = Apollo.QueryResult<MarketLpQuery, MarketLpQueryVariables>;
 export const LiquidityProvisionsDocument = gql`
     query LiquidityProvisions($marketId: ID!) {
   market(id: $marketId) {

libs/liquidity/src/lib/liquidity-data-provider.spec.tsx

@@ -1,10 +1,7 @@
 import type { LiquidityProviderFeeShare } from '@vegaprotocol/types';
 import { AccountType } from '@vegaprotocol/types';
 import { getLiquidityProvision } from './liquidity-data-provider';
-import type {
-  LiquidityProvisionFieldsFragment,
-  MarketLpQuery,
-} from './__generated__/MarketLiquidity';
+import type { LiquidityProvisionFieldsFragment } from './__generated__/MarketLiquidity';
 
 const input = {
   liquidityProvisions: [
@@ -34,44 +31,6 @@ const input = {
       __typename: 'LiquidityProvision',
     } as LiquidityProvisionFieldsFragment,
   ],
-  marketLiquidity: {
-    market: {
-      id: 'ccbd651b4a1167fd73c4a0340ac759fa0a31ca487ad46a13254b741ad71947ed',
-      decimalPlaces: 5,
-      positionDecimalPlaces: 3,
-      tradableInstrument: {
-        instrument: {
-          code: 'UNIDAI.MF21',
-          name: 'UNIDAI Monthly (Dec 2022)',
-          product: {
-            settlementAsset: {
-              id: '16ae5dbb1fd7aa2ddef725703bfe66b3647a4da7b844bfdd04e985756f53d9d6',
-              symbol: 'tDAI',
-              decimals: 18,
-              __typename: 'Asset',
-            },
-            __typename: 'Future',
-          },
-          __typename: 'Instrument',
-        },
-        __typename: 'TradableInstrument',
-      },
-      data: {
-        market: {
-          id: 'ccbd651b4a1167fd73c4a0340ac759fa0a31ca487ad46a13254b741ad71947ed',
-          __typename: 'Market',
-        },
-        marketTradingMode: 'TRADING_MODE_CONTINUOUS',
-        suppliedStake: '18003328918633596575000',
-        openInterest: '89660',
-        targetStake: '70159269843504000000',
-        trigger: 'AUCTION_TRIGGER_UNSPECIFIED',
-        marketValueProxy: '18003328918633596575000',
-        __typename: 'MarketData',
-      },
-      __typename: 'Market',
-    },
-  } as MarketLpQuery,
   liquidityFeeShare: [
     {
       party: {
@@ -88,7 +47,6 @@ const input = {
 const result = [
   {
     __typename: 'LiquidityProvision',
-    assetDecimalPlaces: 18,
     averageEntryValuation: '12064118310408958216220.7224556301338111',
     balance: '1.8003328918633596575e+22',
     commitmentAmount: '18003328918633596575000',
@@ -119,74 +77,25 @@ const result = [
 
 describe('getLiquidityProvision', () => {
   it('should return an empty array when no data is provided', () => {
-    const data = getLiquidityProvision([], {}, []);
+    const data = getLiquidityProvision([], []);
     expect(data).toEqual([]);
   });
 
   it('should return correct array when correct liquidity provision parameters are provided', () => {
     const data = getLiquidityProvision(
       input.liquidityProvisions,
-      input.marketLiquidity,
       input.liquidityFeeShare
     );
     expect(data).toStrictEqual(result);
   });
 
   it('should return empty array when no liquidity provision parameters are provided', () => {
-    const data = getLiquidityProvision(
-      [],
-      input.marketLiquidity,
-      input.liquidityFeeShare
-    );
+    const data = getLiquidityProvision([], input.liquidityFeeShare);
     expect(data).toStrictEqual([]);
   });
 
-  it('should return empty array when no market lp query parameter is provided', () => {
-    const data = getLiquidityProvision(
-      input.liquidityProvisions,
-      {},
-      input.liquidityFeeShare
-    );
-    const result = [
-      {
-        __typename: 'LiquidityProvision',
-        assetDecimalPlaces: undefined,
-        averageEntryValuation: '12064118310408958216220.7224556301338111',
-        balance: '1.8003328918633596575e+22',
-        commitmentAmount: '18003328918633596575000',
-        createdAt: '2022-12-16T09:28:29.071781Z',
-        equityLikeShare: '1',
-        fee: '0.001',
-        party: {
-          __typename: 'Party',
-          accountsConnection: {
-            __typename: 'AccountsConnection',
-            edges: [
-              {
-                __typename: 'AccountEdge',
-                node: {
-                  __typename: 'AccountBalance',
-                  balance: '18003328918633596575000',
-                  type: 'ACCOUNT_TYPE_BOND',
-                },
-              },
-            ],
-          },
-          id: 'dde288688af2aeb5feb349dd72d3679a7a9be34c7375f6a4a48ef2f6140e7e59',
-        },
-        status: 'STATUS_ACTIVE',
-        updatedAt: '2023-01-04T22:13:27.761985Z',
-      },
-    ];
-    expect(data).toStrictEqual(result);
-  });
-
   it('should return empty array when no liquidity fee share param is provided', () => {
-    const data = getLiquidityProvision(
-      input.liquidityProvisions,
-      input.marketLiquidity,
-      []
-    );
+    const data = getLiquidityProvision(input.liquidityProvisions, []);
     const result = [
       {
         __typename: 'LiquidityProvision',

libs/liquidity/src/lib/liquidity-data-provider.ts

@@ -11,12 +11,9 @@ import {
   LiquidityProviderFeeShareDocument,
   LiquidityProvisionsDocument,
   LiquidityProvisionsUpdateDocument,
-  MarketLpDocument,
 } from './__generated__/MarketLiquidity';
 
 import type {
-  MarketLpQuery,
-  MarketLpQueryVariables,
   LiquidityProviderFeeShareFieldsFragment,
   LiquidityProviderFeeShareQuery,
   LiquidityProviderFeeShareQueryVariables,
@@ -78,19 +75,6 @@ export const liquidityProvisionsDataProvider = makeDataProvider<
   },
 });
 
-export const marketLiquidityDataProvider = makeDataProvider<
-  MarketLpQuery,
-  MarketLpQuery,
-  never,
-  never,
-  MarketLpQueryVariables
->({
-  query: MarketLpDocument,
-  getData: (responseData: MarketLpQuery | null) => {
-    return responseData;
-  },
-});
-
 export const liquidityFeeShareDataProvider = makeDataProvider<
   LiquidityProviderFeeShareQuery,
   LiquidityProviderFeeShareFieldsFragment[],
@@ -109,29 +93,24 @@ export type Filter = { partyId?: string; active?: boolean };
 export const lpAggregatedDataProvider = makeDerivedDataProvider<
   LiquidityProvisionData[],
   never,
-  MarketLpQueryVariables & { filter?: Filter }
+  LiquidityProvisionsQueryVariables & { filter?: Filter }
 >(
   [
     (callback, client, variables) =>
       liquidityProvisionsDataProvider(callback, client, {
         marketId: variables.marketId,
       }),
-    (callback, client, variables) =>
-      marketLiquidityDataProvider(callback, client, {
-        marketId: variables.marketId,
-      }),
     (callback, client, variables) =>
       liquidityFeeShareDataProvider(callback, client, {
         marketId: variables.marketId,
       }),
   ],
   (
-    [liquidityProvisions, marketLiquidity, liquidityFeeShare],
+    [liquidityProvisions, liquidityFeeShare],
     { filter }
   ): LiquidityProvisionData[] => {
     return getLiquidityProvision(
       liquidityProvisions,
-      marketLiquidity,
       liquidityFeeShare,
       filter
     );
@@ -162,7 +141,6 @@ export const matchFilter = (
 
 export const getLiquidityProvision = (
   liquidityProvisions: LiquidityProvisionFieldsFragment[],
-  marketLiquidity: MarketLpQuery,
   liquidityFeeShare: LiquidityProviderFeeShareFieldsFragment[],
   filter?: Filter
 ): LiquidityProvisionData[] => {
@@ -183,7 +161,6 @@ export const getLiquidityProvision = (
       return true;
     })
     .map((lp) => {
-      const market = marketLiquidity?.market;
       const feeShare = liquidityFeeShare.find(
         (f) => f.party.id === lp.party.id
       );
@@ -205,9 +182,6 @@ export const getLiquidityProvision = (
         ...lp,
         averageEntryValuation: feeShare?.averageEntryValuation,
         equityLikeShare: feeShare?.equityLikeShare,
-        assetDecimalPlaces:
-          market?.tradableInstrument.instrument.product.settlementAsset
-            .decimals,
         balance,
       };
     });

libs/liquidity/src/lib/liquidity-table.tsx

@@ -55,7 +55,7 @@ export const LiquidityTable = forwardRef<AgGridReact, LiquidityTableProps>(
       <AgGrid
         style={{ width: '100%', height: '100%' }}
         overlayNoRowsTemplate={t('No liquidity provisions')}
-        getRowId={({ data }) => data.id}
+        getRowId={({ data }) => `${data.party.id}-${data.status}`}
         ref={ref}
         tooltipShowDelay={500}
         defaultColDef={{

libs/liquidity/src/lib/liquidity.mock.ts

@@ -0,0 +1,119 @@
+import merge from 'lodash/merge';
+import * as Schema from '@vegaprotocol/types';
+import type { PartialDeep } from 'type-fest';
+import type {
+  LiquidityProviderFeeShareQuery,
+  LiquidityProvisionsQuery,
+} from './__generated__/MarketLiquidity';
+import type { LiquidityProvisionFieldsFragment } from './__generated__/MarketLiquidity';
+
+export const liquidityProvisionsQuery = (
+  override?: PartialDeep<LiquidityProvisionsQuery>
+): LiquidityProvisionsQuery => {
+  const defaultResult: LiquidityProvisionsQuery = {
+    market: {
+      liquidityProvisionsConnection: {
+        __typename: 'LiquidityProvisionsConnection',
+        edges: liquidityFields.map((node) => {
+          return {
+            __typename: 'LiquidityProvisionsEdge',
+            node,
+          };
+        }),
+      },
+    },
+  };
+  return merge(defaultResult, override);
+};
+
+export const liquidityProviderFeeShareQuery = (
+  override?: PartialDeep<LiquidityProviderFeeShareQuery>
+): LiquidityProviderFeeShareQuery => {
+  const defaultResult: LiquidityProviderFeeShareQuery = {
+    market: {
+      id: 'market-0',
+      data: {
+        market: {
+          id: 'market-0',
+          __typename: 'Market',
+        },
+        liquidityProviderFeeShare: [
+          {
+            party: {
+              id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+              __typename: 'Party',
+            },
+            equityLikeShare: '1',
+            averageEntryValuation: '68585293691.5598054356207737',
+            __typename: 'LiquidityProviderFeeShare',
+          },
+          {
+            party: {
+              id: 'cc464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+              __typename: 'Party',
+            },
+            equityLikeShare: '1',
+            averageEntryValuation: '68585293691.5598054356207737',
+            __typename: 'LiquidityProviderFeeShare',
+          },
+        ],
+        __typename: 'MarketData',
+      },
+      __typename: 'Market',
+    },
+  };
+  return merge(defaultResult, override);
+};
+
+export const liquidityFields: LiquidityProvisionFieldsFragment[] = [
+  {
+    party: {
+      id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+      accountsConnection: {
+        edges: [
+          {
+            node: {
+              type: Schema.AccountType.ACCOUNT_TYPE_BOND,
+              balance: '400000000',
+              __typename: 'AccountBalance',
+            },
+            __typename: 'AccountEdge',
+          },
+        ],
+        __typename: 'AccountsConnection',
+      },
+      __typename: 'Party',
+    },
+    createdAt: '2023-05-15T11:47:15.132571Z',
+    updatedAt: '2023-05-15T11:47:15.132571Z',
+    commitmentAmount: '400000000',
+    fee: '0.0009',
+    status: Schema.LiquidityProvisionStatus.STATUS_ACTIVE,
+    __typename: 'LiquidityProvision',
+  },
+  {
+    party: {
+      id: 'cc464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
+      accountsConnection: {
+        edges: [
+          {
+            node: {
+              type: Schema.AccountType.ACCOUNT_TYPE_BOND,
+              balance: '200000000',
+              __typename: 'AccountBalance',
+            },
+            __typename: 'AccountEdge',
+          },
+        ],
+        __typename: 'AccountsConnection',
+      },
+      __typename: 'Party',
+    },
+    createdAt: '2023-05-15T11:47:15.132571Z',
+    updatedAt: '2023-05-15T11:47:15.132571Z',
+    commitmentAmount: '400000000',
+    fee: '0.004',
+    status: Schema.LiquidityProvisionStatus.STATUS_PENDING,
+    __typename: 'LiquidityProvision',
+  },
+];

libs/markets/src/lib/components/oracle-full-profile/oracle-full-profile.tsx

@@ -104,9 +104,7 @@ export const OracleFullProfile = ({
         <div className="mb-2">{message}</div>
         <div className="mb-2">
           <ReactMarkdown
-            className="react-markdown-container [word-break:break-word]"
-            skipHtml={true}
-            disallowedElements={['img']}
+            className="[word-break:break-word]"
             linkTarget="_blank"
           >
             {showMore

libs/markets/src/lib/hooks/use-market-oracle.spec.ts

@@ -84,7 +84,7 @@ describe('useMarketOracle', () => {
             type: 'eth_address',
           },
         ],
-        oracle: {},
+        oracle: { eth_address: 'eth_address' },
       } as Provider,
       {
         proofs: [
@@ -93,7 +93,7 @@ describe('useMarketOracle', () => {
             type: 'eth_address',
           },
         ],
-        oracle: {},
+        oracle: { eth_address: address },
       } as Provider,
     ];
     mockOracleProofs.mockReturnValueOnce({
@@ -113,7 +113,9 @@ describe('useMarketOracle', () => {
             type: 'public_key',
           },
         ],
-        oracle: {},
+        oracle: {
+          public_key: 'public_key',
+        },
       } as Provider,
       {
         proofs: [
@@ -122,7 +124,9 @@ describe('useMarketOracle', () => {
             type: 'public_key',
           },
         ],
-        oracle: {},
+        oracle: {
+          public_key: key,
+        },
       } as Provider,
     ];
     mockOracleProofs.mockReturnValueOnce({

libs/markets/src/lib/hooks/use-market-oracle.ts

@@ -9,32 +9,30 @@ import type { DataSourceSpecFragment } from '../__generated__';
 export const getMatchingOracleProvider = (
   dataSourceSpec: DataSourceSpecFragment,
   providers: Provider[]
-) =>
-  providers.find((provider) =>
-    provider.proofs.some((proof) => {
-      if (
-        proof.type === 'eth_address' &&
-        dataSourceSpec.sourceType.__typename === 'DataSourceDefinitionExternal'
-      ) {
-        return dataSourceSpec.sourceType.sourceType.signers?.some(
-          (signer) =>
-            signer.signer.__typename === 'ETHAddress' &&
-            signer.signer.address === proof.eth_address
-        );
-      }
-      if (
-        proof.type === 'public_key' &&
-        dataSourceSpec.sourceType.__typename === 'DataSourceDefinitionExternal'
-      ) {
-        return dataSourceSpec.sourceType.sourceType.signers?.some(
-          (signer) =>
-            signer.signer.__typename === 'PubKey' &&
-            signer.signer.key === proof.public_key
-        );
-      }
-      return false;
-    })
-  );
+) => {
+  return providers.find((provider) => {
+    let oracleSignature: string;
+    const oracle = provider.oracle;
+    if ('public_key' in oracle && oracle.public_key) {
+      oracleSignature = oracle.public_key;
+    } else if ('eth_address' in oracle && oracle.eth_address) {
+      oracleSignature = oracle.eth_address;
+    }
+
+    if (
+      dataSourceSpec.sourceType.__typename === 'DataSourceDefinitionExternal'
+    ) {
+      return dataSourceSpec.sourceType.sourceType.signers?.some(
+        (signer) =>
+          (signer.signer.__typename === 'ETHAddress' &&
+            signer.signer.address === oracleSignature) ||
+          (signer.signer.__typename === 'PubKey' &&
+            signer.signer.key === oracleSignature)
+      );
+    }
+    return false;
+  });
+};
 
 export const useMarketOracle = (
   marketId: string,

libs/markets/src/lib/hooks/use-oracle-markets.spec.ts

@@ -0,0 +1,676 @@
+import { renderHook } from '@testing-library/react';
+import type { Provider } from '../oracle-schema';
+import { useOracleMarkets } from './use-oracle-markets';
+const mockMarkets = jest.fn<{ data: unknown | null }, unknown[]>(() => ({
+  data: marketsData,
+}));
+
+jest.mock('../__generated__/OracleMarketsSpec', () => ({
+  useOracleMarketsSpecQuery: jest.fn((args) => mockMarkets()),
+}));
+
+describe('useOracleMarkets', () => {
+  it('returns undefined if no market data present', () => {
+    mockMarkets.mockReturnValueOnce({ data: null });
+    const { result } = renderHook(() => useOracleMarkets(mockProvider));
+    expect(result.current).toBeUndefined();
+  });
+
+  it('returns correct market list for the given provider', () => {
+    mockMarkets.mockReturnValueOnce({ data: marketsData });
+    const { result } = renderHook(() => useOracleMarkets(mockProvider));
+    console.log(JSON.stringify(result.current));
+    expect(result.current).toStrictEqual(oracleMarkets);
+  });
+});
+
+const mockProvider: Provider = {
+  name: 'Mock Oracle',
+  url: 'https://Mock.com',
+  description_markdown: 'mock oracle description',
+  oracle: {
+    status: 'GOOD',
+    status_reason: '',
+    first_verified: '2023-05-22T00:00:00.000Z',
+    last_verified: '2023-05-22T00:00:00.000Z',
+    type: 'eth_address',
+    eth_address: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
+  },
+  proofs: [
+    {
+      format: 'url',
+      available: true,
+      type: 'web',
+      url: 'https://web.archive.org/web/20200923175817/https://docs.pro.Mock.com/#oracle',
+    },
+  ],
+  github_link:
+    'https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/eth_address-0xaddress.toml',
+};
+
+const marketsData = {
+  marketsConnection: {
+    __typename: 'MarketConnection',
+    edges: [
+      {
+        __typename: 'MarketEdge',
+        node: {
+          __typename: 'Market',
+          id: '2dca7baa5f7269b08d053668bca03f97f72e9a162327eebd941c54f1f9fb8f80',
+          state: 'STATE_ACTIVE',
+          tradingMode: 'TRADING_MODE_CONTINUOUS',
+          tradableInstrument: {
+            __typename: 'TradableInstrument',
+            instrument: {
+              __typename: 'Instrument',
+              id: '',
+              name: 'BTC/USDT expiry 2023 June 30th',
+              code: 'BTC/USDT-230630',
+              product: {
+                __typename: 'Future',
+                dataSourceSpecForSettlementData: {
+                  __typename: 'DataSourceSpec',
+                  id: '6eb55cdb9e3d1697d9df2eb2d97c4560da3519652fdf7e542f5801fc0919c32d',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionExternal',
+                      sourceType: {
+                        __typename: 'DataSourceSpecConfiguration',
+                        signers: [
+                          {
+                            __typename: 'Signer',
+                            signer: {
+                              __typename: 'ETHAddress',
+                              address: '0xaddress',
+                            },
+                          },
+                        ],
+                        filters: [
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.BTC.value',
+                              type: 'TYPE_INTEGER',
+                              numberDecimalPlaces: 6,
+                            },
+                          },
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.BTC.timestamp',
+                              type: 'TYPE_TIMESTAMP',
+                              numberDecimalPlaces: null,
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  __typename: 'DataSourceSpec',
+                  id: '01d86d6182ee2e03cf02f9091734494932d39ab5ae6f23f7f5fd1fbe6668d422',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionInternal',
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  __typename: 'DataSourceSpecToFutureBinding',
+                  settlementDataProperty: 'prices.BTC.value',
+                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+                },
+              },
+            },
+          },
+        },
+      },
+      {
+        __typename: 'MarketEdge',
+        node: {
+          __typename: 'Market',
+          id: '84025e68387cf61c2b91228d768dcdd4f10a9ee5cd2824fdea35b259976f59c1',
+          state: 'STATE_ACTIVE',
+          tradingMode: 'TRADING_MODE_CONTINUOUS',
+          tradableInstrument: {
+            __typename: 'TradableInstrument',
+            instrument: {
+              __typename: 'Instrument',
+              id: '',
+              name: 'LINK/USDT expiry 2023 June 30th',
+              code: 'LINK/USDT-230630',
+              product: {
+                __typename: 'Future',
+                dataSourceSpecForSettlementData: {
+                  __typename: 'DataSourceSpec',
+                  id: 'bd709a4e6820d8714241f4c9576dffa71108179663c1f8442c991121fa1b0251',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionExternal',
+                      sourceType: {
+                        __typename: 'DataSourceSpecConfiguration',
+                        signers: [
+                          {
+                            __typename: 'Signer',
+                            signer: {
+                              __typename: 'ETHAddress',
+                              address: '0xaddress',
+                            },
+                          },
+                        ],
+                        filters: [
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.LINK.value',
+                              type: 'TYPE_INTEGER',
+                              numberDecimalPlaces: 6,
+                            },
+                          },
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.LINK.timestamp',
+                              type: 'TYPE_TIMESTAMP',
+                              numberDecimalPlaces: null,
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  __typename: 'DataSourceSpec',
+                  id: '01d86d6182ee2e03cf02f9091734494932d39ab5ae6f23f7f5fd1fbe6668d422',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionInternal',
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  __typename: 'DataSourceSpecToFutureBinding',
+                  settlementDataProperty: 'prices.LINK.value',
+                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+                },
+              },
+            },
+          },
+        },
+      },
+      {
+        __typename: 'MarketEdge',
+        node: {
+          __typename: 'Market',
+          id: '4507930a8c508eef6731f1342720adfa5f46096a8ef7a5848450740132ab78ab',
+          state: 'STATE_ACTIVE',
+          tradingMode: 'TRADING_MODE_CONTINUOUS',
+          tradableInstrument: {
+            __typename: 'TradableInstrument',
+            instrument: {
+              __typename: 'Instrument',
+              id: '',
+              name: 'ETH/USDT expiry 2023 June 30th',
+              code: 'ETH/USDT-230630',
+              product: {
+                __typename: 'Future',
+                dataSourceSpecForSettlementData: {
+                  __typename: 'DataSourceSpec',
+                  id: '2687518113f63219a0b7594688dc78be62c86936a8ce306f50032ec70bdce493',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionExternal',
+                      sourceType: {
+                        __typename: 'DataSourceSpecConfiguration',
+                        signers: [
+                          {
+                            __typename: 'Signer',
+                            signer: {
+                              __typename: 'ETHAddress',
+                              address: '0xaddress',
+                            },
+                          },
+                        ],
+                        filters: [
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.ETH.value',
+                              type: 'TYPE_INTEGER',
+                              numberDecimalPlaces: 6,
+                            },
+                          },
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.ETH.timestamp',
+                              type: 'TYPE_TIMESTAMP',
+                              numberDecimalPlaces: null,
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  __typename: 'DataSourceSpec',
+                  id: '01d86d6182ee2e03cf02f9091734494932d39ab5ae6f23f7f5fd1fbe6668d422',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionInternal',
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  __typename: 'DataSourceSpecToFutureBinding',
+                  settlementDataProperty: 'prices.ETH.value',
+                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+                },
+              },
+            },
+          },
+        },
+      },
+      {
+        __typename: 'MarketEdge',
+        node: {
+          __typename: 'Market',
+          id: '074c929bba8faeeeba352b2569fc5360a59e12cdcbf60f915b492c4ac228b566',
+          state: 'STATE_PROPOSED',
+          tradingMode: 'TRADING_MODE_NO_TRADING',
+          tradableInstrument: {
+            __typename: 'TradableInstrument',
+            instrument: {
+              __typename: 'Instrument',
+              id: '',
+              name: 'LINK/USDT expiry 2023 Sept 30th',
+              code: 'LINK/USDT-230930',
+              product: {
+                __typename: 'Future',
+                dataSourceSpecForSettlementData: {
+                  __typename: 'DataSourceSpec',
+                  id: 'cda7643a04cb45f62fdb06851a6fea2dc18d94931f2eab58f6918c6c13352fb6',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionExternal',
+                      sourceType: {
+                        __typename: 'DataSourceSpecConfiguration',
+                        signers: [
+                          {
+                            __typename: 'Signer',
+                            signer: {
+                              __typename: 'ETHAddress',
+                              address: '0xaddress',
+                            },
+                          },
+                        ],
+                        filters: [
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.LINK.value',
+                              type: 'TYPE_INTEGER',
+                              numberDecimalPlaces: 6,
+                            },
+                          },
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.LINK.timestamp',
+                              type: 'TYPE_TIMESTAMP',
+                              numberDecimalPlaces: null,
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  __typename: 'DataSourceSpec',
+                  id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionInternal',
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  __typename: 'DataSourceSpecToFutureBinding',
+                  settlementDataProperty: 'prices.LINK.value',
+                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+                },
+              },
+            },
+          },
+        },
+      },
+      {
+        __typename: 'MarketEdge',
+        node: {
+          __typename: 'Market',
+          id: '2c2ea995d7366e423be7604f63ce047aa7186eb030ecc7b77395eae2fcbffcc5',
+          state: 'STATE_PROPOSED',
+          tradingMode: 'TRADING_MODE_NO_TRADING',
+          tradableInstrument: {
+            __typename: 'TradableInstrument',
+            instrument: {
+              __typename: 'Instrument',
+              id: '',
+              name: 'ETH/USDT expiry 2023 Sept 30th',
+              code: 'ETH/USDT-230930',
+              product: {
+                __typename: 'Future',
+                dataSourceSpecForSettlementData: {
+                  __typename: 'DataSourceSpec',
+                  id: 'bb59cbdfbe167abc714954bf474354ac80b2feb798b907d6d86554fdd551f804',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionExternal',
+                      sourceType: {
+                        __typename: 'DataSourceSpecConfiguration',
+                        signers: [
+                          {
+                            __typename: 'Signer',
+                            signer: {
+                              __typename: 'ETHAddress',
+                              address:
+                                '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
+                            },
+                          },
+                        ],
+                        filters: [
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.ETH.value',
+                              type: 'TYPE_INTEGER',
+                              numberDecimalPlaces: 6,
+                            },
+                          },
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.ETH.timestamp',
+                              type: 'TYPE_TIMESTAMP',
+                              numberDecimalPlaces: null,
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  __typename: 'DataSourceSpec',
+                  id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionInternal',
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  __typename: 'DataSourceSpecToFutureBinding',
+                  settlementDataProperty: 'prices.ETH.value',
+                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+                },
+              },
+            },
+          },
+        },
+      },
+      {
+        __typename: 'MarketEdge',
+        node: {
+          __typename: 'Market',
+          id: '5b05109662e7434fea498c4a1c91d3179b80e9b8950d6106cec60e1f342fc604',
+          state: 'STATE_PROPOSED',
+          tradingMode: 'TRADING_MODE_NO_TRADING',
+          tradableInstrument: {
+            __typename: 'TradableInstrument',
+            instrument: {
+              __typename: 'Instrument',
+              id: '',
+              name: 'BTC/USDT expiry 2023 Sept 30th',
+              code: 'BTC/USDT-230930',
+              product: {
+                __typename: 'Future',
+                dataSourceSpecForSettlementData: {
+                  __typename: 'DataSourceSpec',
+                  id: '99a1551b8cc7b75a3628a768e0772dde4c5a1ddf6c647507079c2e111d614a28',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionExternal',
+                      sourceType: {
+                        __typename: 'DataSourceSpecConfiguration',
+                        signers: [
+                          {
+                            __typename: 'Signer',
+                            signer: {
+                              __typename: 'ETHAddress',
+                              address:
+                                '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
+                            },
+                          },
+                        ],
+                        filters: [
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.BTC.value',
+                              type: 'TYPE_INTEGER',
+                              numberDecimalPlaces: 6,
+                            },
+                          },
+                          {
+                            __typename: 'Filter',
+                            key: {
+                              __typename: 'PropertyKey',
+                              name: 'prices.BTC.timestamp',
+                              type: 'TYPE_TIMESTAMP',
+                              numberDecimalPlaces: null,
+                            },
+                          },
+                        ],
+                      },
+                    },
+                  },
+                },
+                dataSourceSpecForTradingTermination: {
+                  __typename: 'DataSourceSpec',
+                  id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
+                  data: {
+                    __typename: 'DataSourceDefinition',
+                    sourceType: {
+                      __typename: 'DataSourceDefinitionInternal',
+                    },
+                  },
+                },
+                dataSourceSpecBinding: {
+                  __typename: 'DataSourceSpecToFutureBinding',
+                  settlementDataProperty: 'prices.BTC.value',
+                  tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+                },
+              },
+            },
+          },
+        },
+      },
+    ],
+  },
+};
+
+const oracleMarkets = [
+  {
+    __typename: 'Market',
+    id: '2c2ea995d7366e423be7604f63ce047aa7186eb030ecc7b77395eae2fcbffcc5',
+    state: 'STATE_PROPOSED',
+    tradingMode: 'TRADING_MODE_NO_TRADING',
+    tradableInstrument: {
+      __typename: 'TradableInstrument',
+      instrument: {
+        __typename: 'Instrument',
+        id: '',
+        name: 'ETH/USDT expiry 2023 Sept 30th',
+        code: 'ETH/USDT-230930',
+        product: {
+          __typename: 'Future',
+          dataSourceSpecForSettlementData: {
+            __typename: 'DataSourceSpec',
+            id: 'bb59cbdfbe167abc714954bf474354ac80b2feb798b907d6d86554fdd551f804',
+            data: {
+              __typename: 'DataSourceDefinition',
+              sourceType: {
+                __typename: 'DataSourceDefinitionExternal',
+                sourceType: {
+                  __typename: 'DataSourceSpecConfiguration',
+                  signers: [
+                    {
+                      __typename: 'Signer',
+                      signer: {
+                        __typename: 'ETHAddress',
+                        address: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
+                      },
+                    },
+                  ],
+                  filters: [
+                    {
+                      __typename: 'Filter',
+                      key: {
+                        __typename: 'PropertyKey',
+                        name: 'prices.ETH.value',
+                        type: 'TYPE_INTEGER',
+                        numberDecimalPlaces: 6,
+                      },
+                    },
+                    {
+                      __typename: 'Filter',
+                      key: {
+                        __typename: 'PropertyKey',
+                        name: 'prices.ETH.timestamp',
+                        type: 'TYPE_TIMESTAMP',
+                        numberDecimalPlaces: null,
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          },
+          dataSourceSpecForTradingTermination: {
+            __typename: 'DataSourceSpec',
+            id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
+            data: {
+              __typename: 'DataSourceDefinition',
+              sourceType: { __typename: 'DataSourceDefinitionInternal' },
+            },
+          },
+          dataSourceSpecBinding: {
+            __typename: 'DataSourceSpecToFutureBinding',
+            settlementDataProperty: 'prices.ETH.value',
+            tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+          },
+        },
+      },
+    },
+  },
+  {
+    __typename: 'Market',
+    id: '5b05109662e7434fea498c4a1c91d3179b80e9b8950d6106cec60e1f342fc604',
+    state: 'STATE_PROPOSED',
+    tradingMode: 'TRADING_MODE_NO_TRADING',
+    tradableInstrument: {
+      __typename: 'TradableInstrument',
+      instrument: {
+        __typename: 'Instrument',
+        id: '',
+        name: 'BTC/USDT expiry 2023 Sept 30th',
+        code: 'BTC/USDT-230930',
+        product: {
+          __typename: 'Future',
+          dataSourceSpecForSettlementData: {
+            __typename: 'DataSourceSpec',
+            id: '99a1551b8cc7b75a3628a768e0772dde4c5a1ddf6c647507079c2e111d614a28',
+            data: {
+              __typename: 'DataSourceDefinition',
+              sourceType: {
+                __typename: 'DataSourceDefinitionExternal',
+                sourceType: {
+                  __typename: 'DataSourceSpecConfiguration',
+                  signers: [
+                    {
+                      __typename: 'Signer',
+                      signer: {
+                        __typename: 'ETHAddress',
+                        address: '0xfCEAdAFab14d46e20144F48824d0C09B1a03F2BC',
+                      },
+                    },
+                  ],
+                  filters: [
+                    {
+                      __typename: 'Filter',
+                      key: {
+                        __typename: 'PropertyKey',
+                        name: 'prices.BTC.value',
+                        type: 'TYPE_INTEGER',
+                        numberDecimalPlaces: 6,
+                      },
+                    },
+                    {
+                      __typename: 'Filter',
+                      key: {
+                        __typename: 'PropertyKey',
+                        name: 'prices.BTC.timestamp',
+                        type: 'TYPE_TIMESTAMP',
+                        numberDecimalPlaces: null,
+                      },
+                    },
+                  ],
+                },
+              },
+            },
+          },
+          dataSourceSpecForTradingTermination: {
+            __typename: 'DataSourceSpec',
+            id: 'b3bf72d42d2938eceea05725949ecd24d7138a3cd7e29056a46b381efcbb4115',
+            data: {
+              __typename: 'DataSourceDefinition',
+              sourceType: { __typename: 'DataSourceDefinitionInternal' },
+            },
+          },
+          dataSourceSpecBinding: {
+            __typename: 'DataSourceSpecToFutureBinding',
+            settlementDataProperty: 'prices.BTC.value',
+            tradingTerminationProperty: 'vegaprotocol.builtin.timestamp',
+          },
+        },
+      },
+    },
+  },
+];

libs/markets/src/lib/hooks/use-oracle-markets.ts

@@ -5,9 +5,14 @@ import { useOracleMarketsSpecQuery } from '../__generated__/OracleMarketsSpec';
 export const useOracleMarkets = (
   provider: Provider
 ): OracleMarketSpecFieldsFragment[] | undefined => {
-  const signedProofs = provider.proofs.filter(
-    (proof) => proof.format === 'signed_message' && proof.available === true
-  );
+  let oracleSignature: string;
+  const oracle = provider.oracle;
+  if ('public_key' in oracle && oracle.public_key) {
+    oracleSignature = oracle.public_key;
+  }
+  if ('eth_address' in oracle && oracle.eth_address) {
+    oracleSignature = oracle.eth_address;
+  }
 
   const { data: markets } = useOracleMarketsSpecQuery();
 
@@ -20,30 +25,16 @@ export const useOracleMarkets = (
         return false;
       }
       const signers = sourceType?.sourceType.signers;
-
       const signerKeys = signers?.filter(Boolean).map((signer) => {
         if (signer.signer.__typename === 'ETHAddress') {
           return signer.signer.address;
         }
-
         if (signer.signer.__typename === 'PubKey') {
           return signer.signer.key;
         }
-
         return undefined;
       });
-
-      const signedProofsKeys = signedProofs.map((proof) => {
-        if ('public_key' in proof && proof.public_key) {
-          return proof.public_key;
-        }
-        if ('eth_address' in proof && proof.eth_address) {
-          return proof.eth_address;
-        }
-        return undefined;
-      });
-
-      const key = signedProofsKeys.find((key) => signerKeys?.includes(key));
+      const key = signerKeys?.find((key) => key === oracleSignature);
       return !!key;
     });
   return oracleMarkets;

libs/ui-toolkit/README.md

@@ -5,3 +5,11 @@ This library was generated with [Nx](https://nx.dev).
 ## Running unit tests
 
 Run `nx test ui-toolkit` to execute the unit tests via [Jest](https://jestjs.io).
+
+## Build
+
+Run `yarn nx run ui-toolkit:build-storybook`
+
+## Deployment
+
+deployed at: `ui.vega.rocks`