test: reverted assertion

test: trigger failure for governance
test: reverted changes
2023-04-22 08:42:51 +02:00 · 2023-04-21 22:08:01 +02:00 · 2023-04-21 21:24:37 +02:00 · 2023-04-21 20:57:56 +02:00 · 2023-04-21 19:31:40 +02:00
250 changed files with 1306 additions and 5982 deletions
@@ -50,7 +50,7 @@ jobs:
    secrets: inherit

  lint-test-build:
-    timeout-minutes: 60
+    timeout-minutes: 35
    needs: node-modules
    runs-on: ubuntu-22.04
    name: '(CI) lint + unit test + build'
@@ -105,44 +105,19 @@ 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=""
-          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
+          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
          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
@@ -165,9 +140,7 @@ jobs:

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

-      - name: Create comment
-        uses: peter-evans/create-or-update-comment@v3
+      - 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
        with:
          issue-number: ${{ github.event.pull_request.number }}
          body: |
-            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 }}
+            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

  cypress-check:
    name: '(CI) cypress - check'
@@ -1,2 +1,20 @@
@Library('vega-shared-library') _
-runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
+
+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'
+      }
+    }
+  }
+}
@@ -72,7 +72,7 @@ Run `nx serve my-app` for a dev server. Navigate to the port specified in `app/<
 In order to generate the schemas for your GraphQL queries, you can run `GRAPHQL_SCHEMA_PATH=[YOUR SCHEMA FILE / API URL HERE] nx run types:generate`.

 ```bash
-export  GRAPHQL_SCHEMA_PATH=https://api.n07.testnet.vega.xyz/graphql
+export  GRAPHQL_SCHEMA_PATH=https://api.n11.testnet.vega.xyz/graphql
 yarn nx run types:generate
 ```

@@ -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:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 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:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest

@@ -25,7 +25,7 @@ module.exports = defineConfig({
  },
  env: {
    environment: 'CUSTOM',
-    networkQueryUrl: 'http://localhost:3008/graphql',
+    networkQueryUrl: 'http://localhost:3028/query',
    ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
    commitHash: 'dev',
    tsConfig: 'tsconfig.json',
@@ -9,22 +9,21 @@ context('Home Page', function () {
    it('should show connected environment stats', function () {
      const statTitles = {
        0: 'Status',
-        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',
+        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',
      };

      cy.get('[data-testid="stats-title"]')
@@ -32,13 +31,42 @@ context('Home Page', function () {
          cy.wrap($list).should('contain.text', statTitles[index]);
        })
        .then(($list) => {
-          cy.wrap($list).should('have.length', 17);
+          cy.wrap($list).should('have.length', 16);
        });
+
+      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(2)
+        .eq(1)
        .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:3008/graphql'],
+      hosts: ['http://localhost:3028/query'],
    }).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:3008/graphql`,
+        url: `http://localhost:3028/query`,
        body: {
          query: mutation,
        },
@@ -4,7 +4,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
@@ -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}
@@ -14,6 +14,7 @@ import {
  SettlementAssetInfoPanel,
 } from '@vegaprotocol/market-info';
 import { MarketInfoTable } from '@vegaprotocol/market-info';
+import { Link } from 'react-router-dom';

 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  if (!market) return null;
@@ -96,19 +97,22 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
      ),
    },
    {
-      title: t('Settlement Oracle'),
+      title: t('Oracle'),
      content: (
-        <OracleInfoPanel
-          noBorder={false}
-          market={market}
-          type="settlementData"
-        />
-      ),
-    },
-    {
-      title: t('Termination Oracle'),
-      content: (
-        <OracleInfoPanel noBorder={false} market={market} type="termination" />
+        <OracleInfoPanel noBorder={false} market={market}>
+          <Link
+            className="text-xs hover:underline"
+            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id}`}
+          >
+            {t('View settlement data oracle specification')}
+          </Link>
+          <Link
+            className="text-xs hover:underline"
+            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForTradingTermination.id}`}
+          >
+            {t('View termination oracle specification')}
+          </Link>
+        </OracleInfoPanel>
      ),
    },
  ];
@@ -3,7 +3,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueGetterParams,
@@ -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 | null;
+  version?: number;
 }

 export const wrapperClasses =
@@ -28,7 +28,7 @@ export const wrapperClasses =
 */
 const DeterministicOrderDetails = ({
  id,
-  version = null,
+  version = 0,
 }: DeterministicOrderDetailsProps) => {
  const { data, error } = useExplorerDeterministicOrderQuery({
    variables: { orderId: id, version },
@@ -3,7 +3,7 @@ import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
@@ -71,7 +71,7 @@ export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
                />
              </td>
              <td className="text-md">
-                <AssetLink assetId={account.asset.id} asDialog={true} />
+                <AssetLink assetId={account.asset.id} />
              </td>
            </TableRow>
          );
@@ -1,7 +1,3 @@
-@import 'ag-grid-community/dist/styles/ag-grid.css';
-@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
-@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
-
 /* You can add global styles to this file, and also import other style files */
@tailwind base;
@tailwind components;
@@ -15,43 +11,3 @@
 .react-markdown-container a:before {
  content: '🔗 ';
 }
-
-/* AG GRID - Do not edit without updating other global stylesheets for each app */
-
-.vega-ag-grid .ag-root-wrapper {
-  border: solid 0px;
-}
-
-.vega-ag-grid .ag-react-container {
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.vega-ag-grid .ag-cell,
-.vega-ag-grid .ag-full-width-row .ag-cell-wrapper.ag-row-group {
-  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
-}
-
-/* Light variables */
-.ag-theme-balham {
-  --ag-background-color: theme(colors.white);
-  --ag-border-color: theme(colors.neutral[300]);
-  --ag-header-background-color: theme(colors.white);
-  --ag-odd-row-background-color: theme(colors.white);
-  --ag-header-column-separator-color: theme(colors.neutral[300]);
-  --ag-row-border-color: theme(colors.white);
-  --ag-row-hover-color: theme(colors.neutral[100]);
-  --ag-font-size: 12px;
-}
-
-/* Dark variables */
-.ag-theme-balham-dark {
-  --ag-background-color: theme(colors.black);
-  --ag-border-color: theme(colors.neutral[700]);
-  --ag-header-background-color: theme(colors.black);
-  --ag-odd-row-background-color: theme(colors.black);
-  --ag-header-column-separator-color: theme(colors.neutral[600]);
-  --ag-row-border-color: theme(colors.black);
-  --ag-row-hover-color: theme(colors.neutral[800]);
-  --ag-font-size: 12px;
-}
@@ -5,7 +5,7 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS={}

-NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 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:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
 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,5 +31,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_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -50,8 +50,6 @@ 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 };

@@ -266,7 +264,7 @@ context(
    it('Unable to submit update market proposal without minimum amount of tokens', function () {
      vegaWalletTeardown();
      vegaWalletFaucetAssetsWithoutCheck(
-        fUSDCId,
+        'fUSDC',
        '1000000',
        vegaWalletPublicKey
      );
@@ -292,7 +290,7 @@ context(
    // 3001-VOTE-092 3004-PMAC-001
    it('Able to submit update market proposal and vote for proposal', function () {
      vegaWalletFaucetAssetsWithoutCheck(
-        fUSDCId,
+        'fUSDC',
        '1000000',
        vegaWalletPublicKey
      );
@@ -55,6 +55,7 @@ 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
@@ -66,7 +67,6 @@ 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:3008/graphql');
+            .should('have.text', 'http://localhost:3028/query');
          cy.getByTestId('link').should('exist');
        });
    });
@@ -17,15 +17,10 @@ const banner = 'view-banner';

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

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

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

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

              cy.get(vegaWalletCurrencyTitle)
-                .contains(name)
+                .contains(id)
                .parent()
-                .contains(symbol);
+                .contains(name);
            });
          });
        }
