feat(trading): add generic welcome message for non mainnet networks (#3584 )

chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2023-05-02 14:01:33 -07:00 · 2023-05-02 18:09:46 +00:00 · 2023-05-02 10:41:21 -07:00 · 2023-05-02 12:31:16 +00:00 · 2023-05-02 12:08:21 +00:00 · 2023-05-02 10:10:03 +00:00
168 changed files with 4534 additions and 840 deletions
@@ -50,7 +50,7 @@ jobs:
    secrets: inherit

  lint-test-build:
-    timeout-minutes: 35
+    timeout-minutes: 60
    needs: node-modules
    runs-on: ubuntu-22.04
    name: '(CI) lint + unit test + build'
@@ -105,19 +105,44 @@ jobs:
          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
          echo -n "Affected projects: $affected"

+          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g )"
          projects_e2e=""
-          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
-          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
-          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
-          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
+          preview_governance="not deployed"
+          preview_trading="not deployed"
+          preview_explorer="not deployed"
+          if [[ -z "$projects_e2e" ]]; then
+            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          else
+            if [[ $affected == *"governance"* ]]; then
+              projects_e2e+='"governance-e2e" '
+              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            fi
+            if [[ $affected == *"trading"* ]]; then
+              projects_e2e+='"trading-e2e" '
+              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            fi
+            if [[ $affected == *"explorer"* ]]; then
+              projects_e2e+='"explorer-e2e" '
+              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+            fi
+          fi
          projects_e2e=${projects_e2e%?}
          projects_e2e=[${projects_e2e// /,}]
          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
+          echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
+          echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
+          echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV

    outputs:
      projects: ${{ env.PROJECTS }}
      projects-e2e: ${{ env.PROJECTS_E2E }}
+      preview_governance: ${{ env.PREVIEW_GOVERNANCE }}
+      preview_trading: ${{ env.PREVIEW_TRADING }}
+      preview_explorer: ${{ env.PREVIEW_EXPLORER }}

  cypress:
    needs: lint-test-build
@@ -140,7 +165,9 @@ jobs:

  dist-check:
    runs-on: ubuntu-latest
-    needs: publish-dist
+    needs:
+      - publish-dist
+      - lint-test-build
    if: ${{ github.event_name == 'pull_request' }}
    name: '(CD) comment preview links'
    steps:
@@ -151,22 +178,16 @@ jobs:
          issue-number: ${{ github.event.pull_request.number }}
          body-includes: Previews

-      - name: Inject slug/short variables
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: rlespinasse/github-slug-action@v4
-        with:
-          prefix: CI_
-
      - name: Create comment
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
        uses: peter-evans/create-or-update-comment@v3
+        if: ${{ steps.fc.outputs.comment-id == 0 }}
        with:
          issue-number: ${{ github.event.pull_request.number }}
          body: |
-            Previews
-            - explorer https://explorer.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - trading https://trading.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - governance https://governance.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
+            Previews:
+            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
+            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
+            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}

  cypress-check:
    name: '(CI) cypress - check'
@@ -1,20 +1,2 @@
@Library('vega-shared-library') _
-
-def commitHash = 'UNKNOWN'
-
-pipeline {
-  agent any
-  options {
-    skipDefaultCheckout true
-    parallelsAlwaysFailFast()
-  }
-  stages {
-    stage('approbation') {
-      steps {
-        sh 'printenv'
-        checkout scm
-        runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
-      }
-    }
-  }
-}
+runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
@@ -1,7 +1,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_CONFIG_URL=

@@ -18,4 +18,4 @@ NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

 CYPRESS_VEGA_WALLET_API_TOKEN=
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
@@ -25,7 +25,7 @@ module.exports = defineConfig({
  },
  env: {
    environment: 'CUSTOM',
-    networkQueryUrl: 'http://localhost:3028/query',
+    networkQueryUrl: 'http://localhost:3008/graphql',
    ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
    commitHash: 'dev',
    tsConfig: 'tsconfig.json',
@@ -9,21 +9,22 @@ context('Home Page', function () {
    it('should show connected environment stats', function () {
      const statTitles = {
        0: 'Status',
-        1: 'Block height',
-        2: 'Uptime',
-        3: 'Total nodes',
-        4: 'Total staked',
-        5: 'Backlog',
-        6: 'Trades / second',
-        7: 'Orders / block',
-        8: 'Orders / second',
-        9: 'Transactions / block',
-        10: 'Block time',
-        11: 'Time',
-        12: 'App',
-        13: 'Tendermint',
-        14: 'Up since',
-        15: 'Chain ID',
+        1: 'Epoch',
+        2: 'Block height',
+        3: 'Uptime',
+        4: 'Total nodes',
+        5: 'Total staked',
+        6: 'Backlog',
+        7: 'Trades / second',
+        8: 'Orders / block',
+        9: 'Orders / second',
+        10: 'Transactions / block',
+        11: 'Block time',
+        12: 'Time',
+        13: 'App',
+        14: 'Tendermint',
+        15: 'Up since',
+        16: 'Chain ID',
      };

      cy.get('[data-testid="stats-title"]')
@@ -31,42 +32,13 @@ context('Home Page', function () {
          cy.wrap($list).should('contain.text', statTitles[index]);
        })
        .then(($list) => {
-          cy.wrap($list).should('have.length', 16);
+          cy.wrap($list).should('have.length', 17);
        });
-
-      cy.get(statsValue).eq(0).should('contain.text', 'CONNECTED');
-      cy.get(statsValue).eq(1).should('not.be.empty');
-      cy.get(statsValue)
-        .eq(2)
-        .invoke('text')
-        .should('match', /\d+d \d+h \d+m \d+s/i);
-      cy.get(statsValue).eq(3).should('contain.text', '2');
-      cy.get(statsValue)
-        .eq(4)
-        .invoke('text')
-        .should('match', /\d+\.\d\d(?!\d)/i);
-      cy.get(statsValue).eq(5).should('contain.text', '0');
-      cy.get(statsValue).eq(6).should('contain.text', '0');
-      cy.get(statsValue).eq(7).should('contain.text', '0');
-      cy.get(statsValue).eq(8).should('contain.text', '0');
-      cy.get(statsValue).eq(9).should('not.be.empty');
-      cy.get(statsValue).eq(10).should('not.be.empty');
-      cy.get(statsValue).eq(11).should('not.be.empty');
-      cy.get(statsValue)
-        .eq(12)
-        .invoke('text')
-        .should('match', /v\d+\.\d+\.\d+/i);
-      cy.get(statsValue)
-        .eq(13)
-        .invoke('text')
-        .should('match', /\d+\.\d+\.\d+/i);
-      cy.get(statsValue).eq(14).should('not.be.empty');
-      cy.get(statsValue).eq(15).should('not.be.empty');
    });

    it('Block height should be updating', function () {
      cy.get(statsValue)
-        .eq(1)
+        .eq(2)
        .invoke('text')
        .then((blockHeightTxt) => {
          cy.get(statsValue)
@@ -6,7 +6,7 @@ const customNodeBtn = 'custom-node';
 context.skip('Node switcher', { tags: '@regression' }, function () {
  beforeEach('visit home page', function () {
    cy.intercept('GET', 'https://static.vega.xyz/assets/capsule-network.json', {
-      hosts: ['http://localhost:3028/query'],
+      hosts: ['http://localhost:3008/graphql'],
    }).as('nodeData');
    cy.visit('/');
    cy.wait('@nodeData');
@@ -219,7 +219,7 @@ context.skip('Parties page', { tags: '@regression' }, function () {
          balance type asset {id symbol decimals}}}}}}}}';
      cy.request({
        method: 'POST',
-        url: `http://localhost:3028/query`,
+        url: `http://localhost:3008/graphql`,
        body: {
          query: mutation,
        },
@@ -43,7 +43,7 @@ export const AssetLink = ({
        if (asDialog) {
          open(assetId, e.target as HTMLElement);
        } else {
-          navigate(`${Routes.ASSETS}/${asset?.id}`);
+          navigate(`/${Routes.ASSETS}/${asset?.id}`);
        }
      }}
      {...props}
@@ -9,7 +9,7 @@ import SizeInMarket from '../size-in-market/size-in-market';
 export interface DeterministicOrderDetailsProps {
  id: string;
  // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
-  version?: number;
+  version?: number | null;
 }

 export const wrapperClasses =
@@ -28,7 +28,7 @@ export const wrapperClasses =
 */
 const DeterministicOrderDetails = ({
  id,
-  version = 0,
+  version = null,
 }: DeterministicOrderDetailsProps) => {
  const { data, error } = useExplorerDeterministicOrderQuery({
    variables: { orderId: id, version },
@@ -71,7 +71,7 @@ export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
                />
              </td>
              <td className="text-md">
-                <AssetLink assetId={account.asset.id} />
+                <AssetLink assetId={account.asset.id} asDialog={true} />
              </td>
            </TableRow>
          );
@@ -5,7 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS={}

-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -20,7 +20,7 @@ NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
 CYPRESS_EXPLORER_URL=https://explorer.fairground.wtf
@@ -31,6 +31,5 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -50,6 +50,8 @@ const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
 const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
+const fUSDCId =
+  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

@@ -264,7 +266,7 @@ context(
    it('Unable to submit update market proposal without minimum amount of tokens', function () {
      vegaWalletTeardown();
      vegaWalletFaucetAssetsWithoutCheck(
-        'fUSDC',
+        fUSDCId,
        '1000000',
        vegaWalletPublicKey
      );
@@ -290,7 +292,7 @@ context(
    // 3001-VOTE-092 3004-PMAC-001
    it('Able to submit update market proposal and vote for proposal', function () {
      vegaWalletFaucetAssetsWithoutCheck(
-        'fUSDC',
+        fUSDCId,
        '1000000',
        vegaWalletPublicKey
      );
@@ -55,7 +55,6 @@ context(
  function () {
    // 2001-STKE-002, 2001-STKE-032
    before('visit staking tab and connect vega wallet', function () {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      ethereumWalletConnect();
      // this is a workaround for #2422 which can be removed once issue is resolved
@@ -67,6 +66,7 @@ context(
      beforeEach(
        'teardown wallet & drill into a specific validator',
        function () {
+          cy.clearAllLocalStorage();
          cy.reload();
          waitForSpinner();
          cy.connectVegaWallet();
@@ -131,7 +131,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        .within(() => {
          cy.get('span')
            .first()
-            .should('have.text', 'http://localhost:3028/query');
+            .should('have.text', 'http://localhost:3008/graphql');
          cy.getByTestId('link').should('exist');
        });
    });
@@ -17,10 +17,15 @@ const banner = 'view-banner';

 context('View functionality with public key', { tags: '@smoke' }, function () {
  before('send asset to wallet', function () {
-    vegaWalletFaucetAssetsWithoutCheck('fUSDC', '1000000', vegaWalletPubKey);
+    vegaWalletFaucetAssetsWithoutCheck(
+      '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
+      '1000000',
+      vegaWalletPubKey
+    );
  });

  beforeEach('visit home page', function () {
+    cy.clearLocalStorage();
    cy.visit('/');
    waitForSpinner();
    cy.connectPublicKey(vegaWalletPubKey);
@@ -13,6 +13,7 @@ context(
  { tags: '@regression' },
  function () {
    before('navigate to rewards page', function () {
+      cy.clearLocalStorage();
      cy.visit('/');
      navigateTo(navigation.rewards);
    });
@@ -282,26 +282,30 @@ context(
      describe('Vega wallet with assets', function () {
        const assets = [
          {
-            id: 'fUSDC',
+            id: '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc',
            name: 'USDC (fake)',
+            symbol: 'fUSDC',
            amount: '1000000',
            expectedAmount: '10.00',
          },
          {
-            id: 'fDAI',
+            id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665',
            name: 'DAI (fake)',
+            symbol: 'fDAI',
            amount: '200000',
            expectedAmount: '2.00',
          },
          {
-            id: 'fBTC',
+            id: '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
            name: 'BTC (fake)',
+            symbol: 'fBTC',
            amount: '600000',
            expectedAmount: '6.00',
          },
          {
-            id: 'fEURO',
+            id: 'e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567',
            name: 'EURO (fake)',
+            symbol: 'fEURO',
            amount: '800000',
            expectedAmount: '8.00',
          },
@@ -322,15 +326,15 @@ context(
          });
        });

-        for (const { id, name, expectedAmount } of assets) {
-          it(`should see ${id} within vega wallet`, () => {
+        for (const { name, symbol, expectedAmount } of assets) {
+          it(`should see ${name} within vega wallet`, () => {
            cy.get(walletContainer).within(() => {
              cy.get(vegaWalletCurrencyTitle)
-                .contains(id, txTimeout)
+                .contains(name, txTimeout)
                .should('be.visible');

              cy.get(vegaWalletCurrencyTitle)
-                .contains(id)
+                .contains(name)
                .parent()
                .siblings()
                .invoke('text')
@@ -338,9 +342,9 @@ context(
                .should('be.gte', parseFloat(expectedAmount));

              cy.get(vegaWalletCurrencyTitle)
-                .contains(id)
+                .contains(name)
                .parent()
-                .contains(name);
+                .contains(symbol);
            });
          });
        }
@@ -54,7 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
    .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
    .and('be.visible')
    .click();
-  cy.contains('been removed from validator').should('be.visible');
+  cy.contains('been removed from validator', txTimeout).should('be.visible');
  closeDialog();
 }

@@ -185,7 +185,7 @@ export function validateValidatorListTotalStakeAndShare(
 ) {
  cy.contains('Loading...', epochTimeout).should('not.exist');
  waitForBeginningOfEpoch();
-  cy.get(`[row-id="${positionOnList}"]:visible`)
+  cy.get(`[row-id="${positionOnList}"]`)
    .eq(1)
    .within(() => {
      cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
@@ -221,12 +221,12 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }

 export function closeStakingDialog() {
-  cy.get('[data-testid="dialog-title"]:visible').should(
+  cy.getByTestId('dialog-title').should(
    'contain.text',
    'At the beginning of the next epoch'
  );
-  cy.get('[data-testid="dialog-content"]:visible')
-    .first()
+  cy.getByTestId('dialog-content')
+    .last()
    .within(() => {
      cy.get('a').should('have.text', 'Back to Staking').click();
    });
@@ -9,7 +9,7 @@ import {
 import { ethers, Wallet } from 'ethers';

 const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -105,25 +105,24 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('currency-value')
-          .invoke('text')
-          .then(($associatedAmount) => {
-            cy.wrap(
-              stakingBridgeContract.remove_stake(
-                String(stakeBalance),
-                vegaWalletPubKey
-              ),
-              { timeout: transactionTimeout, log: false }
-            );
-            cy.get("[data-testid='currency-value']")
-              .first()
-              .invoke('text', {
+      cy.get('[data-testid="vega-wallet-balance-unstaked"]:visible').within(
+        () => {
+          cy.get(associatedAmountInWallet)
+            .invoke('text')
+            .then(($walletAmount) => {
+              cy.wrap(
+                stakingBridgeContract.remove_stake(
+                  String(stakeBalance),
+                  vegaWalletPubKey
+                ),
+                { timeout: transactionTimeout, log: false }
+              );
+              cy.get(associatedAmountInWallet, {
                timeout: transactionTimeout,
-              })
-              .should('not.eq', $associatedAmount);
-          });
-      });
+              }).should('not.have.text', $walletAmount);
+            });
+        }
+      );
    }
  });
 }
@@ -8,7 +8,7 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''

-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -0,0 +1,39 @@
+import { render, screen } from '@testing-library/react';
+import { DisconnectedNotice } from './disconnected-notice';
+
+describe('DisconnectedNotice', () => {
+  it('renders Notification when isDisconnected is true and correctNetworkChainId is valid', () => {
+    render(
+      <DisconnectedNotice isDisconnected={true} correctNetworkChainId={'1'} />
+    );
+    const disconnectedNotice = screen.getByTestId('disconnected-notice');
+    expect(disconnectedNotice).toBeInTheDocument();
+  });
+
+  it("doesn't render Notification when isDisconnected is false", () => {
+    render(
+      <DisconnectedNotice isDisconnected={false} correctNetworkChainId={'1'} />
+    );
+    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
+    expect(disconnectedNotice).not.toBeInTheDocument();
+  });
+
+  it("doesn't render Notification when correctNetworkChainId is undefined", () => {
+    render(
+      <DisconnectedNotice
+        isDisconnected={true}
+        correctNetworkChainId={undefined}
+      />
+    );
+    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
+    expect(disconnectedNotice).not.toBeInTheDocument();
+  });
+
+  it("doesn't render Notification when correctNetworkChainId is null", () => {
+    render(
+      <DisconnectedNotice isDisconnected={true} correctNetworkChainId={null} />
+    );
+    const disconnectedNotice = screen.queryByTestId('disconnected-notice');
+    expect(disconnectedNotice).not.toBeInTheDocument();
+  });
+});
@@ -0,0 +1,33 @@
+import { useTranslation } from 'react-i18next';
+import { Intent, Notification } from '@vegaprotocol/ui-toolkit';
+
+interface DisconnectedNoticeProps {
+  isDisconnected: boolean;
+  correctNetworkChainId?: string | null;
+}
+
+export const DisconnectedNotice = ({
+  isDisconnected,
+  correctNetworkChainId,
+}: DisconnectedNoticeProps) => {
+  const { t } = useTranslation();
+
+  if (
+    !isDisconnected ||
+    correctNetworkChainId === undefined ||
+    correctNetworkChainId === null
+  ) {
+    return null;
+  }
+
+  return (
+    <div className="col-span-full" data-testid="disconnected-notice">
+      <Notification
+        message={t('disconnectedNotice', {
+          correctNetwork: correctNetworkChainId,
+        })}
+        intent={Intent.Danger}
+      />
+    </div>
+  );
+};
@@ -0,0 +1 @@
+export * from './disconnected-notice';
@@ -3,6 +3,7 @@ import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
 import { Button } from '@vegaprotocol/ui-toolkit';
+import { DisconnectedNotice } from '../disconnected-notice';

 import {
  AppStateActionType,
@@ -26,7 +27,8 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
-import { useWeb3Disconnect } from '@vegaprotocol/web3';
+import { useEthereumConfig, useWeb3Disconnect } from '@vegaprotocol/web3';
+import { getChainName } from '@vegaprotocol/web3';

 const removeLeadingAddressSymbol = (key: string) => {
  if (key && key.length > 2 && key.slice(0, 2) === '0x') {
@@ -182,16 +184,21 @@ const ConnectedKey = () => {

 export const EthWallet = () => {
  const { t } = useTranslation();
-  const { appDispatch } = useAppState();
+  const { appDispatch, appState } = useAppState();
  const { account, connector } = useWeb3React();
  const pendingTxs = usePendingTransactions();
  const disconnect = useWeb3Disconnect(connector);
+  const { config } = useEthereumConfig();

  return (
    <WalletCard>
      <section data-testid="ethereum-wallet">
        <WalletCardHeader>
          <h1 className="m-0 uppercase">{t('ethereumKey')}</h1>
+          <DisconnectedNotice
+            isDisconnected={appState.disconnectNotice}
+            correctNetworkChainId={getChainName(Number(config?.chain_id))}
+          />
          {account && (
            <div className="place-self-end font-mono">
              <div
@@ -14,7 +14,7 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
  const { isReadOnly } = useVegaWallet();
  const AppLayoutClasses = classNames(
    'app w-full max-w-[1500px] mx-auto grid',
-    'lg:text-body-large',
+    'font-alpha lg:text-body-large',
    {
      'grid-rows-[repeat(2,min-content)_1fr_min-content]': !isReadOnly,
      'grid-rows-[repeat(3,min-content)_1fr_min-content]': isReadOnly,
@@ -1,13 +1,12 @@
 import { Button, Splash } from '@vegaprotocol/ui-toolkit';
 import {
-  getChainName,
  useWeb3ConnectStore,
  useWeb3Disconnect,
  Web3ConnectDialog,
 } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
 import type { ReactElement } from 'react';
-import { useCallback, useEffect } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import {
  AppStateActionType,
  useAppState,
@@ -36,9 +35,7 @@ export function Web3Connector({
  const appChainId = Number(chainId);
  return (
    <>
-      <Web3Content appChainId={appChainId} setDialogOpen={setDialogOpen}>
-        {children}
-      </Web3Content>
+      <Web3Content appChainId={appChainId}>{children}</Web3Content>
      <Web3ConnectDialog
        connectors={connectors}
        dialogOpen={appState.ethConnectOverlay}
@@ -52,23 +49,59 @@ export function Web3Connector({
 interface Web3ContentProps {
  children: ReactElement;
  appChainId: number;
-  setDialogOpen: (isOpen: boolean) => void;
 }

 export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
+  const { appState, appDispatch } = useAppState();
  const { connector, chainId } = useWeb3React();
+  const [previousChainId, setPreviousChainId] = useState(chainId);
  const error = useWeb3ConnectStore((store) => store.error);
  const disconnect = useWeb3Disconnect(connector);

+  const showDisconnectNotice = useCallback(
+    (isVisible: boolean) =>
+      appDispatch({
+        type: AppStateActionType.SET_DISCONNECT_NOTICE,
+        isVisible,
+      }),
+    [appDispatch]
+  );
+
  useEffect(() => {
    if (connector?.connectEagerly) {
      connector.connectEagerly();
    }
-    // wallet connect doesnt handle connectEagerly being called when connector is also in the
+    // wallet connect doesn't handle connectEagerly being called when connector is also in the
    // deps array.
    // eslint-disable-next-line react-hooks/exhaustive-deps
  }, []);

+  useEffect(() => {
+    if (chainId !== undefined) {
+      // We use this to detect when the user switches networks.
+      setPreviousChainId(chainId);
+
+      if (chainId !== appChainId) {
+        disconnect();
+
+        // If the user was previously connected, show the disconnect explanation notice.
+        if (previousChainId !== undefined && !appState.disconnectNotice) {
+          showDisconnectNotice(true);
+        }
+      } else if (appState.disconnectNotice) {
+        showDisconnectNotice(false);
+      }
+    }
+  }, [
+    appChainId,
+    appDispatch,
+    appState.disconnectNotice,
+    chainId,
+    disconnect,
+    previousChainId,
+    showDisconnectNotice,
+  ]);
+
  if (error) {
    return (
      <Splash>
@@ -80,18 +113,5 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
    );
  }

-  if (chainId !== undefined && chainId !== appChainId) {
-    return (
-      <Splash>
-        <div className="flex flex-col items-center gap-12">
-          <p className="text-white">
-            This app only works on {getChainName(appChainId)}
-          </p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
-        </div>
-      </Splash>
-    );
-  }
-
  return children;
 };
@@ -43,6 +43,11 @@ export interface AppState {
   * Message to display in a banner at the top of the screen, currently always shown as a warning/error
   */
  bannerMessage: string;
+  /**
+   * Displays a notice to the user that they have been disconnected because they've changed their
+   * ethereum network to an incompatible one.
+   */
+  disconnectNotice: boolean;
 }

 export enum AppStateActionType {
@@ -58,6 +63,7 @@ export enum AppStateActionType {
  SET_ASSOCIATION_BREAKDOWN,
  SET_TRANSACTION_OVERLAY,
  SET_BANNER_MESSAGE,
+  SET_DISCONNECT_NOTICE,
 }

 export type AppStateAction =
@@ -90,6 +96,10 @@ export type AppStateAction =
  | {
      type: AppStateActionType.SET_BANNER_MESSAGE;
      message: string;
+    }
+  | {
+      type: AppStateActionType.SET_DISCONNECT_NOTICE;
+      isVisible: boolean;
    };

 type AppStateContextShape = {
@@ -1,8 +1,8 @@
 import React from 'react';

 import { BigNumber } from '../../lib/bignumber';
-import { AppStateActionType, AppStateContext } from './app-state-context';
 import type { AppState, AppStateAction } from './app-state-context';
+import { AppStateActionType, AppStateContext } from './app-state-context';

 interface AppStateProviderProps {
  children: React.ReactNode;
@@ -19,6 +19,7 @@ const initialAppState: AppState = {
  ethConnectOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
+  disconnectNotice: false,
 };

 function appStateReducer(state: AppState, action: AppStateAction): AppState {
@@ -68,6 +69,12 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
        bannerMessage: action.message,
      };
    }
+    case AppStateActionType.SET_DISCONNECT_NOTICE: {
+      return {
+        ...state,
+        disconnectNotice: action.isVisible,
+      };
+    }
  }
 }

@@ -14,13 +14,17 @@ import { ContractsContext } from './contracts-context';
 import { createDefaultProvider } from '../../lib/web3-connectors';
 import { useEthereumConfig } from '@vegaprotocol/web3';
 import { useEnvironment } from '@vegaprotocol/environment';
-import { ENV } from '../../config/env';
+import { ENV } from '../../config';

 /**
 * Provides Vega Ethereum contract instances to its children.
 */
 export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
-  const { provider: activeProvider, account } = useWeb3React();
+  const {
+    provider: activeProvider,
+    account,
+    chainId: activeChainId,
+  } = useWeb3React();
  const { config } = useEthereumConfig();
  const { VEGA_ENV, ETHEREUM_PROVIDER_URL } = useEnvironment();
  const [contracts, setContracts] =
@@ -39,7 +43,11 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
          ETHEREUM_PROVIDER_URL,
          Number(config.chain_id)
        );
-        const provider = activeProvider ? activeProvider : defaultProvider;
+
+        const provider =
+          activeProvider && activeChainId === Number(config.chain_id)
+            ? activeProvider
+            : defaultProvider;

        if (
          account &&
@@ -84,7 +92,14 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
      //  TODO: hacky quick fix for release to prevent race condition, find a better fix for this.
      cancelled = true;
    };
-  }, [activeProvider, account, config, VEGA_ENV, ETHEREUM_PROVIDER_URL]);
+  }, [
+    activeProvider,
+    activeChainId,
+    account,
+    config,
+    VEGA_ENV,
+    ETHEREUM_PROVIDER_URL,
+  ]);

  if (!contracts) {
    return (
@@ -790,5 +790,6 @@
  "approval (% validator voting power)": "approval (% validator voting power)",
  "67% voting power required": "67% voting power required",
  "Token": "Token",
-  "associateVegaNow": "Associate $VEGA now"
+  "associateVegaNow": "Associate $VEGA now",
+  "disconnectedNotice": "You have been disconnected. Connect your ETH wallet to the {{correctNetwork}} network to use this app."
 }
@@ -56,6 +56,7 @@ const mockAppState: AppState = {
  ethConnectOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
+  disconnectNotice: false,
 };

 jest.mock('../../../contexts/app-state/app-state-context', () => ({
@@ -19,6 +19,7 @@ const mockAppState: AppState = {
  ethConnectOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
+  disconnectNotice: false,
 };

 jest.mock('../../../contexts/app-state/app-state-context', () => ({
@@ -9,6 +9,9 @@ query ProposalMarketsQuery {
            code
          }
        }
+        proposal {
+          state
+        }
      }
    }
  }
@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
 export type ProposalMarketsQueryQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ProposalMarketsQueryQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string } } } }> } | null };
+export type ProposalMarketsQueryQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, code: string } }, proposal?: { __typename?: 'Proposal', state: Types.ProposalState } | null } }> } | null };


 export const ProposalMarketsQueryDocument = gql`
@@ -21,6 +21,9 @@ export const ProposalMarketsQueryDocument = gql`
            code
          }
        }
+        proposal {
+          state
+        }
      }
    }
  }
@@ -1,94 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ProposalMarketsQueryQueryVariables = Types.Exact<{
-  [key: string]: never;
-}>;
-
-export type ProposalMarketsQueryQuery = {
-  __typename?: 'Query';
-  marketsConnection?: {
-    __typename?: 'MarketConnection';
-    edges: Array<{
-      __typename?: 'MarketEdge';
-      node: {
-        __typename?: 'Market';
-        id: string;
-        tradableInstrument: {
-          __typename?: 'TradableInstrument';
-          instrument: { __typename?: 'Instrument'; name: string; code: string };
-        };
-      };
-    }>;
-  } | null;
-};
-
-export const ProposalMarketsQueryDocument = gql`
-  query ProposalMarketsQuery {
-    marketsConnection {
-      edges {
-        node {
-          id
-          tradableInstrument {
-            instrument {
-              name
-              code
-            }
-          }
-        }
-      }
-    }
-  }
-`;
-
-/**
- * __useProposalMarketsQueryQuery__
- *
- * To run a query within a React component, call `useProposalMarketsQueryQuery` and pass it any options that fit your needs.
- * When your component renders, `useProposalMarketsQueryQuery` 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 } = useProposalMarketsQueryQuery({
- *   variables: {
- *   },
- * });
- */
-export function useProposalMarketsQueryQuery(
-  baseOptions?: Apollo.QueryHookOptions<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useQuery<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >(ProposalMarketsQueryDocument, options);
-}
-export function useProposalMarketsQueryLazyQuery(
-  baseOptions?: Apollo.LazyQueryHookOptions<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >
-) {
-  const options = { ...defaultOptions, ...baseOptions };
-  return Apollo.useLazyQuery<
-    ProposalMarketsQueryQuery,
-    ProposalMarketsQueryQueryVariables
-  >(ProposalMarketsQueryDocument, options);
-}
-export type ProposalMarketsQueryQueryHookResult = ReturnType<
-  typeof useProposalMarketsQueryQuery
->;
-export type ProposalMarketsQueryLazyQueryHookResult = ReturnType<
-  typeof useProposalMarketsQueryLazyQuery
->;
-export type ProposalMarketsQueryQueryResult = Apollo.QueryResult<
-  ProposalMarketsQueryQuery,
-  ProposalMarketsQueryQueryVariables
->;
@@ -1,15 +1,16 @@
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter as Router } from 'react-router-dom';
-import { render, screen, fireEvent, waitFor } from '@testing-library/react';
+import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { AppStateProvider } from '../../../../contexts/app-state/app-state-provider';
 import { mockWalletContext } from '../../test-helpers/mocks';
 import { ProposeUpdateMarket } from './propose-update-market';
 import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
 import { NetworkParamsDocument } from '@vegaprotocol/react-helpers';
-import type { ProposalMarketsQueryQuery } from './__generated___/UpdateMarket';
-import { ProposalMarketsQueryDocument } from './__generated___/UpdateMarket';
+import type { ProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
+import { ProposalMarketsQueryDocument } from './__generated__/UpdateMarket';
+import { ProposalState } from '@vegaprotocol/types';

 const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
  request: {
@@ -89,6 +90,10 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                  code: 'ETHiUSDT',
                },
              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_ENACTED,
+              },
            },
          },
          {
@@ -101,11 +106,16 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                instrument: {
                  __typename: 'Instrument',
                  name: 'Las Vegas nuggets',
-                  code: 'Nuggets2',
+                  code: 'Nuggets',
                },
              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_OPEN,
+              },
            },
          },
+
          {
            __typename: 'MarketEdge',
            node: {
@@ -115,10 +125,14 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                __typename: 'TradableInstrument',
                instrument: {
                  __typename: 'Instrument',
-                  name: 'Nuggets',
-                  code: 'Nuggets',
+                  name: 'California Nuggets',
+                  code: 'Nuggets2',
                },
              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
+              },
            },
          },
          {
@@ -130,10 +144,71 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                __typename: 'TradableInstrument',
                instrument: {
                  __typename: 'Instrument',
-                  name: 'CELUSD (June 2022)',
-                  code: 'CELUSD',
+                  name: 'Nevada Nuggets',
+                  code: 'Nugetts3',
                },
              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_REJECTED,
+              },
+            },
+          },
+          {
+            __typename: 'MarketEdge',
+            node: {
+              __typename: 'Market',
+              id: 'asdfe1755208914b6f258a28babd19ae8dfbaf4084d8867d8a120c50dca1e17f',
+              tradableInstrument: {
+                __typename: 'TradableInstrument',
+                instrument: {
+                  __typename: 'Instrument',
+                  name: 'NZ Nuggets',
+                  code: 'Nugetts4',
+                },
+              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_DECLINED,
+              },
+            },
+          },
+          {
+            __typename: 'MarketEdge',
+            node: {
+              __typename: 'Market',
+              id: 'asdfe1755208914b6f258a28babd19ae8dfbaf4084d8867d8a120c50dca1e17f',
+              tradableInstrument: {
+                __typename: 'TradableInstrument',
+                instrument: {
+                  __typename: 'Instrument',
+                  name: 'Aussie Nuggets',
+                  code: 'Nugetts5',
+                },
+              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_PASSED,
+              },
+            },
+          },
+          {
+            __typename: 'MarketEdge',
+            node: {
+              __typename: 'Market',
+              id: 'xcvbe1755208914b6f258a28babd19ae8dfbaf4084d8867d8a120c50dca1e17f',
+              tradableInstrument: {
+                __typename: 'TradableInstrument',
+                instrument: {
+                  __typename: 'Instrument',
+                  name: 'Tasmanian Nuggets',
+                  code: 'Nugetts6',
+                },
+              },
+              proposal: {
+                __typename: 'Proposal',
+                state: ProposalState.STATE_FAILED,
+              },
            },
          },
        ],
@@ -199,6 +274,27 @@ describe('Propose Update Market', () => {
    expect(screen.getByTestId('proposal-market-select')).toHaveValue('');
  });

+  it('should only render enacted markets', async () => {
+    renderComponent();
+    expect(
+      await screen.findByText('Update market proposal')
+    ).toBeInTheDocument();
+    // (state enacted)
+    expect(screen.getByText('ETHUSD (September Market)')).toBeInTheDocument();
+    // (state open)
+    expect(screen.queryByText('Las Vegas nuggets')).not.toBeInTheDocument();
+    // (state waiting for node vote)
+    expect(screen.queryByText('California nuggets')).not.toBeInTheDocument();
+    // (state rejected)
+    expect(screen.queryByText('Nevada nuggets')).not.toBeInTheDocument();
+    // (state declined)
+    expect(screen.queryByText('NZ nuggets')).not.toBeInTheDocument();
+    // (state passed)
+    expect(screen.queryByText('Aussie nuggets')).not.toBeInTheDocument();
+    // (state failed)
+    expect(screen.queryByText('Tasmanian nuggets')).not.toBeInTheDocument();
+  });
+
  it('should render the correct market details when the market select is used', async () => {
    renderComponent();
    expect(
@@ -2,25 +2,28 @@ import { useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useForm } from 'react-hook-form';
 import {
+  doesValueEquateToParam,
  getClosingTimestamp,
  getEnactmentTimestamp,
  useProposalSubmit,
-  doesValueEquateToParam,
 } from '@vegaprotocol/proposals';
 import { useEnvironment } from '@vegaprotocol/environment';
 import { createDocsLinks, validateJson } from '@vegaprotocol/utils';
 import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
 import {
  ProposalFormDescription,
+  ProposalFormDownloadJson,
  ProposalFormSubheader,
  ProposalFormSubmit,
  ProposalFormTerms,
  ProposalFormTitle,
  ProposalFormTransactionDialog,
-  ProposalFormDownloadJson,
  ProposalFormVoteAndEnactmentDeadline,
 } from '../../components/propose';
-import { ProposalMinRequirements } from '../../components/shared';
+import {
+  ProposalMinRequirements,
+  ProposalUserAction,
+} from '../../components/shared';
 import {
  AsyncRenderer,
  ExternalLink,
@@ -31,9 +34,9 @@ import {
  Select,
 } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
-import { ProposalUserAction } from '../../components/shared';
-import { useProposalMarketsQueryQuery } from './__generated___/UpdateMarket';
+import { useProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
 import { downloadJson } from '../../../../lib/download-json';
+import { ProposalState } from '@vegaprotocol/types';

 export interface UpdateMarketProposalFormFields {
  proposalVoteDeadline: string;
@@ -73,6 +76,9 @@ export const ProposeUpdateMarket = () => {

    return marketsData.marketsConnection.edges
      .map((edge) => edge.node)
+      .filter(
+        (market) => market.proposal?.state === ProposalState.STATE_ENACTED
+      )
      .sort((a, b) => {
        const aName = a.tradableInstrument.instrument.name;
        const bName = b.tradableInstrument.instrument.name;
@@ -1,3 +1,3 @@
 # App configuration variables
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_ENV=LOCAL
@@ -8,7 +8,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -27,6 +27,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -7,7 +7,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -24,6 +24,6 @@ CYPRESS_VEGA_ENV=CUSTOM
 CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
 CYPRESS_VEGA_PUBLIC_KEY2=7f9cf07d3a9905b1a61a1069f7a758855da428bc0f4a97de87f48644bfc25535
 CYPRESS_VEGA_TOKEN_URL=https://token.fairground.wtf
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -0,0 +1,375 @@
+import { aliasGQLQuery } from '@vegaprotocol/cypress';
+import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
+import { addDays, subDays } from 'date-fns';
+import {
+  chainIdQuery,
+  statisticsQuery,
+  createDataConnection,
+  oracleSpecDataConnectionQuery,
+  createMarketFragment,
+  marketsQuery,
+  marketsDataQuery,
+  createMarketsDataFragment,
+  assetQuery,
+  networkParamsQuery,
+} from '@vegaprotocol/mock';
+import {
+  addDecimalsFormatNumber,
+  getDateTimeFormat,
+} from '@vegaprotocol/utils';
+
+describe('Closed markets', { tags: '@smoke' }, () => {
+  const rowSelector =
+    '[data-testid="tab-closed-markets"] .ag-center-cols-container .ag-row';
+
+  const assetsResult = assetQuery();
+  // @ts-ignore asset definitely exists
+  const settlementAsset = assetsResult.assetsConnection.edges[0].node;
+
+  const settledMarket = createMarketFragment({
+    id: '0',
+    state: MarketState.STATE_SETTLED,
+    marketTimestamps: {
+      open: subDays(new Date(), 10).toISOString(),
+      close: subDays(new Date(), 4).toISOString(),
+    },
+    tradableInstrument: {
+      instrument: {
+        product: {
+          dataSourceSpecForTradingTermination: {
+            id: 'market-1-trading-termination-oracle-id',
+          },
+          dataSourceSpecForSettlementData: {
+            id: 'market-1-settlement-data-oracle-id',
+          },
+          settlementAsset,
+        },
+      },
+    },
+  });
+
+  const terminatedMarket = createMarketFragment({
+    id: '1',
+    state: MarketState.STATE_TRADING_TERMINATED,
+    marketTimestamps: {
+      open: subDays(new Date(), 10).toISOString(),
+      close: null, // market
+    },
+    tradableInstrument: {
+      instrument: {
+        metadata: {
+          tags: [
+            `settlement-expiry-date:${addDays(new Date(), 4).toISOString()}`,
+          ],
+        },
+      },
+    },
+  });
+
+  const delayedSettledMarket = createMarketFragment({
+    id: '2',
+    state: MarketState.STATE_TRADING_TERMINATED,
+    marketTimestamps: {
+      open: subDays(new Date(), 10).toISOString(),
+      close: null, // market
+    },
+    tradableInstrument: {
+      instrument: {
+        metadata: {
+          tags: [
+            `settlement-expiry-date:${subDays(new Date(), 2).toISOString()}`,
+          ],
+        },
+      },
+    },
+  });
+
+  const unknownMarket = createMarketFragment({
+    id: '3',
+    state: MarketState.STATE_SETTLED,
+  });
+
+  const closedMarketsResult = [
+    {
+      node: settledMarket,
+    },
+    {
+      node: terminatedMarket,
+    },
+    {
+      node: delayedSettledMarket,
+    },
+    { node: unknownMarket },
+    {
+      node: createMarketFragment({ id: '4', state: MarketState.STATE_PENDING }),
+    },
+    {
+      node: createMarketFragment({ id: '5', state: MarketState.STATE_ACTIVE }),
+    },
+  ];
+
+  const settledMarketData = createMarketsDataFragment({
+    market: {
+      id: settledMarket.id,
+    },
+    bestBidPrice: '1000',
+    bestOfferPrice: '2000',
+    markPrice: '1500',
+  });
+
+  const closedMarketsDataResult = [
+    {
+      node: {
+        data: settledMarketData,
+      },
+    },
+    {
+      node: {
+        data: createMarketsDataFragment({
+          market: {
+            id: terminatedMarket.id,
+          },
+        }),
+      },
+    },
+    {
+      node: {
+        data: createMarketsDataFragment({
+          market: {
+            id: delayedSettledMarket.id,
+          },
+        }),
+      },
+    },
+    {
+      node: {
+        data: createMarketsDataFragment({
+          market: {
+            id: unknownMarket.id,
+          },
+        }),
+      },
+    },
+  ];
+
+  const specDataConnection = createDataConnection();
+
+  before(() => {
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'ChainId', chainIdQuery());
+      aliasGQLQuery(req, 'Statistics', statisticsQuery());
+      aliasGQLQuery(req, 'NetworkParams', networkParamsQuery());
+      aliasGQLQuery(
+        req,
+        'Markets',
+        marketsQuery({
+          marketsConnection: {
+            edges: closedMarketsResult,
+          },
+        })
+      );
+      aliasGQLQuery(
+        req,
+        'MarketsData',
+        marketsDataQuery({
+          marketsConnection: {
+            edges: closedMarketsDataResult,
+          },
+        })
+      );
+      aliasGQLQuery(
+        req,
+        'OracleSpecDataConnection',
+        oracleSpecDataConnectionQuery()
+      );
+    });
+
+    cy.mockSubscription();
+
+    cy.visit('/#/markets/all');
+    cy.get('[data-testid="Closed markets"]').click();
+  });
+
+  it('renders a settled market', () => {
+    const expectedMarkets = closedMarketsResult.filter((edge) => {
+      return [
+        MarketState.STATE_SETTLED,
+        MarketState.STATE_TRADING_TERMINATED,
+      ].includes(edge.node.state);
+    });
+    const product = settledMarket.tradableInstrument.instrument.product;
+
+    // rows should be filtered to only include settled/terminated markets
+    cy.get(rowSelector).should('have.length', expectedMarkets.length);
+
+    // check each column in the first row renders correctly
+    // 6001-MARK-001
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="code"]')
+      .should('have.text', settledMarket.tradableInstrument.instrument.code);
+
+    // 6001-MARK-002
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="name"]')
+      .should('have.text', settledMarket.tradableInstrument.instrument.name);
+
+    // 6001-MARK-003
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="state"]')
+      .should('have.text', MarketStateMapping[settledMarket.state]);
+
+    // 6001-MARK-004
+    // 6001-MARK-005
+    // 6001-MARK-009
+    // 6001-MARK-008
+    // 6001-MARK-010
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementDate"]')
+      .find('[data-testid="link"]')
+      .should(($el) => {
+        const href = $el.attr('href');
+        expect(href).to.match(
+          new RegExp(
+            `/oracles/${product.dataSourceSpecForTradingTermination.id}`
+          )
+        );
+      })
+      .should('have.text', '4 days ago')
+      .should(
+        'have.attr',
+        'title',
+        getDateTimeFormat().format(
+          new Date(settledMarket.marketTimestamps.close)
+        )
+      );
+
+    // 6001-MARK-011
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="bestBidPrice"]')
+      .should(
+        'have.text',
+        addDecimalsFormatNumber(
+          settledMarketData.bestBidPrice,
+          settledMarket.decimalPlaces
+        )
+      );
+
+    // 6001-MARK-012
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="bestOfferPrice"]')
+      .should(
+        'have.text',
+        addDecimalsFormatNumber(
+          settledMarketData.bestOfferPrice,
+          settledMarket.decimalPlaces
+        )
+      );
+
+    // 6001-MARK-013
+    cy.get(rowSelector).first().find('[col-id="markPrice"]').should(
+      'have.text',
+
+      addDecimalsFormatNumber(
+        settledMarketData.markPrice,
+        settledMarket.decimalPlaces
+      )
+    );
+
+    // 6001-MARK-014
+    // 6001-MARK-015
+    // 6001-MARK-016
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementDataOracleId"]')
+      .find('[data-testid="link"]')
+      .should(($el) => {
+        const href = $el.attr('href');
+        expect(href).to.match(
+          new RegExp(`/oracles/${product.dataSourceSpecForSettlementData.id}`)
+        );
+      })
+      .should(
+        'have.text',
+        addDecimalsFormatNumber(
+          // @ts-ignore cannot deep un-partial
+          specDataConnection.externalData.data.data[0].value,
+          settledMarket.decimalPlaces
+        )
+      );
+
+    // 6001-MARK-017
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="realisedPNL"]')
+      .should('have.text', '-');
+
+    // 6001-MARK-018
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementAsset"]')
+      .should('have.text', product.settlementAsset.symbol);
+
+    // 6001-MARK-020
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="id"]')
+      .should('have.text', settledMarket.id);
+  });
+
+  // test market list for market in terminated state
+  it('renders a terminated market', () => {
+    cy.get(rowSelector)
+      .eq(1)
+      .find('[col-id="state"]')
+      .should('have.text', MarketStateMapping[terminatedMarket.state]);
+
+    // 6001-MARK-006
+    // 6001-MARK-007
+    cy.get(rowSelector)
+      .eq(1)
+      .find('[col-id="settlementDate"]')
+      .find('[data-testid="link"]')
+      .should('have.text', 'Expected in 4 days');
+  });
+
+  it('renders a terminated market which was expected to have settled', () => {
+    cy.get(rowSelector)
+      .eq(2)
+      .find('[col-id="settlementDate"]')
+      .should('have.class', 'text-danger')
+      .find('[data-testid="link"]')
+      .should('have.text', 'Expected 2 days ago');
+  });
+
+  it('renders terminated market which doesnt have settlement date metadata', () => {
+    cy.get(rowSelector)
+      .eq(3)
+      .find('[col-id="settlementDate"]')
+      .find('[data-testid="link"]')
+      .should('have.text', 'Unknown');
+  });
+
+  it('can open asset detail dialog', () => {
+    cy.mockGQL((req) => {
+      aliasGQLQuery(req, 'Asset', assetsResult);
+    });
+
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="settlementAsset"]')
+      .find('button')
+      .click();
+
+    // 6001-MARK-019
+    cy.get('[data-testid="dialog-title"]').should(
+      'have.text',
+      `Asset details - ${settlementAsset.symbol}`
+    );
+  });
+});
@@ -101,7 +101,7 @@ describe('deposit actions', { tags: '@smoke' }, () => {
    cy.mockTradingPage();
    cy.mockSubscription();
    cy.setVegaWallet();
-    cy.visit('/');
+    cy.visit('/#/markets/market-1');
    cy.wait('@MarketsCandles');
    cy.getByTestId('dialog-close').click();
  });
@@ -112,7 +112,6 @@ describe('deposit actions', { tags: '@smoke' }, () => {
      'be.visible'
    );
    cy.contains('[data-testid="deposit"]', 'Deposit to trade').click();
-    connectEthereumWallet('MetaMask');
    cy.getByTestId('deposit-submit').should('be.visible');
  });
 });
@@ -153,7 +153,7 @@ describe('home', { tags: '@regression' }, () => {
      // the choose market overlay is no longer showing
      cy.contains('Select a market to get started').should('not.exist');
      cy.contains('Loading...').should('not.exist');
-      cy.url().should('eq', Cypress.config().baseUrl + '/#/markets/market-1');
+      cy.url().should('eq', Cypress.config().baseUrl + '/#/markets/market-0');
    });
  });

@@ -172,6 +172,7 @@ describe('home', { tags: '@regression' }, () => {
          ],
        },
      };
+      // @ts-ignore partial deep check failing
      const data = marketsDataQuery(override);
      cy.mockGQL((req) => {
        aliasGQLQuery(req, 'MarketsData', data);
@@ -1,4 +1,5 @@
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';

 const marketInfoBtn = 'Info';
 const row = 'key-value-table-row';
@@ -12,7 +13,12 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  });

  before(() => {
-    cy.mockTradingPage();
+    cy.mockTradingPage(
+      MarketState.STATE_ACTIVE,
+      undefined,
+      undefined,
+      'COMPROMISED'
+    );
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
@@ -20,6 +26,11 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    cy.wait('@MarketInfo');
  });

+  it('show oracle banner', () => {
+    cy.getByTestId(marketTitle).contains('Oracle').click();
+    cy.getByTestId('oracle-status').should('contain.text', 'COMPROMISED');
+  });
+
  it('current fees displayed', () => {
    cy.getByTestId(marketTitle).contains('Current fees').click();
    validateMarketDataRow(0, 'Maker Fee', '0.02%');
@@ -222,6 +222,7 @@ describe('markets table', { tags: '@smoke' }, () => {
          ],
        },
      };
+      // @ts-ignore partial deep check failing
      const market = marketsQuery(override);
      aliasGQLQuery(req, 'Market', market);
      aliasGQLQuery(req, 'ProposalOfMarket', {
@@ -32,7 +32,7 @@ describe('Navbar', { tags: '@smoke' }, () => {
    });

    it('Resources dropdown should be correctly rendered', () => {
-      const resourceSelector = 'ul li:last-child';
+      const resourceSelector = 'ul li:contains(Resources)';
      ['Docs', 'Give Feedback'].forEach((text, index) => {
        cy.get('nav').find(resourceSelector).contains('Resources').click();
        cy.get('nav')
@@ -91,7 +91,7 @@ describe('Navbar', { tags: '@smoke' }, () => {
        cy.getByTestId('button-menu-drawer').click();
        cy.getByTestId('menu-drawer').should('be.visible');
        cy.getByTestId('menu-drawer')
-          .find('[data-testid="theme-switcher"]')
+          .find('[data-testid="Settings"]')
          .should('be.visible');
        cy.getByTestId('button-menu-drawer').click();
        cy.getByTestId('menu-drawer').should('not.be.visible');
@@ -0,0 +1,45 @@
+import { closeWelcomeDialog } from '../support/helpers';
+
+describe('Settings page', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.clearLocalStorage().then(() => {
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.visit('/');
+      closeWelcomeDialog();
+      cy.get('[aria-label="cog icon"]').click();
+    });
+  });
+  it('telemetry checkbox should work well', () => {
+    cy.location('hash').should('equal', '#/settings');
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'unchecked'
+    );
+    cy.get('[for="telemetry-approval"]').click();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'checked'
+    );
+    cy.reload();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'checked'
+    );
+    cy.get('[for="telemetry-approval"]').click();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'unchecked'
+    );
+    cy.reload();
+    cy.getByTestId('telemetry-approval').should(
+      'have.attr',
+      'data-state',
+      'unchecked'
+    );
+  });
+});
@@ -1,17 +1,25 @@
 import { checkSorting } from '@vegaprotocol/cypress';

+const dialogClose = 'dialog-close';
+
 describe('accounts', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.clearAllLocalStorage();
+  beforeEach(() => {
    cy.mockTradingPage();
    cy.mockWeb3Provider();
    cy.mockSubscription();
    cy.setVegaWallet();
    cy.visit('/#/markets/market-0');
-    cy.wait('@Assets');
  });

  it('renders accounts', () => {
+    // 7001-COLL-001
+    // 7001-COLL-002
+    // 7001-COLL-003
+    // 7001-COLL-004
+    // 7001-COLL-005
+    // 7001-COLL-006
+    // 7001-COLL-007
+
    const tradingAccountRowId = '[row-id="t-0"]';
    cy.getByTestId('Collateral').click();

@@ -24,29 +32,113 @@ describe('accounts', { tags: '@smoke' }, () => {

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
-      .find('[col-id="accounts-actions"]')
-      .should('have.text', 'DepositWithdraw');
+      .find('[col-id="used"]')
+      .should('have.text', '1.010.00%');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
-      .find('[data-testid="deposit"]')
-      .should('have.text', 'Deposit');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="accounts-actions"] [data-testid="withdraw"]')
-      .should('have.text', 'Withdraw');
+      .find('[col-id="available"]')
+      .should('have.text', '100,000.00');

    cy.getByTestId('tab-accounts')
      .get(tradingAccountRowId)
      .find('[col-id="total"]')
      .should('have.text', '100,001.01');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="accounts-actions"]')
+      .should('have.text', ' ');
+
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="total"]')
+      .should('have.text', '100,001.01');
+
+    cy.getByTestId('tab-accounts')
+      .get('[col-id="accounts-actions"]')
+      .find('[data-testid="dropdown-menu"]')
+      .eq(1)
+      .click();
+    cy.getByTestId('deposit').should('be.visible');
+    cy.getByTestId('withdraw').should('be.visible');
+    cy.getByTestId('breakdown').should('be.visible');
+    cy.getByTestId('Collateral').click({ force: true });
  });

  it('should open asset details dialog when clicked on symbol', () => {
+    // 7001-COLL-008
+    // 6501-ASSE-001
+    // 6501-ASSE-002
+    // 6501-ASSE-003
+    // 6501-ASSE-004
+    // 6501-ASSE-005
+    // 6501-ASSE-006
+    // 6501-ASSE-007
+    // 6501-ASSE-008
+    // 6501-ASSE-009
+    // 6501-ASSE-010
+    // 6501-ASSE-011
+    // 6501-ASSE-012
+    // 6501-ASSE-013
+    const titles = [
+      'ID',
+      'Type',
+      'Name',
+      'Symbol',
+      'Decimals',
+      'Quantum',
+      'Status',
+      'Contract address',
+      'Withdrawal threshold',
+      'Lifetime limit',
+      'Infrastructure fee account balance',
+      'Global reward pool account balance',
+      'Maker paid fees account balance',
+      'Maker received fees account balance',
+      'Liquidity provision fee reward account balance',
+      'Market proposer reward account balance',
+    ];
    cy.getByTestId('asset').contains('tEURO').click();
-    cy.get('[data-testid="dialog-content"]:visible').should('exist');
-    cy.get('[data-testid="dialog-close"]:visible').click();
+    cy.get('[data-testid$="_label"]').should('have.length', 16);
+    cy.get('[data-testid$="_label"]').each((element, index) => {
+      cy.wrap(element).should('have.text', titles[index]);
+    });
+    cy.getByTestId(dialogClose).click();
+    cy.getByTestId(dialogClose).should('not.exist');
+  });
+
+  it('should open usage breakdown dialog when clicked on used', () => {
+    // 7001-COLL-009
+    cy.getByTestId('breakdown').contains('1.01').click();
+    const headers = ['Market', 'Account type', 'Balance'];
+    cy.getByTestId('usage-breakdown').within(($headers) => {
+      cy.wrap($headers)
+        .get('.ag-header-cell-text')
+        .each(($header, i) => {
+          cy.wrap($header).should('have.text', headers[i]);
+        });
+    });
+    cy.getByTestId(dialogClose).click();
+  });
+
+  it('sorting usage breakdown columns should work well', () => {
+    // 7001-COLL-010
+    cy.getByTestId('breakdown').contains('1.01').click();
+    cy.getByTestId('usage-breakdown')
+      .find('[col-id="type"]')
+      .eq(1)
+      .should('have.text', 'Margin');
+    cy.getByTestId('usage-breakdown')
+      .find('[col-id="type"]')
+      .eq(2)
+      .should('have.text', 'Margin');
+    cy.getByTestId('usage-breakdown')
+      .find('[col-id="type"]')
+      .eq(3)
+      .should('have.text', 'General');
+
+    cy.getByTestId(dialogClose).click();
  });

  describe('sorting by ag-grid columns should work well', () => {
@@ -88,5 +88,18 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
        'Size cannot be lower than 1'
      );
    });
+    it('must have total margin available', () => {
+      // 7001-COLL-011
+      cy.getByTestId('tab-ticket')
+        .find('.text-xs')
+        .eq(5)
+        .within(() => {
+          cy.get('[data-state="closed"]').should(
+            'have.text',
+            'Total margin available'
+          );
+          cy.get('.text-neutral-500').should('have.text', '~100,000.01 tDAI');
+        });
+    });
  });
 });
@@ -455,7 +455,7 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      });
  });
  it('must be warned (pre-submit) if the input price has too many digits after the decimal place for the market', () => {
-    // 7003-MORD-016
+    // 7003-MORD-013
    updateOrder({
      id: orderId,
      status: Schema.OrderStatus.STATUS_ACTIVE,
@@ -9,3 +9,8 @@ export const selectAsset = (assetIndex: number) => {
  // eslint-disable-next-line
  cy.wait(100);
 };
+
+export const closeWelcomeDialog = () => {
+  cy.getByTestId('select-market-list').should('exist');
+  cy.getByTestId('dialog-close').click();
+};
@@ -26,6 +26,7 @@ export function updateOrder(
  override?: PartialDeep<OrderUpdateFieldsFragment>
 ): void {
  const update: OrdersUpdateSubscription = orderUpdateSubscription({
+    // @ts-ignore partial deep check failing
    orders: [override],
  });
  if (!sendOrderUpdate) {
@@ -1,6 +1,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import type { CyHttpMessages } from 'cypress/types/net-stubbing';
+import type { Provider, Status } from '@vegaprotocol/oracles';
 import {
  accountsQuery,
  assetQuery,
@@ -45,7 +46,9 @@ const marketDataOverride = (
      {
        node: {
          data: {
+            // @ts-ignore conflict between incoming and outgoing types
            trigger: data.trigger,
+            // @ts-ignore same as above
            marketTradingMode: data.tradingMode,
            marketState: data.state,
          },
@@ -62,6 +65,7 @@ const marketsDataOverride = (
    edges: [
      {
        node: {
+          // @ts-ignore conflict between incoming and outgoing types
          tradingMode: data.tradingMode,
          state: data.state,
        },
@@ -155,7 +159,6 @@ const mockTradingPage = (
  aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
  aliasGQLQuery(req, 'Deposits', depositsQuery());
 };
-
 declare global {
  // eslint-disable-next-line @typescript-eslint/no-namespace
  namespace Cypress {
@@ -164,50 +167,56 @@ declare global {
      mockTradingPage(
        state?: Schema.MarketState,
        tradingMode?: Schema.MarketTradingMode,
-        trigger?: Schema.AuctionTrigger
+        trigger?: Schema.AuctionTrigger,
+        oracleStatus?: Status
      ): void;
    }
  }
 }
+
 export const addMockTradingPage = () => {
  Cypress.Commands.add(
    'mockTradingPage',
-    (state = Schema.MarketState.STATE_ACTIVE, tradingMode, trigger) => {
+    (
+      state = Schema.MarketState.STATE_ACTIVE,
+      tradingMode,
+      trigger,
+      oracleStatus
+    ) => {
      cy.mockGQL((req) => {
        mockTradingPage(req, state, tradingMode, trigger);
      });

+      const oracle: Provider = {
+        name: 'Another oracle',
+        url: 'https://zombo.com',
+        description_markdown:
+          'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
+        oracle: {
+          status: oracleStatus || 'GOOD',
+          status_reason: '',
+          first_verified: '2022-01-01T00:00:00.000Z',
+          last_verified: '2022-12-31T00:00:00.000Z',
+          type: 'public_key',
+          public_key: ORACLE_PUBKEY,
+        },
+        proofs: [
+          {
+            format: 'signed_message',
+            available: true,
+            type: 'public_key',
+            public_key: ORACLE_PUBKEY,
+            message: 'SOMEHEX',
+          },
+        ],
+        github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
+      };
      // Prevent request to github, return some dummy content
      cy.intercept(
        'GET',
        /^https:\/\/raw.githubusercontent.com\/vegaprotocol\/well-known/,
        {
-          body: [
-            {
-              name: 'Another oracle',
-              url: 'https://zombo.com',
-              description_markdown:
-                'Some markdown describing the oracle provider.\n\nTwitter: @FacesPics2\n',
-              oracle: {
-                status: 'GOOD',
-                status_reason: '',
-                first_verified: '2022-01-01T00:00:00.000Z',
-                last_verified: '2022-12-31T00:00:00.000Z',
-                type: 'public_key',
-                public_key: ORACLE_PUBKEY,
-              },
-              proofs: [
-                {
-                  format: 'signed_message',
-                  available: true,
-                  type: 'public_key',
-                  public_key: ORACLE_PUBKEY,
-                  message: 'SOMEHEX',
-                },
-              ],
-              github_link: `https://github.com/vegaprotocol/well-known/blob/main/oracle-providers/public_key-${ORACLE_PUBKEY}.toml`,
-            },
-          ],
+          body: [oracle],
        }
      );
    }
@@ -7,7 +7,7 @@ NX_VEGA_ENV=CUSTOM
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
@@ -11,4 +11,4 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
+NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
@@ -350,7 +350,10 @@ export const TradePanels = ({

  return (
    <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
-      <TradeMarketHeader market={market} onSelect={onSelect} />
+      <div>
+        <TradeMarketHeader market={market} onSelect={onSelect} />
+        <OracleBanner marketId={market?.id || ''} />
+      </div>
      <div className="h-full">
        <AutoSizer>
          {({ width, height }) => (
@@ -0,0 +1,335 @@
+import { act, render, screen, within } from '@testing-library/react';
+import { Closed } from './closed';
+import { MarketStateMapping } from '@vegaprotocol/types';
+import { PositionStatus } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
+import { subDays } from 'date-fns';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/oracles';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/oracles';
+import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
+import { VegaWalletContext } from '@vegaprotocol/wallet';
+import type {
+  PositionsQuery,
+  PositionFieldsFragment,
+} from '@vegaprotocol/positions';
+import { PositionsDocument } from '@vegaprotocol/positions';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import type { MarketsDataQuery, MarketsQuery } from '@vegaprotocol/market-list';
+import { MarketsDataDocument } from '@vegaprotocol/market-list';
+import { MarketsDocument } from '@vegaprotocol/market-list';
+import {
+  createMarketFragment,
+  marketsQuery,
+  marketsDataQuery,
+  createMarketsDataFragment,
+} from '@vegaprotocol/mock';
+
+describe('Closed', () => {
+  let originalNow: typeof Date.now;
+  const mockNowTimestamp = 1672531200000;
+  const settlementDateMetaDate = subDays(
+    new Date(mockNowTimestamp),
+    3
+  ).toISOString();
+  const settlementDateTag = `settlement-expiry-date:${settlementDateMetaDate}`;
+  const pubKey = 'pubKey';
+  const marketId = 'market-0';
+  const settlementDataProperty = 'spec-binding';
+  const settlementDataId = 'settlement-data-oracle-id';
+
+  const market = createMarketFragment({
+    id: marketId,
+    state: MarketState.STATE_SETTLED,
+    tradableInstrument: {
+      instrument: {
+        metadata: {
+          tags: [settlementDateTag],
+        },
+        product: {
+          dataSourceSpecForSettlementData: {
+            id: settlementDataId,
+          },
+          dataSourceSpecBinding: {
+            settlementDataProperty,
+          },
+        },
+      },
+    },
+  });
+  const marketsMock: MockedResponse<MarketsQuery> = {
+    request: {
+      query: MarketsDocument,
+    },
+    result: {
+      data: marketsQuery({
+        marketsConnection: {
+          edges: [
+            {
+              node: market,
+            },
+          ],
+        },
+      }),
+    },
+  };
+
+  const marketsData = createMarketsDataFragment({
+    __typename: 'MarketData',
+    market: {
+      __typename: 'Market',
+      id: marketId,
+    },
+    bestBidPrice: '1000',
+    bestOfferPrice: '2000',
+    markPrice: '1500',
+  });
+  const marketsDataMock: MockedResponse<MarketsDataQuery> = {
+    request: {
+      query: MarketsDataDocument,
+    },
+    result: {
+      data: marketsDataQuery({
+        marketsConnection: {
+          edges: [
+            {
+              node: {
+                data: marketsData,
+              },
+            },
+          ],
+        },
+      }),
+    },
+  };
+
+  // Create mock oracle data
+  const property = {
+    __typename: 'Property' as const,
+    name: settlementDataProperty,
+    value: '12345',
+  };
+  const oracleDataMock: MockedResponse<OracleSpecDataConnectionQuery> = {
+    request: {
+      query: OracleSpecDataConnectionDocument,
+      variables: {
+        oracleSpecId: settlementDataId,
+      },
+    },
+    result: {
+      data: {
+        oracleSpec: {
+          dataConnection: {
+            edges: [
+              {
+                node: {
+                  externalData: {
+                    data: {
+                      data: [property],
+                    },
+                  },
+                },
+              },
+            ],
+          },
+        },
+      },
+    },
+  };
+
+  // Create mock position
+  const createPosition = (): PositionFieldsFragment => {
+    return {
+      __typename: 'Position' as const,
+      realisedPNL: '1000',
+      unrealisedPNL: '2000',
+      openVolume: '3000',
+      averageEntryPrice: '100',
+      updatedAt: new Date().toISOString(),
+      positionStatus: PositionStatus.POSITION_STATUS_UNSPECIFIED,
+      lossSocializationAmount: '1000',
+      market: {
+        __typename: 'Market',
+        id: marketId,
+      },
+    };
+  };
+  const position = createPosition();
+  const positionsMock: MockedResponse<PositionsQuery> = {
+    request: {
+      query: PositionsDocument,
+      variables: {
+        partyId: pubKey,
+      },
+    },
+    result: {
+      data: {
+        party: {
+          __typename: 'Party',
+          id: pubKey,
+          positionsConnection: {
+            __typename: 'PositionConnection',
+            edges: [{ __typename: 'PositionEdge', node: position }],
+          },
+        },
+      },
+    },
+  };
+
+  beforeAll(() => {
+    originalNow = Date.now;
+    Date.now = jest.fn().mockReturnValue(mockNowTimestamp);
+  });
+
+  afterAll(() => {
+    Date.now = originalNow;
+  });
+
+  it('renders correctly formatted and filtered rows', async () => {
+    await act(async () => {
+      render(
+        <MockedProvider
+          mocks={[marketsMock, marketsDataMock, positionsMock, oracleDataMock]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      );
+    });
+    // screen.debug(document, Infinity);
+
+    const headers = screen.getAllByRole('columnheader');
+    const expectedHeaders = [
+      'Market',
+      'Description',
+      'Status',
+      'Settlement date',
+      'Best bid',
+      'Best offer',
+      'Mark price',
+      'Settlement price',
+      'Realised PNL',
+      'Settlement asset',
+      'Market ID',
+    ];
+    expect(headers).toHaveLength(expectedHeaders.length);
+    expect(headers.map((h) => h.textContent?.trim())).toEqual(expectedHeaders);
+
+    const cells = screen.getAllByRole('gridcell');
+    const expectedValues = [
+      market.tradableInstrument.instrument.code,
+      market.tradableInstrument.instrument.name,
+      MarketStateMapping[market.state],
+      '3 days ago',
+      /* eslint-disable @typescript-eslint/no-non-null-assertion */
+      addDecimalsFormatNumber(marketsData.bestBidPrice, market.decimalPlaces),
+      addDecimalsFormatNumber(
+        marketsData!.bestOfferPrice,
+        market.decimalPlaces
+      ),
+      addDecimalsFormatNumber(marketsData!.markPrice, market.decimalPlaces),
+      /* eslint-enable @typescript-eslint/no-non-null-assertion */
+      addDecimalsFormatNumber(property.value, market.decimalPlaces),
+      addDecimalsFormatNumber(position.realisedPNL, market.decimalPlaces),
+      market.tradableInstrument.instrument.product.settlementAsset.symbol,
+      market.id,
+    ];
+    cells.forEach((cell, i) => {
+      expect(cell).toHaveTextContent(expectedValues[i]);
+    });
+  });
+
+  it('only renders settled and terminated markets', async () => {
+    const mixedMarkets = [
+      {
+        // inlclude as settled
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'include-0',
+          state: MarketState.STATE_SETTLED,
+        }),
+      },
+      {
+        // omit this market
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'discard-0',
+          state: MarketState.STATE_SUSPENDED,
+        }),
+      },
+      {
+        // include as terminated
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'include-1',
+          state: MarketState.STATE_TRADING_TERMINATED,
+        }),
+      },
+      {
+        // omit this market
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'discard-1',
+          state: MarketState.STATE_ACTIVE,
+        }),
+      },
+    ];
+    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
+      request: {
+        query: MarketsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: mixedMarkets,
+          },
+        },
+      },
+    };
+    await act(async () => {
+      render(
+        <MockedProvider
+          mocks={[
+            mixedMarketsMock,
+            marketsDataMock,
+            positionsMock,
+            oracleDataMock,
+          ]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      );
+    });
+
+    // check that the number of rows in datagrid is 2
+    const container = within(
+      document.querySelector('.ag-center-cols-container') as HTMLElement
+    );
+    const expectedRows = mixedMarkets.filter((m) => {
+      return [
+        MarketState.STATE_SETTLED,
+        MarketState.STATE_TRADING_TERMINATED,
+      ].includes(m.node.state);
+    });
+
+    // check rows length is correct
+    const rows = container.getAllByRole('row');
+    expect(rows).toHaveLength(expectedRows.length);
+
+    // check that only included ids are shown
+    const cells = screen
+      .getAllByRole('gridcell')
+      .filter((cell) => cell.getAttribute('col-id') === 'id')
+      .map((cell) => cell.textContent?.trim());
+    expect(cells).toEqual(expectedRows.map((m) => m.node.id));
+  });
+});
@@ -0,0 +1,285 @@
+import compact from 'lodash/compact';
+import { isAfter } from 'date-fns';
+import type {
+  VegaICellRendererParams,
+  VegaValueFormatterParams,
+} from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { useMemo } from 'react';
+import { t } from '@vegaprotocol/i18n';
+import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
+import {
+  addDecimalsFormatNumber,
+  getMarketExpiryDate,
+} from '@vegaprotocol/utils';
+import { usePositionsQuery } from '@vegaprotocol/positions';
+import type { MarketMaybeWithData } from '@vegaprotocol/market-list';
+import { closedMarketsWithDataProvider } from '@vegaprotocol/market-list';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
+import type { ColDef } from 'ag-grid-community';
+import { SettlementDateCell } from './settlement-date-cell';
+import { SettlementPriceCell } from './settlement-price-cell';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+
+type SettlementAsset =
+  MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
+
+interface Row {
+  id: string;
+  code: string;
+  name: string;
+  decimalPlaces: number;
+  state: MarketState;
+  metadata: string[];
+  closeTimestamp: string | null;
+  bestBidPrice: string | undefined;
+  bestOfferPrice: string | undefined;
+  markPrice: string | undefined;
+  settlementDataOracleId: string;
+  settlementDataSpecBinding: string;
+  tradingTerminationOracleId: string;
+  settlementAsset: SettlementAsset;
+  realisedPNL: string | undefined;
+}
+
+export const Closed = () => {
+  const { pubKey } = useVegaWallet();
+  const {
+    data: marketData,
+    loading,
+    error,
+    reload,
+  } = useDataProvider({
+    dataProvider: closedMarketsWithDataProvider,
+    variables: undefined,
+  });
+  const { data: positionData } = usePositionsQuery({
+    variables: {
+      partyId: pubKey || '',
+    },
+    skip: !pubKey,
+  });
+
+  // find a position for each market and add the realised pnl to
+  // a normalized object
+  const rowData = compact(marketData).map((market) => {
+    const position = positionData?.party?.positionsConnection?.edges?.find(
+      (edge) => {
+        return edge.node.market.id === market.id;
+      }
+    );
+
+    const row: Row = {
+      id: market.id,
+      code: market.tradableInstrument.instrument.code,
+      name: market.tradableInstrument.instrument.name,
+      decimalPlaces: market.decimalPlaces,
+      state: market.state,
+      metadata: market.tradableInstrument.instrument.metadata.tags ?? [],
+      closeTimestamp: market.marketTimestamps.close,
+      bestBidPrice: market.data?.bestBidPrice,
+      bestOfferPrice: market.data?.bestOfferPrice,
+      markPrice: market.data?.markPrice,
+      settlementDataOracleId:
+        market.tradableInstrument.instrument.product
+          .dataSourceSpecForSettlementData.id,
+      settlementDataSpecBinding:
+        market.tradableInstrument.instrument.product.dataSourceSpecBinding
+          .settlementDataProperty,
+      tradingTerminationOracleId:
+        market.tradableInstrument.instrument.product
+          .dataSourceSpecForTradingTermination.id,
+      settlementAsset:
+        market.tradableInstrument.instrument.product.settlementAsset,
+      realisedPNL: position?.node.realisedPNL,
+    };
+
+    return row;
+  });
+  return (
+    <div className="h-full relative">
+      <ClosedMarketsDataGrid rowData={rowData} />
+      <div className="pointer-events-none absolute inset-0">
+        <AsyncRenderer
+          loading={loading}
+          error={error}
+          data={marketData}
+          noDataMessage={t('No markets')}
+          reload={reload}
+        />
+      </div>
+    </div>
+  );
+};
+
+const ClosedMarketsDataGrid = ({ rowData }: { rowData: Row[] }) => {
+  const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
+  const colDefs = useMemo(() => {
+    const cols: ColDef[] = [
+      {
+        headerName: t('Market'),
+        field: 'code',
+      },
+      {
+        headerName: t('Description'),
+        field: 'name',
+      },
+      {
+        headerName: t('Status'),
+        field: 'state',
+        valueFormatter: ({ value }: VegaValueFormatterParams<Row, 'state'>) => {
+          if (!value) return '-';
+          return MarketStateMapping[value];
+        },
+      },
+      {
+        headerName: t('Settlement date'),
+        colId: 'settlementDate', // colId needed if no field property provided otherwise column order is ruined in tests
+        valueGetter: ({ data }: { data: Row }) => {
+          return getMarketExpiryDate(data.metadata);
+        },
+        cellRenderer: ({ value, data }: { value: Date | null; data: Row }) => {
+          return (
+            <SettlementDateCell
+              oracleSpecId={data.tradingTerminationOracleId}
+              metaDate={value}
+              marketState={data.state}
+              closeTimestamp={data.closeTimestamp}
+            />
+          );
+        },
+        cellClassRules: {
+          'text-danger': ({
+            value,
+            data,
+          }: {
+            value: Date | null;
+            data: Row;
+          }) => {
+            const date = data.closeTimestamp
+              ? new Date(data.closeTimestamp)
+              : value;
+
+            if (!date) return false;
+
+            if (
+              // expiry has passed and market is not yet settled
+              isAfter(new Date(), date) &&
+              data.state !== MarketState.STATE_SETTLED
+            ) {
+              return true;
+            }
+            return false;
+          },
+        },
+      },
+      {
+        headerName: t('Best bid'),
+        field: 'bestBidPrice',
+        type: 'numericColumn',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'bestBidPrice'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Best offer'),
+        field: 'bestOfferPrice',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        type: 'numericColumn',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'bestOfferPrice'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Mark price'),
+        field: 'markPrice',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        type: 'numericColumn',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'markPrice'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Settlement price'),
+        type: 'numericColumn',
+        field: 'settlementDataOracleId',
+        // 'tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id',
+        cellRenderer: ({
+          value,
+          data,
+        }: VegaICellRendererParams<Row, 'settlementDataOracleId'>) => (
+          <SettlementPriceCell
+            oracleSpecId={value}
+            decimalPlaces={data?.decimalPlaces ?? 0}
+            settlementDataSpecBinding={data?.settlementDataSpecBinding}
+          />
+        ),
+      },
+      {
+        headerName: t('Realised PNL'),
+        field: 'realisedPNL',
+        cellClass: 'font-mono ag-right-aligned-cell',
+        type: 'numericColumn',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'realisedPNL'>) => {
+          if (!value || !data) return '-';
+          return addDecimalsFormatNumber(value, data.decimalPlaces);
+        },
+      },
+      {
+        headerName: t('Settlement asset'),
+        field: 'settlementAsset',
+        cellRenderer: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<Row, 'settlementAsset'>) => (
+          <button
+            className="underline"
+            onClick={() => {
+              if (!value) return;
+              openAssetDialog(value.id);
+            }}
+          >
+            {value ? value.symbol : '-'}
+          </button>
+        ),
+      },
+      {
+        headerName: t('Market ID'),
+        field: 'id',
+      },
+    ];
+    return cols;
+  }, [openAssetDialog]);
+
+  return (
+    <AgGrid
+      style={{ width: '100%', height: '100%' }}
+      rowData={rowData}
+      columnDefs={colDefs}
+      getRowId={({ data }) => data.id}
+      defaultColDef={{
+        flex: 1,
+        resizable: true,
+      }}
+      overlayNoRowsTemplate="No data"
+    />
+  );
+};
@@ -5,6 +5,7 @@ import { LocalStoragePersistTabs as Tabs, Tab } from '@vegaprotocol/ui-toolkit';
 import { Markets } from './markets';
 import { Proposed } from './proposed';
 import { usePageTitleStore } from '../../stores';
+import { Closed } from './closed';

 export const MarketsPage = () => {
  const { updateTitle } = usePageTitleStore((store) => ({
@@ -21,6 +22,9 @@ export const MarketsPage = () => {
      <Tab id="proposed-markets" name={t('Proposed markets')}>
        <Proposed />
      </Tab>
+      <Tab id="closed-markets" name={t('Closed markets')}>
+        <Closed />
+      </Tab>
    </Tabs>
  );
 };
@@ -0,0 +1,105 @@
+import { render, screen } from '@testing-library/react';
+import { MarketState } from '@vegaprotocol/types';
+import { addDays, subDays } from 'date-fns';
+import type { SettlementDataCellProps } from './settlement-date-cell';
+import { SettlementDateCell } from './settlement-date-cell';
+
+describe('SettlementDateCell', () => {
+  let originalNow: typeof Date.now;
+  const mockNowTimestamp = 1672531200000;
+
+  const createProps = (): SettlementDataCellProps => {
+    return {
+      oracleSpecId: 'oracle-spec-id',
+      metaDate: null,
+      closeTimestamp: null,
+      marketState: MarketState.STATE_SETTLED,
+    };
+  };
+
+  beforeAll(() => {
+    originalNow = Date.now;
+    Date.now = jest.fn().mockReturnValue(mockNowTimestamp);
+  });
+
+  afterAll(() => {
+    Date.now = originalNow;
+  });
+
+  it('renders unknown if date cannot be determined', () => {
+    const props = createProps();
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent('Unknown');
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders using close timestamp if provided', () => {
+    const daysAgo = 3;
+    const props = createProps();
+    props.closeTimestamp = subDays(
+      new Date(mockNowTimestamp),
+      daysAgo
+    ).toISOString();
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`${daysAgo} days ago`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders using meta tag date if no close timestamp provided', () => {
+    const daysAgo = 4;
+    const props = createProps();
+    props.metaDate = subDays(new Date(mockNowTimestamp), daysAgo);
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`${daysAgo} days ago`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders past expected settlement date', () => {
+    const daysAgo = 3;
+    const props = createProps();
+    props.metaDate = subDays(new Date(mockNowTimestamp), daysAgo);
+    props.marketState = MarketState.STATE_TRADING_TERMINATED;
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`Expected ${daysAgo} days ago`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders future expected settlement date', () => {
+    const daysAgo = 3;
+    const props = createProps();
+    props.metaDate = addDays(new Date(mockNowTimestamp), daysAgo);
+    props.marketState = MarketState.STATE_TRADING_TERMINATED;
+
+    render(<SettlementDateCell {...props} />);
+
+    const link = screen.getByRole('link');
+    expect(link).toHaveTextContent(`Expected in ${daysAgo} days`);
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+});
@@ -0,0 +1,55 @@
+import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
+import { t } from '@vegaprotocol/i18n';
+import { MarketState } from '@vegaprotocol/types';
+import { Link } from '@vegaprotocol/ui-toolkit';
+import { getDateTimeFormat } from '@vegaprotocol/utils';
+import { formatDistanceToNowStrict, isAfter } from 'date-fns';
+
+export interface SettlementDataCellProps {
+  oracleSpecId: string;
+  metaDate: Date | null;
+  closeTimestamp: string | null;
+  marketState: MarketState;
+}
+
+export const SettlementDateCell = ({
+  oracleSpecId,
+  metaDate,
+  closeTimestamp,
+  marketState,
+}: SettlementDataCellProps) => {
+  const linkCreator = useLinks(DApp.Explorer);
+  const date = closeTimestamp ? new Date(closeTimestamp) : metaDate;
+
+  let text = '';
+  if (!date) {
+    text = t('Unknown');
+  } else {
+    // pass Date.now() to date constructor for easier mocking
+    const expiryHasPassed = isAfter(new Date(Date.now()), date);
+    const distance = formatDistanceToNowStrict(date); // X days/mins ago
+
+    if (expiryHasPassed) {
+      if (marketState !== MarketState.STATE_SETTLED) {
+        text = t('Expected %s ago', distance);
+      } else {
+        text = t('%s ago', distance);
+      }
+    } else {
+      text = t('Expected in %s', distance);
+    }
+  }
+
+  return (
+    <Link
+      href={linkCreator(EXPLORER_ORACLE.replace(':id', oracleSpecId))}
+      className="underline"
+      target="_blank"
+      title={
+        date ? getDateTimeFormat().format(date) : t('Unknown settlement date')
+      }
+    >
+      {text}
+    </Link>
+  );
+};
@@ -0,0 +1,113 @@
+import { render, screen } from '@testing-library/react';
+import type { Property } from '@vegaprotocol/types';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import type { OracleSpecDataConnectionQuery } from '@vegaprotocol/oracles';
+import { OracleSpecDataConnectionDocument } from '@vegaprotocol/oracles';
+import type { SettlementPriceCellProps } from './settlement-price-cell';
+import { SettlementPriceCell } from './settlement-price-cell';
+
+describe('SettlementPriceCell', () => {
+  const createMock = (
+    id: string,
+    property: Property
+  ): MockedResponse<OracleSpecDataConnectionQuery> => {
+    return {
+      request: {
+        query: OracleSpecDataConnectionDocument,
+        variables: {
+          oracleSpecId: id,
+        },
+      },
+      result: {
+        data: {
+          oracleSpec: {
+            dataConnection: {
+              edges: [
+                {
+                  node: {
+                    externalData: {
+                      data: {
+                        data: [property],
+                      },
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      },
+    };
+  };
+  const createProps = (): SettlementPriceCellProps => {
+    return {
+      oracleSpecId: 'oracle-spec-id',
+      decimalPlaces: 2,
+      settlementDataSpecBinding: 'settlement-data-spec-binding',
+    };
+  };
+  it('renders fetches and renders the settlment data value', async () => {
+    const props = createProps();
+    const property = {
+      __typename: 'Property' as const,
+      name: props.settlementDataSpecBinding as string,
+      value: '1234',
+    };
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const mock = createMock(props.oracleSpecId!, property);
+
+    render(
+      <MockedProvider mocks={[mock]}>
+        <SettlementPriceCell {...props} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+    const link = await screen.findByRole('link');
+    expect(link).toHaveTextContent('12.34');
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders "-" if no spec value is found', async () => {
+    const props = createProps();
+    const property = {
+      __typename: 'Property' as const,
+      name: 'no matching spec binding',
+      value: '1234',
+    };
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const mock = createMock(props.oracleSpecId!, property);
+
+    render(
+      <MockedProvider mocks={[mock]}>
+        <SettlementPriceCell {...props} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+    const link = await screen.findByRole('link');
+    expect(link).toHaveTextContent('-');
+    expect(link).toHaveAttribute(
+      'href',
+      expect.stringContaining(`/oracles/${props.oracleSpecId}`)
+    );
+  });
+
+  it('renders "-" with no link if oracle spec id is not provided', () => {
+    const props = createProps();
+    props.oracleSpecId = undefined;
+
+    render(
+      <MockedProvider mocks={[]}>
+        <SettlementPriceCell {...props} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+    expect(screen.queryByRole('link')).not.toBeInTheDocument();
+  });
+});
@@ -0,0 +1,39 @@
+import { DApp, EXPLORER_ORACLE, useLinks } from '@vegaprotocol/environment';
+import { t } from '@vegaprotocol/i18n';
+import { useOracleSpecBindingData } from '@vegaprotocol/oracles';
+import { Link } from '@vegaprotocol/ui-toolkit';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+
+export interface SettlementPriceCellProps {
+  oracleSpecId: string | undefined;
+  decimalPlaces: number;
+  settlementDataSpecBinding: string | undefined;
+}
+
+export const SettlementPriceCell = ({
+  oracleSpecId,
+  decimalPlaces,
+  settlementDataSpecBinding,
+}: SettlementPriceCellProps) => {
+  const linkCreator = useLinks(DApp.Explorer);
+  const { property, loading } = useOracleSpecBindingData(
+    oracleSpecId,
+    settlementDataSpecBinding
+  );
+
+  if (!oracleSpecId || loading) {
+    return <span>-</span>;
+  }
+
+  return (
+    <Link
+      href={linkCreator(EXPLORER_ORACLE.replace(':id', oracleSpecId))}
+      className="underline font-mono"
+      target="_blank"
+    >
+      {property
+        ? addDecimalsFormatNumber(property.value, decimalPlaces)
+        : t('-')}
+    </Link>
+  );
+};
@@ -0,0 +1,2 @@
+export { Settings as default } from './settings';
+export { SettingsButton } from './settings-button';
@@ -0,0 +1,16 @@
+import { Icon, NavigationLink } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+import { Links, Routes } from '../../pages/client-router';
+import { COG } from '@blueprintjs/icons/src/generated/iconNames';
+
+export const SettingsButton = ({ withMobile }: { withMobile?: boolean }) => {
+  return (
+    <NavigationLink data-testid="Settings" to={Links[Routes.SETTINGS]()}>
+      {withMobile ? (
+        t('Settings')
+      ) : (
+        <Icon name={COG} className="!align-middle" />
+      )}
+    </NavigationLink>
+  );
+};
@@ -0,0 +1,49 @@
+import { t } from '@vegaprotocol/i18n';
+import { TelemetryApproval } from '../../components/welcome-dialog/telemetry-approval';
+import {
+  Divider,
+  RoundedWrapper,
+  Switch,
+  ThemeSwitcher,
+} from '@vegaprotocol/ui-toolkit';
+import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
+
+export const Settings = () => {
+  const { theme, setTheme } = useThemeSwitcher();
+  const text = t(theme === 'dark' ? 'Light mode' : 'Dark mode');
+  return (
+    <div className="py-16 px-8 flex w-full justify-center">
+      <div className="lg:min-w-[700px] min-w-[300px]">
+        <h1 className="text-4xl xl:text-5xl uppercase font-alpha calt">
+          {t('Settings')}
+        </h1>
+        <div className="mt-8 text-base text-neutral-500 dark:text-neutral-400">
+          {t('Changes are applied automatically.')}
+        </div>
+        <div className="mt-10 w-full">
+          <RoundedWrapper paddingBottom>
+            <div className="flex justify-between py-3">
+              <div className="flex shrink">
+                <ThemeSwitcher />
+                <label htmlFor="theme-switcher" className="self-center text-lg">
+                  {text}
+                </label>
+              </div>
+              <Switch
+                name="settings-theme-switch"
+                onCheckedChange={() => setTheme()}
+                checked={theme === 'dark'}
+              />
+            </div>
+            <Divider />
+            <TelemetryApproval
+              helpText={t(
+                'Help identify bugs and improve the service by sharing anonymous usage data.'
+              )}
+            />
+          </RoundedWrapper>
+        </div>
+      </div>
+    </div>
+  );
+};
@@ -26,7 +26,8 @@ export const OracleBanner = ({ marketId }: { marketId: string }) => {
  return (
    <NotificationBanner intent={Intent.Danger}>
      <div>
-        Oracle status for this market is {oracle.status}.{' '}
+        Oracle status for this market is{' '}
+        <span data-testId="oracle-status">{oracle.status}</span>.{' '}
        {oracleStatuses[oracle.status]}
      </div>
      {oracle.status_reason ? (
@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 export const THROTTLE_UPDATE_TIME = 500;
-export const RISK_ACCEPTED_KEY = 'vega-risk-accepted';
+export const RISK_ACCEPTED_KEY = 'vega_risk_accepted';
 export const MAINNET_WELCOME_HEADER = t(
  'Trade cash settled futures on the fully decentralised Vega network.'
 );
@@ -10,7 +10,6 @@ import { t } from '@vegaprotocol/i18n';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
 import {
-  ThemeSwitcher,
  Navigation,
  NavigationList,
  NavigationItem,
@@ -24,6 +23,7 @@ import {

 import { Links, Routes } from '../../pages/client-router';
 import { createDocsLinks } from '@vegaprotocol/utils';
+import { SettingsButton } from '../../client-pages/settings';

 export const Navbar = ({
  theme = 'system',
@@ -45,7 +45,7 @@ export const Navbar = ({
      theme={theme}
      actions={
        <>
-          <ThemeSwitcher />
+          <SettingsButton />
          <VegaWalletConnectButton />
        </>
      }
@@ -108,15 +108,15 @@ export const Navbar = ({
        )}
      </NavigationList>
      <NavigationList
-        className="[.drawer-content_&]:border-t [.drawer-content_&]:border-t-vega-light-200 dark:[.drawer-content_&]:border-t-vega-dark-200 [.drawer-content_&]:pt-8 [.drawer-content_&]:mt-4"
+        className="[.drawer-content_&]:border-t [.drawer-content_&]:border-t-vega-light-200 dark:[.drawer-content_&]:border-t-vega-dark-200 [.drawer-content_&]:pt-4 [.drawer-content_&]:mt-4"
        hide={[
          NavigationBreakpoint.Small,
          NavigationBreakpoint.Narrow,
          NavigationBreakpoint.Full,
        ]}
      >
-        <NavigationItem className="[.drawer-content_&]:w-full text-black dark:text-white">
-          <ThemeSwitcher withMobile />
+        <NavigationItem className="[.drawer-content_&]:w-full">
+          <SettingsButton withMobile />
        </NavigationItem>
      </NavigationList>
    </Navigation>
@@ -39,7 +39,17 @@ const MARKET_A: PartialMarket = {
          symbol: 'ABC',
        },
        dataSourceSpecForTradingTermination: {
-          id: '',
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecForSettlementData: {
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecBinding: {
+          __typename: 'DataSourceSpecToFutureBinding',
+          tradingTerminationProperty: 'trading-termination-property',
+          settlementDataProperty: 'settlement-data-property',
        },
      },
      metadata: {
@@ -115,7 +125,17 @@ const MARKET_B: PartialMarket = {
          symbol: 'XYZ',
        },
        dataSourceSpecForTradingTermination: {
-          id: '',
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecForSettlementData: {
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecBinding: {
+          __typename: 'DataSourceSpecToFutureBinding',
+          tradingTerminationProperty: 'trading-termination-property',
+          settlementDataProperty: 'settlement-data-property',
        },
      },
      metadata: {
@@ -1,9 +1,6 @@
-import { BrowserRouter } from 'react-router-dom';
 import { render, screen, fireEvent } from '@testing-library/react';
-import { MockedProvider } from '@apollo/client/testing';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { RiskNoticeDialog } from './risk-notice-dialog';
-import { WelcomeDialog } from './welcome-dialog';

 jest.mock('@vegaprotocol/environment');

@@ -14,21 +11,19 @@ const mockEnvDefinitions = {
 };

 describe('Risk notice dialog', () => {
-  const introText = 'Regulation may apply to use of this app';
  const mockOnClose = jest.fn();
  afterEach(() => {
    jest.clearAllMocks();
  });

  it.each`
-    assertion             | network
-    ${'displays'}         | ${Networks.MAINNET}
-    ${'does not display'} | ${Networks.CUSTOM}
-    ${'does not display'} | ${Networks.DEVNET}
-    ${'does not display'} | ${Networks.STAGNET3}
-    ${'does not display'} | ${Networks.TESTNET}
+    assertion     | network
+    ${'displays'} | ${Networks.CUSTOM}
+    ${'displays'} | ${Networks.DEVNET}
+    ${'displays'} | ${Networks.STAGNET3}
+    ${'displays'} | ${Networks.TESTNET}
  `(
-    '$assertion the risk notice on $network',
+    '$assertion a generic message on $network',
    async ({ assertion, network }) => {
      // @ts-ignore ignore mock implementation
      useEnvironment.mockImplementation(() => ({
@@ -36,33 +31,37 @@ describe('Risk notice dialog', () => {
        VEGA_ENV: network,
      }));

-      render(
-        <MockedProvider>
-          <WelcomeDialog />
-        </MockedProvider>,
-        { wrapper: BrowserRouter }
-      );
+      render(<RiskNoticeDialog onClose={mockOnClose} network={network} />);

-      if (assertion === 'displays') {
-        // eslint-disable-next-line jest/no-conditional-expect
-        expect(screen.queryByText(introText)).toBeInTheDocument();
-      } else {
-        // eslint-disable-next-line jest/no-conditional-expect
-        expect(screen.queryByText(introText)).not.toBeInTheDocument();
-      }
+      expect(
+        screen.getByText(
+          new RegExp(
+            `This application for trading on Vega is connected to ${network}`
+          )
+        )
+      ).toBeInTheDocument();
+
+      const button = screen.getByRole('button', {
+        name: 'Continue',
+      });
+      fireEvent.click(button);
+      expect(mockOnClose).toHaveBeenCalled();
    }
  );

-  it("doesn't display the risk notice when previously acknowledged", () => {
+  it('displays a risk message for mainnet', () => {
+    const introText = 'Regulation may apply to use of this app';
+    const network = Networks.MAINNET;
+
    // @ts-ignore ignore mock implementation
    useEnvironment.mockImplementation(() => ({
      ...mockEnvDefinitions,
-      VEGA_ENV: Networks.MAINNET,
+      VEGA_ENV: network,
    }));

-    render(<RiskNoticeDialog onClose={mockOnClose} />);
+    render(<RiskNoticeDialog onClose={mockOnClose} network={network} />);

-    expect(screen.queryByText(introText)).toBeInTheDocument();
+    expect(screen.getByText(introText)).toBeInTheDocument();

    const button = screen.getByRole('button', {
      name: 'I understand, Continue',
@@ -1,24 +1,100 @@
-import { useCallback } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import { Button } from '@vegaprotocol/ui-toolkit';
-import { LocalStorage } from '@vegaprotocol/utils';
+import {
+  Button,
+  Link,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
 import { RISK_ACCEPTED_KEY } from '../constants';
+import { TelemetryApproval } from './telemetry-approval';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';

 interface Props {
  onClose: () => void;
+  network: Networks;
 }
-export const RiskNoticeDialog = ({ onClose }: Props) => {
-  const handleAcceptRisk = useCallback(() => {
-    onClose();
-    LocalStorage.setItem(RISK_ACCEPTED_KEY, 'true');
-  }, [onClose]);
+export const RiskNoticeDialog = ({ onClose, network }: Props) => {
+  const [, setValue] = useLocalStorage(RISK_ACCEPTED_KEY);

+  const handleAcceptRisk = () => {
+    onClose();
+    setValue('true');
+  };
+
+  return (
+    <>
+      {network === Networks.MAINNET ? (
+        <MainnetContent />
+      ) : (
+        <TestnetContent network={network} />
+      )}
+      <div className="my-4">
+        <TelemetryApproval
+          helpText={t(
+            'Help identify bugs and improve the service by sharing anonymous usage data. You can change this in your settings at any time.'
+          )}
+        />
+      </div>
+      <Button onClick={handleAcceptRisk}>
+        {network === Networks.MAINNET
+          ? t('I understand, Continue')
+          : t('Continue')}
+      </Button>
+    </>
+  );
+};
+
+const TestnetContent = ({ network }: { network: Networks }) => {
+  const { VEGA_DOCS_URL, GITHUB_FEEDBACK_URL, VEGA_WALLET_URL } =
+    useEnvironment();
+  return (
+    <>
+      <p className="mb-4">
+        {t(
+          'This application for trading on Vega is connected to %s, meaning you are free to try out trading with virtual assets and no risk.',
+          [network]
+        )}
+      </p>
+      <p className="mb-4">
+        {t(
+          'Your Vega wallet must also be connected to %s, and your Ethereum wallet must be connected to Sepolia.',
+          [network]
+        )}
+      </p>
+      {VEGA_DOCS_URL && GITHUB_FEEDBACK_URL && VEGA_WALLET_URL && (
+        <ul className="list-disc pl-4">
+          <li className="mb-1">
+            <Link href={VEGA_WALLET_URL} target="_blank">
+              <span className="underline">{t('Learn about Vega wallet')}</span>{' '}
+              <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            </Link>
+          </li>
+          <li className="mb-1">
+            <Link href={VEGA_DOCS_URL} target="_blank">
+              <span className="underline">{t('View documentation')}</span>{' '}
+              <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            </Link>
+          </li>
+          <li className="mb-1">
+            <Link href={GITHUB_FEEDBACK_URL} target="_blank">
+              <span className="underline">{t('Provide feedback')}</span>{' '}
+              <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
+            </Link>
+          </li>
+        </ul>
+      )}
+    </>
+  );
+};
+
+const MainnetContent = () => {
  return (
    <>
      <h4 className="text-xl mb-2 mt-4">
        {t('Regulation may apply to use of this app')}
      </h4>
-      <p className="text-base mb-6">
+      <p className="mb-6">
        {t(
          'This decentralised application allows you to connect to and use publicly available blockchain services operated by third parties that may include trading, financial products, or other services that may be subject to legal and regulatory restrictions in your jurisdiction. This application is a front end only and does not hold any funds or provide any products or services. It is available to anyone with an internet connection via IPFS and other methods, and the ability to access it does not imply any right to use any services or that it is legal for you to do so. By using this application you accept that it is your responsibility to ensure that your use of the application and any blockchain services accessed through it is compliant with applicable laws and regulations in your jusrisdiction.'
        )}
@@ -26,12 +102,11 @@ export const RiskNoticeDialog = ({ onClose }: Props) => {
      <h4 className="text-xl mb-2">
        {t('Technical and financial risk of loss')}
      </h4>
-      <p className="text-base mb-8">
+      <p className="mb-8">
        {t(
          'The public blockchain services accessible via this decentralised application are operated by third parties and may carry significant risks including the potential loss of all funds that you deposit or hold with these services. Technical risks include the risk of loss in the event of the failure or compromise of the public blockchain infrastructure or smart contracts that provide any services you use. Financial risks include but are not limited to losses due to volatility, excessive leverage, low liquidity, and your own lack of understanding of the services you use. By using this decentralised application you accept that it is your responsibility to ensure that you understand any services you use and the technical and financial risks inherent in your use. Do not risk what you cannot afford to lose.'
        )}
      </p>
-      <Button onClick={handleAcceptRisk}>{t('I understand, Continue')}</Button>
    </>
  );
 };
@@ -0,0 +1,22 @@
+import { render, screen, act } from '@testing-library/react';
+import { TelemetryApproval } from './telemetry-approval';
+
+describe('TelemetryApproval', () => {
+  it('click on checkbox should be properly handled', () => {
+    const helpText = 'My help text';
+    render(<TelemetryApproval helpText={helpText} />);
+    expect(screen.getByRole('checkbox')).toHaveAttribute(
+      'data-state',
+      'unchecked'
+    );
+    act(() => {
+      screen.getByRole('checkbox').click();
+    });
+    expect(screen.getByRole('checkbox')).toHaveAttribute(
+      'data-state',
+      'checked'
+    );
+    expect(screen.getByText('Share usage data')).toBeInTheDocument();
+    expect(screen.getByText(helpText)).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,22 @@
+import { Checkbox } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/i18n';
+import { useTelemetryApproval } from '../../lib/hooks/use-telemetry-approval';
+
+export const TelemetryApproval = ({ helpText }: { helpText: string }) => {
+  const [isApproved, setIsApproved] = useTelemetryApproval();
+  return (
+    <div className="flex flex-col px-2 py-3">
+      <div className="mr-4" role="form">
+        <Checkbox
+          label={<span className="text-lg pl-1">{t('Share usage data')}</span>}
+          checked={isApproved}
+          name="telemetry-approval"
+          onCheckedChange={() => setIsApproved(!isApproved)}
+        />
+      </div>
+      <div className="text-sm text-vega-light-300 dark:text-vega-dark-300 ml-6">
+        <span>{helpText}</span>
+      </div>
+    </div>
+  );
+};
@@ -4,46 +4,51 @@ import { Dialog } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
 import { useDataProvider, useLocalStorage } from '@vegaprotocol/react-helpers';
 import { activeMarketsProvider } from '@vegaprotocol/market-list';
-import { useEnvironment, Networks } from '@vegaprotocol/environment';
 import * as constants from '../constants';
 import { RiskNoticeDialog } from './risk-notice-dialog';
 import { WelcomeNoticeDialog } from './welcome-notice-dialog';
 import { WelcomeLandingDialog } from './welcome-landing-dialog';
 import { useGlobalStore } from '../../stores';
+import { useEnvironment } from '@vegaprotocol/environment';
+import { Networks } from '@vegaprotocol/environment';

 export const WelcomeDialog = () => {
-  const { pathname } = useLocation();
  const { VEGA_ENV } = useEnvironment();
-  let dialogContent: React.ReactNode = null;
+  const { pathname } = useLocation();
+  let dialogContent: React.ReactNode;
  let title = '';
  let size: 'small' | 'medium' = 'small';
+  let onClose: ((open: boolean) => void) | undefined = undefined;
  const [riskAccepted] = useLocalStorage(constants.RISK_ACCEPTED_KEY);
  const { data } = useDataProvider({
    dataProvider: activeMarketsProvider,
    variables: undefined,
  });

-  const { update, shouldDisplayWelcomeDialog } = useGlobalStore((store) => ({
-    update: store.update,
-    shouldDisplayWelcomeDialog: store.shouldDisplayWelcomeDialog,
-  }));
-  const isRiskDialogNeeded =
-    riskAccepted !== 'true' && VEGA_ENV === Networks.MAINNET;
+  const update = useGlobalStore((store) => store.update);
+  const shouldDisplayWelcomeDialog = useGlobalStore(
+    (store) => store.shouldDisplayWelcomeDialog
+  );
+  const isRiskDialogNeeded = riskAccepted !== 'true' && !('Cypress' in window);
  const isWelcomeDialogNeeded = pathname === '/' || shouldDisplayWelcomeDialog;
-  const onClose = useCallback(() => {
+  const onCloseDialog = useCallback(() => {
    update({ shouldDisplayWelcomeDialog: isRiskDialogNeeded });
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    dialogContent = null;
  }, [update, isRiskDialogNeeded]);

  if (isRiskDialogNeeded) {
-    dialogContent = <RiskNoticeDialog onClose={onClose} />;
-    title = t('WARNING');
+    dialogContent = (
+      <RiskNoticeDialog onClose={onCloseDialog} network={VEGA_ENV} />
+    );
+    title = VEGA_ENV === Networks.MAINNET ? t('WARNING') : t('Vega Console');
    size = 'medium';
  } else if (isWelcomeDialogNeeded && data?.length === 0) {
    dialogContent = <WelcomeNoticeDialog />;
+    onClose = onCloseDialog;
  } else if (isWelcomeDialogNeeded && (data?.length || 0) > 0) {
-    dialogContent = <WelcomeLandingDialog onClose={onClose} />;
+    dialogContent = <WelcomeLandingDialog onClose={onCloseDialog} />;
+    onClose = onCloseDialog;
+  } else {
+    dialogContent = null as React.ReactNode;
  }

  return (
@@ -41,7 +41,17 @@ const MARKET_A: PartialMarket = {
          symbol: 'ABC',
        },
        dataSourceSpecForTradingTermination: {
-          id: '',
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecForSettlementData: {
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecBinding: {
+          __typename: 'DataSourceSpecToFutureBinding',
+          tradingTerminationProperty: 'trading-termination-property',
+          settlementDataProperty: 'settlement-data-property',
        },
      },
      metadata: {
@@ -117,7 +127,17 @@ const MARKET_B: PartialMarket = {
          symbol: 'XYZ',
        },
        dataSourceSpecForTradingTermination: {
-          id: '',
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecForSettlementData: {
+          __typename: 'DataSourceSpec',
+          id: 'oracleId',
+        },
+        dataSourceSpecBinding: {
+          __typename: 'DataSourceSpecToFutureBinding',
+          tradingTerminationProperty: 'trading-termination-property',
+          settlementDataProperty: 'settlement-data-property',
        },
      },
      metadata: {
@@ -0,0 +1,48 @@
+import { renderHook, act, waitFor } from '@testing-library/react';
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { SentryInit, SentryClose } from '@vegaprotocol/utils';
+import { STORAGE_KEY, useTelemetryApproval } from './use-telemetry-approval';
+
+const mockSetValue = jest.fn();
+const mockRemoveValue = jest.fn();
+jest.mock('@vegaprotocol/utils');
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
+  useLocalStorage: jest
+    .fn()
+    .mockImplementation(() => [false, mockSetValue, mockRemoveValue]),
+}));
+
+describe('useTelemetryApproval', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('hook should return proper array', () => {
+    const res = renderHook(() => useTelemetryApproval());
+    expect(res.result.current[0]).toEqual(false);
+    expect(res.result.current[1]).toEqual(expect.any(Function));
+    expect(useLocalStorage).toHaveBeenCalledWith(STORAGE_KEY);
+  });
+
+  it('hook should init stuff properly', async () => {
+    const res = renderHook(() => useTelemetryApproval());
+    await act(() => {
+      res.result.current[1](true);
+    });
+    await waitFor(() => {
+      expect(SentryInit).toHaveBeenCalled();
+      expect(mockSetValue).toHaveBeenCalledWith('1');
+    });
+  });
+
+  it('hook should close stuff properly', async () => {
+    const res = renderHook(() => useTelemetryApproval());
+    await act(() => {
+      res.result.current[1](false);
+    });
+    await waitFor(() => {
+      expect(SentryClose).toHaveBeenCalled();
+      expect(mockRemoveValue).toHaveBeenCalledWith();
+    });
+  });
+});
@@ -0,0 +1,24 @@
+import { useLocalStorage } from '@vegaprotocol/react-helpers';
+import { useCallback } from 'react';
+import { SentryInit, SentryClose } from '@vegaprotocol/utils';
+import { ENV } from '../config';
+export const STORAGE_KEY = 'vega_telemetry_approval';
+
+export const useTelemetryApproval = (): [
+  value: boolean,
+  setValue: (value: boolean) => void
+] => {
+  const [value, setValue, removeValue] = useLocalStorage(STORAGE_KEY);
+  const setApprove = useCallback(
+    (value: boolean) => {
+      if (value) {
+        SentryInit(ENV.dsn, ENV.envName);
+        return setValue('1');
+      }
+      SentryClose();
+      removeValue();
+    },
+    [setValue, removeValue]
+  );
+  return [Boolean(value), setApprove];
+};
@@ -36,6 +36,7 @@ import { Navbar } from '../components/navbar';
 import { ENV } from '../lib/config';
 import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { activeOrdersProvider } from '@vegaprotocol/orders';
+import { useTelemetryApproval } from '../lib/hooks/use-telemetry-approval';

 const DEFAULT_TITLE = t('Welcome to Vega trading!');

@@ -145,7 +146,10 @@ const PartyData = () => {

 const MaybeConnectEagerly = () => {
  useVegaEagerConnect(Connectors);
-  useEthereumEagerConnect(ENV.dsn);
+  const [isTelemetryApproved] = useTelemetryApproval();
+  useEthereumEagerConnect(
+    isTelemetryApproved ? { dsn: ENV.dsn, env: ENV.envName } : {}
+  );

  const { pubKey, connect } = useVegaWallet();
  const [searchParams] = useSearchParams();
@@ -26,12 +26,17 @@ const LazyPortfolio = dynamic(() => import('../client-pages/portfolio'), {
  ssr: false,
 });

+const LazySettings = dynamic(() => import('../client-pages/settings'), {
+  ssr: false,
+});
+
 export enum Routes {
  HOME = '/',
  MARKET = '/markets',
  MARKETS = '/markets/all',
  PORTFOLIO = '/portfolio',
-  LIQUIDITY = '/liquidity',
+  LIQUIDITY = 'liquidity/:marketId',
+  SETTINGS = 'settings',
 }

 type ConsoleLinks = { [r in Routes]: (...args: string[]) => string };
@@ -45,6 +50,7 @@ export const Links: ConsoleLinks = {
    marketId
      ? trimEnd(`${Routes.LIQUIDITY}/${marketId}`, '/')
      : Routes.LIQUIDITY,
+  [Routes.SETTINGS]: () => Routes.SETTINGS,
 };

 const routerConfig: RouteObject[] = [
@@ -87,6 +93,10 @@ const routerConfig: RouteObject[] = [
    path: Routes.PORTFOLIO,
    element: <LazyPortfolio />,
  },
+  {
+    path: Routes.SETTINGS,
+    element: <LazySettings />,
+  },
  {
    path: '*',
    element: (
@@ -1,14 +1,9 @@
-import * as Sentry from '@sentry/nextjs';
-import { BrowserTracing } from '@sentry/tracing';
 import { ENV } from './lib/config/env';
+import { LocalStorage, SentryInit } from '@vegaprotocol/utils';
+import { STORAGE_KEY } from './lib/hooks/use-telemetry-approval';

-const { dsn } = ENV;
-
-if (dsn) {
-  Sentry.init({
-    dsn,
-    integrations: [new BrowserTracing()],
-    tracesSampleRate: 1,
-    environment: ENV.envName,
-  });
+const { dsn, envName } = ENV;
+const isTelemetryApproved = !!LocalStorage.getItem(STORAGE_KEY);
+if (dsn && isTelemetryApproved) {
+  SentryInit(dsn, envName);
 }
@@ -61,14 +61,7 @@ describe('AccountsTable', () => {
      );
    });
    const cells = await screen.findAllByRole('gridcell');
-    const expectedValues = [
-      'tBTC',
-      '1,256.00',
-      '1,256.00',
-      '2,512.00',
-      'Deposit',
-      'Withdraw',
-    ];
+    const expectedValues = ['tBTC', '1,256.00', '1,256.00', '2,512.00', ''];
    cells.forEach((cell, i) => {
      expect(cell).toHaveTextContent(expectedValues[i]);
    });
@@ -9,7 +9,17 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { Button, ButtonLink, Dialog } from '@vegaprotocol/ui-toolkit';
+import {
+  Button,
+  ButtonLink,
+  Dialog,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuTrigger,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
 import { TooltipCellComponent } from '@vegaprotocol/ui-toolkit';
 import {
  AgGridDynamic as AgGrid,
@@ -122,7 +132,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
        params.data.asset.id === pinnedAssetId &&
        new BigNumber(params.data.total).isLessThanOrEqualTo(0)
          ? 32
-          : 22,
+          : 24,
      [pinnedAssetId]
    );

@@ -256,7 +266,7 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
              colId="accounts-actions"
              headerName=""
              sortable={false}
-              minWidth={200}
+              maxWidth={200}
              type="rightAligned"
              cellRenderer={({
                data,
@@ -283,30 +293,66 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
                    );
                  }
                  return (
-                    <>
-                      <span className="mx-1" />
-                      {!props.isReadOnly && (
-                        <ButtonLink
-                          data-testid="deposit"
-                          onClick={() => {
-                            onClickDeposit && onClickDeposit(data.asset.id);
-                          }}
-                        >
-                          {t('Deposit')}
-                        </ButtonLink>
-                      )}
-                      <span className="mx-1" />
-                      {!props.isReadOnly && (
-                        <ButtonLink
-                          data-testid="withdraw"
-                          onClick={() =>
-                            onClickWithdraw && onClickWithdraw(data.asset.id)
-                          }
-                        >
-                          {t('Withdraw')}
-                        </ButtonLink>
-                      )}
-                    </>
+                    !props.isReadOnly && (
+                      <DropdownMenu
+                        trigger={
+                          <DropdownMenuTrigger
+                            iconName="more"
+                            className="hover:bg-vega-light-200 dark:hover:bg-vega-dark-200 p-0.5 focus:rounded-full hover:rounded-full"
+                            data-testid="dropdown-menu"
+                          ></DropdownMenuTrigger>
+                        }
+                      >
+                        <DropdownMenuContent>
+                          <DropdownMenuItem
+                            key={'deposit'}
+                            data-testid="deposit"
+                            onClick={() => {
+                              onClickDeposit && onClickDeposit(data.asset.id);
+                            }}
+                          >
+                            <span>
+                              <VegaIcon
+                                name={VegaIconNames.DEPOSIT}
+                                size={16}
+                              />
+                              {t('Deposit')}
+                            </span>
+                          </DropdownMenuItem>
+                          <DropdownMenuItem
+                            key={'withdraw'}
+                            data-testid="withdraw"
+                            onClick={() =>
+                              onClickWithdraw && onClickWithdraw(data.asset.id)
+                            }
+                          >
+                            <span>
+                              <VegaIcon
+                                name={VegaIconNames.WITHDRAW}
+                                size={16}
+                              />
+                              {t('Withdraw')}
+                            </span>
+                          </DropdownMenuItem>
+                          <DropdownMenuItem
+                            key={'breakdown'}
+                            data-testid="breakdown"
+                            onClick={() => {
+                              setOpenBreakdown(!openBreakdown);
+                              setRow(data);
+                            }}
+                          >
+                            <span>
+                              <VegaIcon
+                                name={VegaIconNames.BREAKDOWN}
+                                size={16}
+                              />
+                              {t('Breakdown')}
+                            </span>
+                          </DropdownMenuItem>
+                        </DropdownMenuContent>
+                      </DropdownMenu>
+                    )
                  );
                }
              }}
@@ -314,7 +360,10 @@ export const AccountTable = forwardRef<AgGridReact, AccountTableProps>(
          }
        </AgGrid>
        <Dialog size="medium" open={openBreakdown} onChange={setOpenBreakdown}>
-          <div className="h-[35vh] w-full m-auto flex flex-col">
+          <div
+            className="h-[35vh] w-full m-auto flex flex-col"
+            data-testid="usage-breakdown"
+          >
            <h1 className="text-xl mb-4">
              {row?.asset?.symbol} {t('usage breakdown')}
            </h1>
@@ -17,6 +17,7 @@ export * from '../market-list/src/lib/market-data.mock';
 export * from '../market-list/src/lib/markets-candles.mock';
 export * from '../market-list/src/lib/markets-data.mock';
 export * from '../market-list/src/lib/markets.mock';
+export * from '../oracles/src/lib/oracle-spec-data-connection.mock';
 export * from '../orders/src/lib/components/order-data-provider/orders.mock';
 export * from '../positions/src/lib/positions.mock';
 export * from '../react-helpers/src/hooks/network-params.mock';
@@ -1 +1,4 @@
-export const ASSET_ID_FOR_MARKET = 'fUSDC';
+export const ASSET_ID_FOR_MARKET =
+  '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
+
+export const ASSET_SYMBOL = 'fUSDC';
@@ -4,7 +4,7 @@ import { createLog } from './logging';
 import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
 import { getProposal } from './get-proposal';
 import { sendVegaTx } from './wallet-client';
-import { ASSET_ID_FOR_MARKET } from './contants';
+import { ASSET_ID_FOR_MARKET, ASSET_SYMBOL } from './contants';

 const log = createLog('propose-market');

@@ -43,7 +43,7 @@ function createNewMarketProposal(): ProposalSubmissionBody {
              code: 'TEST.24h',
              future: {
                settlementAsset: ASSET_ID_FOR_MARKET,
-                quoteName: ASSET_ID_FOR_MARKET,
+                quoteName: ASSET_SYMBOL,
                dataSourceSpecForSettlementData: {
                  external: {
                    oracle: {
@@ -66,7 +66,7 @@ export function addGetAssets() {

    cy.request({
      method: 'POST',
-      url: 'http://localhost:3028/query',
+      url: 'http://localhost:3008/graphql',
      body: {
        query: print(query),
      },
@@ -24,7 +24,7 @@ export function addGetNetworkParameters() {
  }`;
    cy.request({
      method: 'POST',
-      url: `http://localhost:3028/query`,
+      url: `http://localhost:3008/graphql`,
      body: {
        query: mutation,
      },
@@ -43,7 +43,7 @@ export function addGetNodes() {

    cy.request({
      method: 'POST',
-      url: `http://localhost:3028/query`,
+      url: `http://localhost:3008/graphql`,
      body: {
        query: print(query),
      },
@@ -35,7 +35,17 @@ export function generateMarket(override?: PartialDeep<Market>): Market {
            __typename: 'Asset',
          },
          dataSourceSpecForTradingTermination: {
-            id: '',
+            __typename: 'DataSourceSpec',
+            id: 'oracleId',
+          },
+          dataSourceSpecForSettlementData: {
+            __typename: 'DataSourceSpec',
+            id: 'oracleId',
+          },
+          dataSourceSpecBinding: {
+            __typename: 'DataSourceSpecToFutureBinding',
+            tradingTerminationProperty: 'trading-termination-property',
+            settlementDataProperty: 'settlement-data-property',
          },
          quoteName: 'BTC',
          __typename: 'Future',
@@ -70,7 +70,7 @@ const NetworkLabel = ({
  isCurrent = false,
  isAvailable = false,
 }: NetworkLabelProps) => (
-  <span className="text-neutral-800">
+  <span className="text-vega-dark-300 dark:text-vega-light-300">
    {getLabelText({ isCurrent, isAvailable })}
  </span>
 );
@@ -111,9 +111,12 @@ export const NetworkSwitcher = ({
      trigger={
        <DropdownMenuTrigger
          ref={menuRef}
-          className={classNames('flex justify-between items-center', className)}
+          className={classNames(
+            'flex justify-between items-center text-sm text-vega-dark-600 dark:text-vega-light-600 py-1 px-2 rounded border border-vega-dark-200 whitespace-nowrap dark:hover:bg-vega-dark-500 hover:bg-vega-light-500',
+            className
+          )}
        >
-          {envTriggerMapping[current]}
+          <span className="mr-2"> {envTriggerMapping[current]}</span>
        </DropdownMenuTrigger>
      }
    >
@@ -100,6 +100,7 @@ export const TOKEN_VALIDATOR = '/validators/:id';

 // Explorer pages
 export const EXPLORER_TX = '/txs/:hash';
+export const EXPLORER_ORACLE = '/oracles/:id';

 // Etherscan pages
 export const ETHERSCAN_ADDRESS = '/address/:hash';
@@ -120,6 +120,40 @@ describe('FillsTable', () => {
    expect(amountCell).toHaveClass('text-vega-pink');
  });

+  it('should format cells correctly for side unspecified', async () => {
+    const partyId = 'party-id';
+    const buyerFill = generateFill({
+      ...defaultFill,
+      seller: {
+        id: partyId,
+      },
+      aggressor: Schema.Side.SIDE_UNSPECIFIED,
+      sellerFee: {
+        makerFee: '1',
+        infrastructureFee: '1',
+        liquidityFee: '1',
+      },
+    });
+    render(<FillsTable partyId={partyId} rowData={[buyerFill]} />);
+
+    const cells = screen.getAllByRole('gridcell');
+    const expectedValues = [
+      buyerFill.market?.tradableInstrument.instrument.name || '',
+      '-3.00',
+      '1.00 BTC',
+      '3.00 BTC',
+      '-',
+      '0.03 BTC',
+      getDateTimeFormat().format(new Date(buyerFill.createdAt)),
+    ];
+    cells.forEach((cell, i) => {
+      expect(cell).toHaveTextContent(expectedValues[i]);
+    });
+
+    const amountCell = cells.find((c) => c.getAttribute('col-id') === 'size');
+    expect(amountCell).toHaveClass('text-vega-pink');
+  });
+
  it('should render correct maker or taker role', async () => {
    const partyId = 'party-id';
    const takerFill = generateFill({
@@ -190,7 +224,7 @@ describe('FillsTable', () => {
        makerFee: '1000',
        totalFee: '6000',
      };
-      expect(getFeesBreakdown('TAKER', fees)).toEqual(expectedBreakdown);
+      expect(getFeesBreakdown('Taker', fees)).toEqual(expectedBreakdown);
    });

    it('should return correct fees breakdown for a maker', () => {
@@ -205,7 +239,7 @@ describe('FillsTable', () => {
        makerFee: '-1000',
        totalFee: '4000',
      };
-      expect(getFeesBreakdown('MAKER', fees)).toEqual(expectedBreakdown);
+      expect(getFeesBreakdown('Maker', fees)).toEqual(expectedBreakdown);
    });
  });
 });
@@ -26,8 +26,10 @@ import BigNumber from 'bignumber.js';
 import type { Trade } from './fills-data-provider';
 import type { FillFieldsFragment } from './__generated__/Fills';

-const TAKER = 'TAKER';
-const MAKER = 'MAKER';
+const TAKER = 'Taker';
+const MAKER = 'Maker';
+
+export type Role = typeof TAKER | typeof MAKER | '-';

 export type Props = (AgGridReactProps | AgReactUiProps) & {
  partyId: string;
@@ -180,24 +182,10 @@ const formatTotal = ({
 };

 const formatRole = (partyId: string) => {
-  return ({ value, data }: VegaValueFormatterParams<Trade, 'aggressor'>) => {
-    const taker = t('Taker');
-    const maker = t('Maker');
-    if (data?.buyer.id === partyId) {
-      if (value === Schema.Side.SIDE_BUY) {
-        return taker;
-      } else {
-        return maker;
-      }
-    } else if (data?.seller.id === partyId) {
-      if (value === Schema.Side.SIDE_SELL) {
-        return taker;
-      } else {
-        return maker;
-      }
-    } else {
-      return '-';
-    }
+  return ({ data }: VegaValueFormatterParams<Trade, 'aggressor'>) => {
+    if (!data) return '-';
+    const { role } = getRoleAndFees({ data, partyId });
+    return role;
  };
 };

@@ -222,6 +210,15 @@ const formatFee = (partyId: string) => {
  };
 };

+export const isEmptyFeeObj = (feeObj: Schema.TradeFee) => {
+  if (!feeObj) return true;
+  return (
+    feeObj.liquidityFee === '0' &&
+    feeObj.makerFee === '0' &&
+    feeObj.infrastructureFee === '0'
+  );
+};
+
 export const getRoleAndFees = ({
  data,
  partyId,
@@ -232,14 +229,30 @@ export const getRoleAndFees = ({
  >;
  partyId?: string;
 }) => {
-  let role;
+  let role: Role;
  let feesObj;
  if (data?.buyer.id === partyId) {
-    role = data.aggressor === Schema.Side.SIDE_BUY ? TAKER : MAKER;
-    feesObj = role === TAKER ? data?.buyerFee : data.sellerFee;
+    if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = TAKER;
+      feesObj = data?.buyerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = MAKER;
+      feesObj = data?.sellerFee;
+    } else {
+      role = '-';
+      feesObj = !isEmptyFeeObj(data?.buyerFee) ? data.buyerFee : data.sellerFee;
+    }
  } else if (data?.seller.id === partyId) {
-    role = data.aggressor === Schema.Side.SIDE_SELL ? TAKER : MAKER;
-    feesObj = role === TAKER ? data?.sellerFee : data.buyerFee;
+    if (data.aggressor === Schema.Side.SIDE_SELL) {
+      role = TAKER;
+      feesObj = data?.sellerFee;
+    } else if (data.aggressor === Schema.Side.SIDE_BUY) {
+      role = MAKER;
+      feesObj = data?.buyerFee;
+    } else {
+      role = '-';
+      feesObj = !isEmptyFeeObj(data.sellerFee) ? data.sellerFee : data.buyerFee;
+    }
  } else {
    return { role: '-', feesObj: '-' };
  }
@@ -270,11 +283,6 @@ const FeesBreakdownTooltip = ({
      {role === MAKER && (
        <>
          <p className="mb-1">{t('The maker will receive the maker fee.')}</p>
-          <p className="mb-1">
-            {t(
-              'If the market is in monitoring auction the maker will pay half of the infrastructure and liquidity fees.'
-            )}
-          </p>
          <p className="mb-1">
            {t(
              'If the market is active the maker will pay zero infrastructure and liquidity fees.'
@@ -283,14 +291,14 @@ const FeesBreakdownTooltip = ({
        </>
      )}
      {role === TAKER && (
-        <>
-          <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
-          <p className="mb-1">
-            {t(
-              'If the market is in monitoring auction the taker will pay half of the infrastructure and liquidity fees.'
-            )}
-          </p>
-        </>
+        <p className="mb-1">{t('Fees to be paid by the taker.')}</p>
+      )}
+      {role === '-' && (
+        <p className="mb-1">
+          {t(
+            'If the market is in monitoring auction, half of the infrastructure and liquidity fees will be paid.'
+          )}
+        </p>
      )}
      <dl className="grid grid-cols-2 gap-x-1">
        <dt className="col-span-1">{t('Infrastructure fee')}</dt>
@@ -316,7 +324,7 @@ const FeesBreakdownTooltip = ({
 };

 export const getFeesBreakdown = (
-  role: string,
+  role: Role,
  feesObj: {
    __typename?: 'TradeFee' | undefined;
    makerFee: string;
@@ -328,6 +336,7 @@ export const getFeesBreakdown = (
    role === MAKER
      ? new BigNumber(feesObj.makerFee).times(-1).toString()
      : feesObj.makerFee;
+
  const infrastructureFee = feesObj.infrastructureFee;
  const liquidityFee = feesObj.liquidityFee;

@@ -78,7 +78,17 @@ export const generateFill = (override?: PartialDeep<Trade>) => {
            },
            quoteName: '',
            dataSourceSpecForTradingTermination: {
-              id: '',
+              __typename: 'DataSourceSpec',
+              id: 'oracleId',
+            },
+            dataSourceSpecForSettlementData: {
+              __typename: 'DataSourceSpec',
+              id: 'oracleId',
+            },
+            dataSourceSpecBinding: {
+              __typename: 'DataSourceSpecToFutureBinding',
+              tradingTerminationProperty: 'trading-termination-property',
+              settlementDataProperty: 'settlement-data-property',
            },
          },
        },
@@ -12,4 +12,5 @@ export default {
  },
  moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
  coverageDirectory: '../../coverage/libs/ledger',
+  setupFilesAfterEnv: ['./src/setup-tests.ts'],
 };
@@ -30,7 +30,10 @@ export type LedgerEntry = LedgerEntryFragment & {
 };

 export type AggregatedLedgerEntriesEdge = Schema.AggregatedLedgerEntriesEdge;
-export type AggregatedLedgerEntriesNode = AggregatedLedgerEntriesEdge & {
+export type AggregatedLedgerEntriesNode = Omit<
+  AggregatedLedgerEntriesEdge,
+  'node'
+> & {
  node: LedgerEntry;
 };

@@ -32,7 +32,7 @@ export const ledgerEntriesQuery = (
  return merge(defaultResult, override);
 };

-const ledgerEntries: LedgerEntryFragment[] = [
+export const ledgerEntries: LedgerEntryFragment[] = [
  {
    vegaTime: '1669224476734364000',
    quantity: '0',
@@ -180,7 +180,6 @@ const ledgerEntries: LedgerEntryFragment[] = [
    toAccountBalance: '0',
    fromAccountBalance: '0',
  },
-
  {
    vegaTime: '2022-11-24T12:41:22.054428Z',
    quantity: '1000000000',
@@ -0,0 +1,85 @@
+import { act, render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
+import { LedgerExportLink } from './ledger-export-link';
+import * as Types from '@vegaprotocol/types';
+import { ledgerEntries } from './ledger-entries.mock';
+import type { LedgerEntry } from './ledger-entries-data-provider';
+
+const VEGA_URL = 'https://vega-url.co.uk/querystuff';
+const mockEnvironment = jest.fn(() => VEGA_URL);
+jest.mock('@vegaprotocol/environment', () => ({
+  useEnvironment: jest.fn(() => mockEnvironment()),
+}));
+
+const asset = {
+  id: 'assetID',
+  name: 'assetName',
+  symbol: 'assetSymbol',
+  decimals: 1,
+  quantum: '1',
+  status: Types.AssetStatus,
+  source: {
+    __typename: 'ERC20',
+    contractAddress: 'contractAddres',
+    lifetimeLimit: 'lifetimeLimit',
+    withdrawThreshold: 'withdraw',
+  },
+};
+
+describe('LedgerExportLink', () => {
+  const partyId = 'partyId';
+  const entries = ledgerEntries.map((entry) => {
+    return {
+      ...entry,
+      asset: entry.assetId
+        ? {
+            ...asset,
+            id: entry.assetId,
+            name: `name ${entry.assetId}`,
+            symbol: `symbol ${entry.assetId}`,
+          }
+        : null,
+      marketSender: null,
+      marketReceiver: null,
+    } as LedgerEntry;
+  });
+
+  it('should be properly rendered', async () => {
+    render(<LedgerExportLink partyId={partyId} entries={entries} />);
+    await waitFor(() => {
+      expect(screen.getByRole('link')).toBeInTheDocument();
+      expect(screen.getByRole('link')).toHaveAttribute(
+        'href',
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=asset-id`
+      );
+      expect(
+        screen.getByRole('button', { name: /^symbol asset-id/ })
+      ).toBeInTheDocument();
+    });
+  });
+  it('should be properly change link url', async () => {
+    render(<LedgerExportLink partyId={partyId} entries={entries} />);
+    await waitFor(() => {
+      expect(
+        screen.getByRole('button', { name: /^symbol asset-id/ })
+      ).toBeInTheDocument();
+    });
+    act(() => {
+      userEvent.click(screen.getByRole('button', { name: /^symbol asset-id/ }));
+    });
+    await waitFor(() => {
+      expect(screen.getByRole('menu')).toBeInTheDocument();
+    });
+    act(() => {
+      userEvent.click(
+        screen.getByRole('menuitem', { name: /^symbol asset-id-2/ })
+      );
+    });
+    await waitFor(() => {
+      expect(screen.getByRole('link')).toHaveAttribute(
+        'href',
+        `https://vega-url.co.uk/api/v2/ledgerentry/export?partyId=${partyId}&assetId=asset-id-2`
+      );
+    });
+  });
+});
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthew Russell	5a73b7e769	feat(trading): add generic welcome message for non mainnet networks (#3584 )	2023-05-02 14:01:33 -07:00
dexturr	a4f41eabb6	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-02 18:09:46 +00:00
Matthew Russell	351a20abad	feat(trading,market-list): closed markets datagrid (#3429 )	2023-05-02 10:41:21 -07:00
Sam Keen	8d42481130	feat(governance): eth chain should not inhibit usage (#3568 )	2023-05-02 12:31:16 +00:00
dexturr	8a59722f09	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-02 12:08:21 +00:00
Sam Keen	de48ffa563	feat(governance): update market proposal only available for enacted markets (#3542 )	2023-05-02 10:10:03 +00:00
daro-maj	00c5252aea	test(trading): ac for 6501-ASSE-assets - e2e tests (#3570 )	2023-05-02 11:30:08 +02:00
dexturr	9acc083c11	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-02 06:09:38 +00:00
dexturr	77264e80f1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-02 00:15:50 +00:00
dexturr	50378bc8d2	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-01 18:07:37 +00:00
dexturr	b88da51c68	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-01 12:08:18 +00:00
dexturr	2ae56bb113	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-01 06:07:17 +00:00
dexturr	752af9a983	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-05-01 00:17:06 +00:00
dexturr	a01df081eb	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-30 18:07:29 +00:00
dexturr	c2d14d1abe	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-30 12:10:07 +00:00
dexturr	a76ff44ffd	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-30 06:09:37 +00:00
dexturr	ac2e262bf3	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-30 00:16:34 +00:00
dexturr	ab180875b1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-29 18:07:34 +00:00
dexturr	66d3e89b9e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-29 12:09:56 +00:00
dexturr	c9cce87606	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-29 06:08:49 +00:00
dexturr	50232ab089	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-29 00:16:25 +00:00
dexturr	e86fb6d0b4	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-28 18:08:10 +00:00
Sam Keen	473ef3ae83	feat(governance): default font Alpha (#3543 )	2023-04-28 17:08:36 +00:00
Edd	77ab719b37	fix(explorer): fix asset links and deterministic order details (#3567 )	2023-04-28 16:00:49 +00:00
Edd	a10f67d7ab	feat(explorer): add epoch to block explorer homepage (#3536 )	2023-04-28 13:08:42 +00:00
dexturr	66d2b83513	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-28 12:09:23 +00:00
dexturr	e4fd040933	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-28 06:08:57 +00:00
dexturr	30c1dbd019	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-28 00:14:44 +00:00
daro-majandm.ray	5e558c4cd3	test(trading): 7001-COLL-collateral - e2e tests (#3561 ) Co-authored-by: m.ray <16125548+MadalinaRaicu@users.noreply.github.com>	2023-04-27 21:28:25 +02:00
dexturr	85060a0421	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-27 18:10:05 +00:00
Sam Keen	b336291b49	fix(governance): use default jsonrpc connector when the provider from useWe… (#3563 )	2023-04-27 16:26:00 +00:00
Joe Tsang	0f7bffd38b	test(ci): capsule update v0.71.1 (#3559 )	2023-04-27 14:37:55 +01:00
dexturr	3665375b75	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-27 12:09:22 +00:00
m.ray	8572c0a570	feat(trading): data grid dropdown menu in collateral table and vega icons (#3472 )	2023-04-27 09:21:05 +00:00
Maciek	6a29dc82ef	feat(ledger): add link for download ledger entries to .csv (#3454 )	2023-04-27 08:53:28 +00:00
Bartłomiej Głownia	c19bcc5e0c	feat(trading): add oracle banner e2e tests (#3524 )	2023-04-27 09:47:18 +01:00
Maciek	6593bbf37b	feat(trading): settings page quick adjust a css (#3558 )	2023-04-27 07:38:57 +00:00
dexturr	1e5e57b978	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-27 06:10:10 +00:00
dexturr	5394b00349	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-27 00:16:39 +00:00
dexturr	32f5eaade5	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-26 18:07:54 +00:00
Maciek	b7a440132d	feat(trading): make Sentry only after opt in (#3448 )	2023-04-26 15:17:23 +00:00
m.ray	d6ecdf80fa	fix(fills): handle side_unspecified added for the aggresor (#3550 )	2023-04-26 13:34:56 +00:00
dexturr	21e545d941	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-04-26 12:09:35 +00:00
Sam Keen	ef5fa7cba6	feat(governance): ensure the data node urls in the monorepo are valid (#3549 )	2023-04-26 11:10:40 +00:00
Mikołaj Młodzikowski	d1f465e2af	Update Jenkinsfile	2023-04-26 12:54:34 +02:00
Mikołaj MłodzikowskiandMikołaj Młodzikowski	2740df48a3	fix(ci): urls in comments (#3539 ) Co-authored-by: Mikołaj Młodzikowski <mikolaj.mlodzikowski@github.com>	2023-04-26 12:45:02 +02:00