@@ -54,7 +54,6 @@ 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', txTimeout).should('be.visible');
  closeDialog();
 }

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

 export function closeStakingDialog() {
-  cy.getByTestId('dialog-title').should(
+  cy.get('[data-testid="dialog-title"]:visible').should(
    'contain.text',
    'At the beginning of the next epoch'
  );
-  cy.getByTestId('dialog-content')
-    .last()
+  cy.get('[data-testid="dialog-content"]:visible')
+    .first()
    .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"]';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -105,24 +105,25 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      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, {
+      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', {
                timeout: transactionTimeout,
-              }).should('not.have.text', $walletAmount);
-            });
-        }
-      );
+              })
+              .should('not.eq', $associatedAmount);
+          });
+      });
    }
  });
 }
@@ -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:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 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
@@ -1,7 +1,7 @@
 # App configuration variables
 NX_VEGA_ENV=TESTNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n08.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -3,7 +3,7 @@ import './i18n';
 import React, { useEffect } from 'react';
 import * as Sentry from '@sentry/react';
 import { Integrations } from '@sentry/tracing';
-import { BrowserRouter as Router, useLocation } from 'react-router-dom';
+import { BrowserRouter as Router } from 'react-router-dom';
 import { AppLoader } from './app-loader';
 import { NetworkInfo } from '@vegaprotocol/network-info';
 import { BalanceManager } from './components/balance-manager';
@@ -149,20 +149,6 @@ const Web3Container = ({
  );
 };

-const ScrollToTop = () => {
-  const { pathname } = useLocation();
-
-  useEffect(() => {
-    // "document.documentElement.scrollTo" is the magic for React Router Dom v6
-    document.documentElement.scrollTo({
-      top: 0,
-      left: 0,
-    });
-  }, [pathname]);
-
-  return null;
-};
-
 const AppContainer = () => {
  const { config, loading, error } = useEthereumConfig();
  const { VEGA_ENV, GIT_COMMIT_HASH, GIT_BRANCH, ETHEREUM_PROVIDER_URL } =
@@ -197,7 +183,6 @@ const AppContainer = () => {

  return (
    <Router>
-      <ScrollToTop />
      <AppStateProvider>
        <div className="grid min-h-full text-white">
          <AsyncRenderer<EthereumConfig | null>
@@ -1,39 +0,0 @@
-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();
-  });
-});
@@ -1,33 +0,0 @@
-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>
-  );
-};
@@ -1 +0,0 @@
-export * from './disconnected-notice';
@@ -3,7 +3,6 @@ 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,
@@ -27,8 +26,7 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
-import { useEthereumConfig, useWeb3Disconnect } from '@vegaprotocol/web3';
-import { getChainName } from '@vegaprotocol/web3';
+import { useWeb3Disconnect } from '@vegaprotocol/web3';

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

 export const EthWallet = () => {
  const { t } = useTranslation();
-  const { appDispatch, appState } = useAppState();
+  const { appDispatch } = 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',
-    'font-alpha lg:text-body-large',
+    '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,12 +1,13 @@
 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, useState } from 'react';
+import { useCallback, useEffect } from 'react';
 import {
  AppStateActionType,
  useAppState,
@@ -35,7 +36,9 @@ export function Web3Connector({
  const appChainId = Number(chainId);
  return (
    <>
-      <Web3Content appChainId={appChainId}>{children}</Web3Content>
+      <Web3Content appChainId={appChainId} setDialogOpen={setDialogOpen}>
+        {children}
+      </Web3Content>
      <Web3ConnectDialog
        connectors={connectors}
        dialogOpen={appState.ethConnectOverlay}
@@ -49,59 +52,23 @@ 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 doesn't handle connectEagerly being called when connector is also in the
+    // wallet connect doesnt 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>
@@ -113,5 +80,18 @@ 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,11 +43,6 @@ 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 {
@@ -63,7 +58,6 @@ export enum AppStateActionType {
  SET_ASSOCIATION_BREAKDOWN,
  SET_TRANSACTION_OVERLAY,
  SET_BANNER_MESSAGE,
-  SET_DISCONNECT_NOTICE,
 }

 export type AppStateAction =
@@ -96,10 +90,6 @@ 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 type { AppState, AppStateAction } from './app-state-context';
 import { AppStateActionType, AppStateContext } from './app-state-context';
+import type { AppState, AppStateAction } from './app-state-context';

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

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

@@ -14,17 +14,13 @@ 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';
+import { ENV } from '../../config/env';

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

        if (
          account &&
@@ -92,14 +84,7 @@ 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,
-    activeChainId,
-    account,
-    config,
-    VEGA_ENV,
-    ETHEREUM_PROVIDER_URL,
-  ]);
+  }, [activeProvider, account, config, VEGA_ENV, ETHEREUM_PROVIDER_URL]);

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

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

 jest.mock('../../../contexts/app-state/app-state-context', () => ({
@@ -9,9 +9,6 @@ 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 } }, proposal?: { __typename?: 'Proposal', state: Types.ProposalState } | null } }> } | 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 } } } }> } | null };


 export const ProposalMarketsQueryDocument = gql`
@@ -21,9 +21,6 @@ export const ProposalMarketsQueryDocument = gql`
            code
          }
        }
-        proposal {
-          state
-        }
      }
    }
  }
@@ -0,0 +1,94 @@
+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,16 +1,15 @@
 import type { MockedResponse } from '@apollo/client/testing';
 import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter as Router } from 'react-router-dom';
-import { fireEvent, render, screen, waitFor } from '@testing-library/react';
+import { render, screen, fireEvent, 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 { ProposalState } from '@vegaprotocol/types';
+import type { ProposalMarketsQueryQuery } from './__generated___/UpdateMarket';
+import { ProposalMarketsQueryDocument } from './__generated___/UpdateMarket';

 const updateMarketNetworkParamsQueryMock: MockedResponse<NetworkParamsQuery> = {
  request: {
@@ -90,10 +89,6 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                  code: 'ETHiUSDT',
                },
              },
-              proposal: {
-                __typename: 'Proposal',
-                state: ProposalState.STATE_ENACTED,
-              },
            },
          },
          {
@@ -106,16 +101,11 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                instrument: {
                  __typename: 'Instrument',
                  name: 'Las Vegas nuggets',
-                  code: 'Nuggets',
+                  code: 'Nuggets2',
                },
              },
-              proposal: {
-                __typename: 'Proposal',
-                state: ProposalState.STATE_OPEN,
-              },
            },
          },
-
          {
            __typename: 'MarketEdge',
            node: {
@@ -125,14 +115,10 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                __typename: 'TradableInstrument',
                instrument: {
                  __typename: 'Instrument',
-                  name: 'California Nuggets',
-                  code: 'Nuggets2',
+                  name: 'Nuggets',
+                  code: 'Nuggets',
                },
              },
-              proposal: {
-                __typename: 'Proposal',
-                state: ProposalState.STATE_WAITING_FOR_NODE_VOTE,
-              },
            },
          },
          {
@@ -144,71 +130,10 @@ const marketQueryMock: MockedResponse<ProposalMarketsQueryQuery> = {
                __typename: 'TradableInstrument',
                instrument: {
                  __typename: 'Instrument',
-                  name: 'Nevada Nuggets',
-                  code: 'Nugetts3',
+                  name: 'CELUSD (June 2022)',
+                  code: 'CELUSD',
                },
              },
-              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,
-              },
            },
          },
        ],
@@ -274,27 +199,6 @@ 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,28 +2,25 @@ 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,
-  ProposalUserAction,
-} from '../../components/shared';
+import { ProposalMinRequirements } from '../../components/shared';
 import {
  AsyncRenderer,
  ExternalLink,
@@ -34,9 +31,9 @@ import {
  Select,
 } from '@vegaprotocol/ui-toolkit';
 import { Heading } from '../../../../components/heading';
-import { useProposalMarketsQueryQuery } from './__generated__/UpdateMarket';
+import { ProposalUserAction } from '../../components/shared';
+import { useProposalMarketsQueryQuery } from './__generated___/UpdateMarket';
 import { downloadJson } from '../../../../lib/download-json';
-import { ProposalState } from '@vegaprotocol/types';

 export interface UpdateMarketProposalFormFields {
  proposalVoteDeadline: string;
@@ -76,9 +73,6 @@ 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;
@@ -6,7 +6,6 @@ import { usePreviousEpochQuery } from '../__generated__/PreviousEpoch';
 import { ValidatorTables } from './validator-tables';
 import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { ENV } from '../../../config';

 export const EpochData = () => {
  // errorPolicy due to vegaprotocol/vega issue 5898
@@ -15,23 +14,11 @@ export const EpochData = () => {
    data: nodesData,
    error: nodesError,
    loading: nodesLoading,
-    refetch: nodesRefetch,
+    refetch,
  } = useNodesQuery();
-
-  const { delegationsPagination } = ENV;
-  const {
-    data: userStakingData,
-    error: userStakingError,
-    loading: userStakingLoading,
-    refetch: userStakingRefetch,
-  } = useStakingQuery({
+  const { data: userStakingData } = useStakingQuery({
    variables: {
      partyId: pubKey || '',
-      delegationsPagination: delegationsPagination
-        ? {
-            first: Number(delegationsPagination),
-          }
-        : undefined,
    },
  });
  const { data: previousEpochData } = usePreviousEpochQuery({
@@ -41,17 +28,10 @@ export const EpochData = () => {
    skip: !nodesData?.epoch.id,
  });

-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, () => {
-    nodesRefetch();
-    userStakingRefetch();
-  });
+  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, refetch);

  return (
-    <AsyncRenderer
-      loading={nodesLoading || userStakingLoading}
-      error={nodesError || userStakingError}
-      data={nodesData}
-    >
+    <AsyncRenderer loading={nodesLoading} error={nodesError} data={nodesData}>
      {nodesData?.epoch &&
        nodesData.epoch.timestamps.start &&
        nodesData?.epoch.timestamps.expiry && (
@@ -3,7 +3,7 @@ import { forwardRef, useMemo, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
 import { Button, Icon } from '@vegaprotocol/ui-toolkit';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -17,6 +17,7 @@ import {
 } from '../../shared';
 import {
  defaultColDef,
+  NODE_LIST_GRID_STYLES,
  PendingStakeRenderer,
  stakedTotalPercentage,
  StakeShareRenderer,
@@ -210,7 +211,7 @@ export const ConsensusValidatorsTable = ({
              : undefined,
            [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? formatNumberPercentage(new BigNumber(userStakeShare))
+              ? stakedTotalPercentage(userStakeShare)
              : undefined,
          };
        }
@@ -381,14 +382,12 @@ export const ConsensusValidatorsTable = ({
    );

    return (
-      <div
-        data-testid="consensus-validators-table"
-        className="validators-table"
-      >
+      <div data-testid="consensus-validators-table">
        {nodes.length > 0 && (
          <AgGrid
            domLayout="autoHeight"
            style={{ width: '100%' }}
+            customThemeParams={NODE_LIST_GRID_STYLES}
            getRowHeight={(params: RowHeightParams) => getRowHeight(params)}
            defaultColDef={defaultColDef}
            tooltipShowDelay={0}
@@ -59,9 +59,9 @@ export const addUserDataToValidator = (
      : undefined,
    [ValidatorFields.USER_STAKE_SHARE]:
      currentEpochUserStaking && Number(currentEpochUserStaking.amount) > 0
-        ? new BigNumber(currentEpochUserStaking.amount)
-            .dividedBy(new BigNumber(currentUserStakeAvailable))
-            .times(100)
+        ? new BigNumber(currentEpochUserStaking.amount).dividedBy(
+            new BigNumber(currentUserStakeAvailable)
+          )
        : undefined,
  };
 };
@@ -79,6 +79,17 @@ export interface ValidatorsTableProps {
  validatorsView: ValidatorsView;
 }

+// Custom styling to account for the scrollbar. This is needed because the
+// AG Grid places the scrollbar over the bottom validator, which obstructs
+export const NODE_LIST_GRID_STYLES = `
+  .ag-theme-balham-dark .ag-body-horizontal-scroll {
+    opacity: 0.75;
+  }
+  .ag-theme-balham-dark *:hover {
+    cursor: pointer;
+  }
+`;
+
 export const stakedTotalPercentage = (stakeScore: string) =>
  formatNumberPercentage(toBigNum(stakeScore, 0).times(100), 2);

@@ -1,7 +1,7 @@
 import { forwardRef, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -13,6 +13,7 @@ import {
 } from '../../shared';
 import {
  defaultColDef,
+  NODE_LIST_GRID_STYLES,
  StakeNeededForPromotionRenderer,
  stakedTotalPercentage,
  ValidatorFields,
@@ -25,11 +26,7 @@ import {
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
 import type { ValidatorsTableProps } from './shared';
-import {
-  formatNumber,
-  formatNumberPercentage,
-  toBigNum,
-} from '@vegaprotocol/utils';
+import { formatNumber, toBigNum } from '@vegaprotocol/utils';

 interface StandbyPendingValidatorsTableProps extends ValidatorsTableProps {
  stakeNeededForPromotion: string | undefined;
@@ -166,7 +163,7 @@ export const StandbyPendingValidatorsTable = ({
              : undefined,
            [ValidatorFields.PENDING_USER_STAKE]: pendingUserStake,
            [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
-              ? formatNumberPercentage(new BigNumber(userStakeShare))
+              ? stakedTotalPercentage(userStakeShare)
              : undefined,
          };
        }
@@ -247,13 +244,11 @@ export const StandbyPendingValidatorsTable = ({
    );

    return (
-      <div
-        data-testid="standby-pending-validators-table"
-        className="validators-table"
-      >
+      <div data-testid="standby-pending-validators-table">
        <AgGrid
          domLayout="autoHeight"
          style={{ width: '100%' }}
+          customThemeParams={NODE_LIST_GRID_STYLES}
          rowHeight={68}
          defaultColDef={defaultColDef}
          tooltipShowDelay={0}
@@ -1,7 +1,3 @@
-@import 'ag-grid-community/dist/styles/ag-grid.css';
-@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
-@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
-
@tailwind base;
@tailwind components;
@tailwind utilities;
@@ -23,43 +19,3 @@
    @apply border-vega-dark-200;
  }
 }
-
-/* AG GRID - Do not edit without updating other global stylesheets for each app */
-
-.vega-ag-grid .ag-root-wrapper {
-  border: solid 0px;
-}
-
-.vega-ag-grid .ag-react-container {
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.vega-ag-grid .ag-cell,
-.vega-ag-grid .ag-full-width-row .ag-cell-wrapper.ag-row-group {
-  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
-}
-
-/* Light variables */
-.ag-theme-balham {
-  --ag-background-color: theme(colors.white);
-  --ag-border-color: theme(colors.neutral[300]);
-  --ag-header-background-color: theme(colors.white);
-  --ag-odd-row-background-color: theme(colors.white);
-  --ag-header-column-separator-color: theme(colors.neutral[300]);
-  --ag-row-border-color: theme(colors.white);
-  --ag-row-hover-color: theme(colors.neutral[100]);
-  --ag-font-size: 12px;
-}
-
-/* Dark variables */
-.ag-theme-balham-dark {
-  --ag-background-color: theme(colors.black);
-  --ag-border-color: theme(colors.neutral[700]);
-  --ag-header-background-color: theme(colors.black);
-  --ag-odd-row-background-color: theme(colors.black);
-  --ag-header-column-separator-color: theme(colors.neutral[600]);
-  --ag-row-border-color: theme(colors.black);
-  --ag-row-hover-color: theme(colors.neutral[800]);
-  --ag-font-size: 12px;
-}
@@ -19,7 +19,7 @@ NX_DEPLOY_URL=$DEPLOY_URL
 NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV = 'TESTNET'
-NX_VEGA_URL="https://api.n07.testnet.vega.xyz/graphql"
+NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -1,3 +1,3 @@
 # App configuration variables
-NX_VEGA_URL=http://localhost:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=LOCAL
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\"}
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
@@ -1,5 +1,5 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://multisig-signer.fairground.wtf","MAINNET":"https://multisig-signer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET
@@ -1,3 +1,17 @@
 {
-  "hosts": ["https://vega.xprv.io/datanode/query"]
+  "hosts": [
+    "https://vega-data-graphql.chorus.one/query",
+    "https://vega.xprv.io/datanode/query",
+    "http://nala.mainnet.vega.community:3008/query",
+    "http://commodum.mainnet.vega.community:3008/query",
+    "http://lovali.mainnet.vega.community:3008/query",
+    "http://b-harvest.mainnet.vega.community:3008/query",
+    "http://staking-facilities.mainnet.vega.community:3008/query",
+    "http://figment.mainnet.vega.community:3008/query",
+    "http://nodes-guru.mainnet.vega.community:3008/query",
+    "http://p2p.mainnet.vega.community:3008/query",
+    "http://rockaway.mainnet.vega.community:3008/query",
+    "http://greenfield-one.mainnet.vega.community:3008/query",
+    "http://ryabina.mainnet.vega.community:3008/query"
+  ]
 }
@@ -1,7 +1,11 @@
 {
  "hosts": [
-    "https://api-n00.testnet.vega.rocks/graphql",
    "https://api-n06.testnet.vega.rocks/graphql",
-    "https://api-n07.testnet.vega.rocks/graphql"
+    "https://api-n07.testnet.vega.rocks/graphql",
+    "https://api-n08.testnet.vega.rocks/graphql",
+    "https://api-n09.testnet.vega.rocks/graphql",
+    "https://api-n10.testnet.vega.rocks/graphql",
+    "https://api-n11.testnet.vega.rocks/graphql",
+    "https://api-n12.testnet.vega.rocks/graphql"
  ]
 }
@@ -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:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 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:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
 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:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 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:3008/graphql
+CYPRESS_VEGA_URL=http://localhost:3028/query
 CYPRESS_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -1,375 +0,0 @@
-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('/#/markets/market-1');
+    cy.visit('/');
    cy.wait('@MarketsCandles');
    cy.getByTestId('dialog-close').click();
  });
@@ -112,6 +112,7 @@ 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-0');
+      cy.url().should('eq', Cypress.config().baseUrl + '/#/markets/market-1');
    });
  });

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

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

  before(() => {
-    cy.mockTradingPage(
-      MarketState.STATE_ACTIVE,
-      undefined,
-      undefined,
-      'COMPROMISED'
-    );
+    cy.mockTradingPage();
    cy.mockSubscription();
    cy.visit('/#/markets/market-0');
    cy.wait('@Markets');
@@ -26,11 +20,6 @@ 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%');
@@ -180,21 +169,25 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
  it('oracle displayed', () => {
    cy.getByTestId(marketTitle).contains('Oracle').click();

+    validateMarketDataRow(0, 'Settlement Data Property', 'prices.BTC.value');
+    validateMarketDataRow(
+      1,
+      'Trading Termination Property',
+      'termination.BTC.value'
+    );
+
+    // check that links to github for oracle proofs are shown
    cy.getByTestId(accordionContent)
-      .getByTestId('provider-name')
-      .and('contain', 'Another oracle');
+      .getByTestId('oracle-proof-links')
+      .find(`[data-testid="${externalLink}"]`)
+      .should('have.attr', 'href')
+      .and('contain', 'https://github.com/vegaprotocol/well-known');

    cy.getByTestId(accordionContent)
-      .getByTestId('signed-proofs')
-      .and('contain', '1');
-
-    cy.getByTestId(accordionContent)
-      .getByTestId('verified-proofs')
-      .and('contain', '1');
-
-    cy.getByTestId(accordionContent)
-      .getByTestId('signed-proofs')
-      .and('contain', '1');
+      .getByTestId('oracle-spec-links')
+      .find(`[data-testid="${externalLink}"]`)
+      .should('have.attr', 'href')
+      .and('contain', '/oracles');
  });

  it('proposal displayed', () => {
@@ -222,7 +222,6 @@ 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:contains(Resources)';
+      const resourceSelector = 'ul li:last-child';
      ['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="Settings"]')
+          .find('[data-testid="theme-switcher"]')
          .should('be.visible');
        cy.getByTestId('button-menu-drawer').click();
        cy.getByTestId('menu-drawer').should('not.be.visible');
@@ -1,45 +0,0 @@
-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,25 +1,17 @@
 import { checkSorting } from '@vegaprotocol/cypress';

-const dialogClose = 'dialog-close';
-
 describe('accounts', { tags: '@smoke' }, () => {
-  beforeEach(() => {
+  before(() => {
+    cy.clearAllLocalStorage();
    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();

@@ -30,115 +22,31 @@ describe('accounts', { tags: '@smoke' }, () => {
      .find('[col-id="asset.symbol"]')
      .should('have.text', 'AST0');

-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .find('[col-id="used"]')
-      .should('have.text', '1.010.00%');
-
-    cy.getByTestId('tab-accounts')
-      .get(tradingAccountRowId)
-      .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', ' ');
+      .should('have.text', 'DepositWithdraw');
+
+    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');

    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$="_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();
+    cy.get('[data-testid="dialog-content"]:visible').should('exist');
+    cy.get('[data-testid="dialog-close"]:visible').click();
  });

  describe('sorting by ag-grid columns should work well', () => {
@@ -88,18 +88,5 @@ 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');
-        });
-    });
  });
 });
@@ -1,18 +1,7 @@
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { fillsQuery } from '@vegaprotocol/mock';

-const tabFills = 'tab-fills';
-
 describe('fills', { tags: '@regression' }, () => {
-  // 7005-FILL-001
-  // 7005-FILL-002
-  // 7005-FILL-003
-  // 7005-FILL-004
-  // 7005-FILL-005
-  // 7005-FILL-006
-  // 7005-FILL-007
-  // 7005-FILL-008
-
  beforeEach(() => {
    // Ensure page loads with correct key
    cy.window().then((window) => {
@@ -49,37 +38,31 @@ describe('fills', { tags: '@regression' }, () => {
  });

  function validateFillsDisplayed() {
-    cy.getByTestId(tabFills).should('be.visible');
-    cy.getByTestId(tabFills).contains('Market');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills').should('be.visible');
+
+    cy.getByTestId('tab-fills')
      .get(
        '[role="gridcell"][col-id="market.tradableInstrument.instrument.name"]'
      )
      .each(($marketSymbol) => {
        cy.wrap($marketSymbol).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId(tabFills).contains('Size');
-    cy.get(`[col-id='size']`).eq(1).should('contain.text', '+');
-    cy.get(`[col-id='size']`).eq(2).should('contain.text', '-');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
      .get('[role="gridcell"][col-id="size"]')
      .each(($amount) => {
        cy.wrap($amount).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId(tabFills).contains('Price');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
      .get('[role="gridcell"][col-id="price"]')
      .each(($prices) => {
        cy.wrap($prices).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId(tabFills).contains('Notional');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
      .get('[role="gridcell"][col-id="price_1"]')
      .each(($total) => {
        cy.wrap($total).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId(tabFills).contains('Role');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
      .get('[role="gridcell"][col-id="aggressor"]')
      .each(($role) => {
        cy.wrap($role)
@@ -89,15 +72,13 @@ describe('fills', { tags: '@regression' }, () => {
            expect(roles.indexOf(text.trim())).to.be.greaterThan(-1);
          });
      });
-    cy.getByTestId(tabFills).contains('Fee');
-    cy.getByTestId(tabFills)
+    cy.getByTestId('tab-fills')
      .get(
        '[role="gridcell"][col-id="market.tradableInstrument.instrument.product"]'
      )
      .each(($fees) => {
        cy.wrap($fees).invoke('text').should('not.be.empty');
      });
-    cy.getByTestId(tabFills).contains('Date');
    const dateTimeRegex =
      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
    cy.get('[col-id="createdAt"]').each(($tradeDateTime, index) => {
@@ -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-013
+    // 7003-MORD-016
    updateOrder({
      id: orderId,
      status: Schema.OrderStatus.STATUS_ACTIVE,
@@ -9,8 +9,3 @@ 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,7 +26,6 @@ export function updateOrder(
  override?: PartialDeep<OrderUpdateFieldsFragment>
 ): void {
  const update: OrdersUpdateSubscription = orderUpdateSubscription({
-    // @ts-ignore partial deep check failing
    orders: [override],
  });
  if (!sendOrderUpdate) {
@@ -1,7 +1,6 @@
 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,
@@ -46,9 +45,7 @@ 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,
          },
@@ -65,7 +62,6 @@ const marketsDataOverride = (
    edges: [
      {
        node: {
-          // @ts-ignore conflict between incoming and outgoing types
          tradingMode: data.tradingMode,
          state: data.state,
        },
@@ -159,6 +155,7 @@ const mockTradingPage = (
  aliasGQLQuery(req, 'ProposalsList', proposalListQuery());
  aliasGQLQuery(req, 'Deposits', depositsQuery());
 };
+
 declare global {
  // eslint-disable-next-line @typescript-eslint/no-namespace
  namespace Cypress {
@@ -167,56 +164,50 @@ declare global {
      mockTradingPage(
        state?: Schema.MarketState,
        tradingMode?: Schema.MarketTradingMode,
-        trigger?: Schema.AuctionTrigger,
-        oracleStatus?: Status
+        trigger?: Schema.AuctionTrigger
      ): void;
    }
  }
 }
-
 export const addMockTradingPage = () => {
  Cypress.Commands.add(
    'mockTradingPage',
-    (
-      state = Schema.MarketState.STATE_ACTIVE,
-      tradingMode,
-      trigger,
-      oracleStatus
-    ) => {
+    (state = Schema.MarketState.STATE_ACTIVE, tradingMode, trigger) => {
      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: [oracle],
+          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`,
+            },
+          ],
        }
      );
    }
@@ -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:3008/graphql
+NX_VEGA_URL=http://localhost:3028/query
 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
@@ -27,10 +27,7 @@ import { NO_MARKET } from './constants';
 import { LiquidityContainer } from '../liquidity/liquidity';
 import { useNavigate } from 'react-router-dom';
 import type { PinnedAsset } from '@vegaprotocol/accounts';
-import {
-  usePaneLayout,
-  useScreenDimensions,
-} from '@vegaprotocol/react-helpers';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import {
  useMarketClickHandler,
  useMarketLiquidityClickHandler,
@@ -86,20 +83,15 @@ interface BottomPanelProps {

 const MarketBottomPanel = memo(
  ({ marketId, pinnedAsset }: BottomPanelProps) => {
-    const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'bottom' });
    const { screenSize } = useScreenDimensions();
    const onMarketClick = useMarketClickHandler(true);
    const onOrderTypeClick = useMarketLiquidityClickHandler(true);

    return 'xxxl' === screenSize ? (
-      <ResizableGrid
-        proportionalLayout
-        minSize={200}
-        onChange={handleOnLayoutChange}
-      >
+      <ResizableGrid proportionalLayout minSize={200}>
        <ResizableGridPanel
          priority={LayoutPriority.Low}
-          preferredSize={sizes[0] || '50%'}
+          preferredSize="50%"
          minSize={50}
        >
          <TradeGridChild>
@@ -127,7 +119,7 @@ const MarketBottomPanel = memo(
        </ResizableGridPanel>
        <ResizableGridPanel
          priority={LayoutPriority.Low}
-          preferredSize={sizes[1] || '50%'}
+          preferredSize="50%"
          minSize={50}
        >
          <TradeGridChild>
@@ -194,29 +186,22 @@ MarketBottomPanel.displayName = 'MarketBottomPanel';
 const MainGrid = memo(
  ({
    marketId,
+    onSelect,
    pinnedAsset,
  }: {
    marketId: string;
+    onSelect: (marketId: string, metaKey?: boolean) => void;
    pinnedAsset?: PinnedAsset;
  }) => {
    const navigate = useNavigate();
-    const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'top' });
-    const [sizesMiddle, handleOnMiddleLayoutChange] = usePaneLayout({
-      id: 'middle',
-    });
-
    return (
-      <ResizableGrid vertical onChange={handleOnLayoutChange}>
+      <ResizableGrid vertical>
        <ResizableGridPanel minSize={75} priority={LayoutPriority.High}>
-          <ResizableGrid
-            proportionalLayout={false}
-            minSize={200}
-            onChange={handleOnMiddleLayoutChange}
-          >
+          <ResizableGrid proportionalLayout={false} minSize={200}>
            <ResizableGridPanel
              priority={LayoutPriority.High}
              minSize={200}
-              preferredSize={sizesMiddle[0] || '50%'}
+              preferredSize="50%"
            >
              <TradeGridChild>
                <Tabs storageKey="console-trade-grid-main-left">
@@ -234,7 +219,7 @@ const MainGrid = memo(
            </ResizableGridPanel>
            <ResizableGridPanel
              priority={LayoutPriority.Low}
-              preferredSize={sizesMiddle[1] || 330}
+              preferredSize={330}
              minSize={300}
            >
              <TradeGridChild>
@@ -253,7 +238,7 @@ const MainGrid = memo(
            </ResizableGridPanel>
            <ResizableGridPanel
              priority={LayoutPriority.Low}
-              preferredSize={sizesMiddle[2] || 430}
+              preferredSize={430}
              minSize={200}
            >
              <TradeGridChild>
@@ -271,7 +256,7 @@ const MainGrid = memo(
        </ResizableGridPanel>
        <ResizableGridPanel
          priority={LayoutPriority.Low}
-          preferredSize={sizes[1] || '25%'}
+          preferredSize="25%"
          minSize={50}
        >
          <MarketBottomPanel marketId={marketId} pinnedAsset={pinnedAsset} />
@@ -293,7 +278,11 @@ export const TradeGrid = ({
        <TradeMarketHeader market={market} onSelect={onSelect} />
        <OracleBanner marketId={market?.id || ''} />
      </div>
-      <MainGrid marketId={market?.id || ''} pinnedAsset={pinnedAsset} />
+      <MainGrid
+        marketId={market?.id || ''}
+        onSelect={onSelect}
+        pinnedAsset={pinnedAsset}
+      />
    </div>
  );
 };
@@ -361,10 +350,7 @@ export const TradePanels = ({

  return (
    <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
-      <div>
-        <TradeMarketHeader market={market} onSelect={onSelect} />
-        <OracleBanner marketId={market?.id || ''} />
-      </div>
+      <TradeMarketHeader market={market} onSelect={onSelect} />
      <div className="h-full">
        <AutoSizer>
          {({ width, height }) => (
@@ -1,335 +0,0 @@
-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));
-  });
-});
@@ -1,285 +0,0 @@
-import compact from 'lodash/compact';
-import { isAfter } from 'date-fns';
-import type {
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
-} from '@vegaprotocol/datagrid';
-import { AgGridLazy 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,7 +5,6 @@ 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) => ({
@@ -22,9 +21,6 @@ export const MarketsPage = () => {
      <Tab id="proposed-markets" name={t('Proposed markets')}>
        <Proposed />
      </Tab>
-      <Tab id="closed-markets" name={t('Closed markets')}>
-        <Closed />
-      </Tab>
    </Tabs>
  );
 };
@@ -12,9 +12,7 @@ export const Proposed = () => {
  const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);
  return (
    <>
-      <div className="min-h-[200px]">
-        <ProposalsList />
-      </div>
+      <ProposalsList />
      <ExternalLink className="py-4 px-[11px] text-sm" href={externalLink}>
        {t('Propose a new market')}
      </ExternalLink>
@@ -1,105 +0,0 @@
-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}`)
-    );
-  });
-});
@@ -1,55 +0,0 @@
-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>
-  );
-};
@@ -1,113 +0,0 @@
-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();
-  });
-});
@@ -1,39 +0,0 @@
-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>
-  );
-};
@@ -7,7 +7,6 @@ import { WithdrawalsContainer } from './withdrawals-container';
 import { FillsContainer } from '@vegaprotocol/fills';
 import type { ReactNode } from 'react';
 import { useEffect } from 'react';
-import { usePaneLayout } from '@vegaprotocol/react-helpers';
 import { VegaWalletContainer } from '../../components/vega-wallet-container';
 import { DepositsContainer } from './deposits-container';
 import { LayoutPriority } from 'allotment';
@@ -35,11 +34,11 @@ export const Portfolio = () => {

  const onMarketClick = useMarketClickHandler(true);
  const onOrderTypeClick = useMarketLiquidityClickHandler(true);
-  const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
+
  const wrapperClasses = 'h-full max-h-full flex flex-col';
  return (
    <div className={wrapperClasses}>
-      <ResizableGrid vertical onChange={handleOnLayoutChange}>
+      <ResizableGrid vertical>
        <ResizableGridPanel minSize={75}>
          <PortfolioGridChild>
            <Tabs storageKey="console-portfolio-top">
@@ -79,7 +78,7 @@ export const Portfolio = () => {
        </ResizableGridPanel>
        <ResizableGridPanel
          priority={LayoutPriority.Low}
-          preferredSize={sizes[1] || 300}
+          preferredSize={300}
          minSize={50}
        >
          <PortfolioGridChild>
@@ -1,2 +0,0 @@
-export { Settings as default } from './settings';
-export { SettingsButton } from './settings-button';
@@ -1,16 +0,0 @@
-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>
-  );
-};
@@ -1,49 +0,0 @@
-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,8 +26,7 @@ export const OracleBanner = ({ marketId }: { marketId: string }) => {
  return (
    <NotificationBanner intent={Intent.Danger}>
      <div>
-        Oracle status for this market is{' '}
-        <span data-testId="oracle-status">{oracle.status}</span>.{' '}
+        Oracle status for this market is {oracle.status}.{' '}
        {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,6 +10,7 @@ import { t } from '@vegaprotocol/i18n';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
 import {
+  ThemeSwitcher,
  Navigation,
  NavigationList,
  NavigationItem,
@@ -23,7 +24,6 @@ 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={
        <>
-          <SettingsButton />
+          <ThemeSwitcher />
          <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-4 [.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-8 [.drawer-content_&]:mt-4"
        hide={[
          NavigationBreakpoint.Small,
          NavigationBreakpoint.Narrow,
          NavigationBreakpoint.Full,
        ]}
      >
-        <NavigationItem className="[.drawer-content_&]:w-full">
-          <SettingsButton withMobile />
+        <NavigationItem className="[.drawer-content_&]:w-full text-black dark:text-white">
+          <ThemeSwitcher withMobile />
        </NavigationItem>
      </NavigationList>
    </Navigation>
@@ -39,17 +39,7 @@ const MARKET_A: PartialMarket = {
          symbol: 'ABC',
        },
        dataSourceSpecForTradingTermination: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecForSettlementData: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecBinding: {
-          __typename: 'DataSourceSpecToFutureBinding',
-          tradingTerminationProperty: 'trading-termination-property',
-          settlementDataProperty: 'settlement-data-property',
+          id: '',
        },
      },
      metadata: {
@@ -125,17 +115,7 @@ const MARKET_B: PartialMarket = {
          symbol: 'XYZ',
        },
        dataSourceSpecForTradingTermination: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecForSettlementData: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecBinding: {
-          __typename: 'DataSourceSpecToFutureBinding',
-          tradingTerminationProperty: 'trading-termination-property',
-          settlementDataProperty: 'settlement-data-property',
+          id: '',
        },
      },
      metadata: {
@@ -1,6 +1,9 @@
+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');

@@ -11,19 +14,21 @@ 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.CUSTOM}
-    ${'displays'} | ${Networks.DEVNET}
-    ${'displays'} | ${Networks.STAGNET3}
-    ${'displays'} | ${Networks.TESTNET}
+    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 a generic message on $network',
+    '$assertion the risk notice on $network',
    async ({ assertion, network }) => {
      // @ts-ignore ignore mock implementation
      useEnvironment.mockImplementation(() => ({
@@ -31,37 +36,33 @@ describe('Risk notice dialog', () => {
        VEGA_ENV: network,
      }));

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

-      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();
+      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();
+      }
    }
  );

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

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

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

    const button = screen.getByRole('button', {
      name: 'I understand, Continue',
@@ -1,100 +1,24 @@
+import { useCallback } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import {
-  Button,
-  Link,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { Button } from '@vegaprotocol/ui-toolkit';
+import { LocalStorage } from '@vegaprotocol/utils';
 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, network }: Props) => {
-  const [, setValue] = useLocalStorage(RISK_ACCEPTED_KEY);
-
-  const handleAcceptRisk = () => {
+export const RiskNoticeDialog = ({ onClose }: Props) => {
+  const handleAcceptRisk = useCallback(() => {
    onClose();
-    setValue('true');
-  };
+    LocalStorage.setItem(RISK_ACCEPTED_KEY, 'true');
+  }, [onClose]);

-  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="mb-6">
+      <p className="text-base 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.'
        )}
@@ -102,11 +26,12 @@ const MainnetContent = () => {
      <h4 className="text-xl mb-2">
        {t('Technical and financial risk of loss')}
      </h4>
-      <p className="mb-8">
+      <p className="text-base 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>
    </>
  );
 };
@@ -1,22 +0,0 @@
-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();
-  });
-});
@@ -1,22 +0,0 @@
-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,51 +4,46 @@ 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 { VEGA_ENV } = useEnvironment();
  const { pathname } = useLocation();
-  let dialogContent: React.ReactNode;
+  const { VEGA_ENV } = useEnvironment();
+  let dialogContent: React.ReactNode = null;
  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 = useGlobalStore((store) => store.update);
-  const shouldDisplayWelcomeDialog = useGlobalStore(
-    (store) => store.shouldDisplayWelcomeDialog
-  );
-  const isRiskDialogNeeded = riskAccepted !== 'true' && !('Cypress' in window);
+  const { update, shouldDisplayWelcomeDialog } = useGlobalStore((store) => ({
+    update: store.update,
+    shouldDisplayWelcomeDialog: store.shouldDisplayWelcomeDialog,
+  }));
+  const isRiskDialogNeeded =
+    riskAccepted !== 'true' && VEGA_ENV === Networks.MAINNET;
  const isWelcomeDialogNeeded = pathname === '/' || shouldDisplayWelcomeDialog;
-  const onCloseDialog = useCallback(() => {
+  const onClose = useCallback(() => {
    update({ shouldDisplayWelcomeDialog: isRiskDialogNeeded });
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    dialogContent = null;
  }, [update, isRiskDialogNeeded]);

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

  return (
@@ -41,17 +41,7 @@ const MARKET_A: PartialMarket = {
          symbol: 'ABC',
        },
        dataSourceSpecForTradingTermination: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecForSettlementData: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecBinding: {
-          __typename: 'DataSourceSpecToFutureBinding',
-          tradingTerminationProperty: 'trading-termination-property',
-          settlementDataProperty: 'settlement-data-property',
+          id: '',
        },
      },
      metadata: {
@@ -127,17 +117,7 @@ const MARKET_B: PartialMarket = {
          symbol: 'XYZ',
        },
        dataSourceSpecForTradingTermination: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecForSettlementData: {
-          __typename: 'DataSourceSpec',
-          id: 'oracleId',
-        },
-        dataSourceSpecBinding: {
-          __typename: 'DataSourceSpecToFutureBinding',
-          tradingTerminationProperty: 'trading-termination-property',
-          settlementDataProperty: 'settlement-data-property',
+          id: '',
        },
      },
      metadata: {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Dariusz Majcherczyk	77ae0408e0	test: reverted assertion	2023-04-22 08:42:51 +02:00
Dariusz Majcherczyk	51f076bca8	test: trigger failure for governance	2023-04-21 22:08:01 +02:00
Dariusz Majcherczyk	22eefb5d0d	test: reverted changes	2023-04-21 21:24:37 +02:00
Dariusz Majcherczyk	145bb13848	test: trigger failure	2023-04-21 20:57:56 +02:00
Dariusz Majcherczyk	87000a33d5	test: separated artifacts for logs and html report	2023-04-21 19:31:40 +02:00