chore: require 1 review each from each codeowners group

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,6 +1,6 @@
 # Related issues 🔗
 
-Closes #[Issue number here]
+Issue: #[Issue number here]
 
 # Description ℹ️
 

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

@@ -5,12 +5,12 @@ on:
     branches:
       - release/*
       - develop
-      - main
   pull_request:
     types:
       - opened
       - ready_for_review
       - reopened
+      - edited
       - synchronize
 jobs:
   node-modules:
@@ -42,6 +42,13 @@ jobs:
         if: steps.cache.outputs.cache-hit != 'true'
         run: yarn install --pure-lockfile
 
+  lint-pr-title:
+    needs: node-modules
+    if: ${{ github.event_name == 'pull_request' }}
+    name: Verify PR title
+    uses: ./.github/workflows/lint-pr.yml
+    secrets: inherit
+
   lint-format:
     timeout-minutes: 20
     needs: node-modules
@@ -168,42 +175,19 @@ jobs:
       preview_explorer: ${{ env.PREVIEW_EXPLORER }}
       preview_tools: ${{ env.PREVIEW_TOOLS }}
 
-  # console-e2e:
-  #   needs: build-sources
-  #   name: '(CI) console python'
-  #   uses: ./.github/workflows/console-test-run.yml
-  #   secrets: inherit
-  #   if: ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
-  #   with:
-  #     github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
-
-  check-e2e-needed:
-    runs-on: ubuntu-latest
+  console-e2e:
     needs: build-sources
-    name: '(CI) check if e2e needed'
-    outputs:
-      run-tests: ${{ steps.check-test.outputs.e2e-needed }}
-    steps:
-      - name: Check branch
-        id: check-test
-        run: |
-          if [[ "${{ github.base_ref }}" == "develop" ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "main" ]]; then 
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push"  &&  "${{ github.ref_name }}" == *"release/"* ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          else
-            echo "e2e-needed=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Print result
-        run: |
-          echo "e2e-needed: ${{ steps.check-test.outputs.e2e-needed }}"
+    name: '(CI) console python'
+    uses: ./.github/workflows/console-test-run.yml
+    secrets: inherit
+    if: ${{ contains(fromJSON(needs.build-sources.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
+    with:
+      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
 
   cypress:
-    needs: [build-sources, check-e2e-needed]
+    needs: build-sources
     name: '(CI) cypress'
-    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
+    # if: ${{ needs.build-sources.outputs.projects-e2e != '[]' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:

.github/workflows/console-test-run.yml

@@ -6,37 +6,23 @@ on:
       github-sha:
         required: true
         type: string
-  workflow_dispatch:
-    inputs:
-      console-test-branch:
-        type: choice
-        description: 'main: v0.72.14, develop: v0.73.0-preview7'
-        options:
-          - main
-          - develop
 
 jobs:
   run-tests:
     name: run-tests
-    runs-on: 8-cores
+    runs-on: console-test
     timeout-minutes: 20
     steps:
       #----------------------------------------------
       #       check-out frontend-monorepo
       #----------------------------------------------
-      - name: Checkout frontend-monorepo
+      - name: Checkout console test repo
         uses: actions/checkout@v3
         with:
-          ref: ${{ inputs.github-sha || github.sha }}
+          ref: ${{ inputs.github-sha }}
       #----------------------------------------------
       #       cache node modules
       #----------------------------------------------
-      - name: setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: yarn
-
       - name: Cache node modules
         id: cache
         uses: actions/cache@v3
@@ -79,42 +65,32 @@ jobs:
         uses: actions/checkout@v3
         with:
           repository: vegaprotocol/console-test
-          ref: ${{ inputs.console-test-branch }}
           path: './console-test'
-
-      - name: Load console test envs
-        id: console-test-env
-        uses: falti/dotenv-action@v1.0.4
-        with:
-          path: './console-test/.env.${{ inputs.console-test-branch }}'
-          export-variables: true
-          keys-case: upper
-          log-variables: true
-
       #----------------------------------------------
       # install dependencies if cache does not exist
       #----------------------------------------------
       - name: Install dependencies
         working-directory: ./console-test
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
         run: poetry install --no-interaction --no-root
       #----------------------------------------------
       # install vega binaries
       #----------------------------------------------
       - name: Install vega binaries
         working-directory: ./console-test
-        run: poetry run python -m vega_sim.tools.load_binaries --force --version ${{ env.VEGA_VERSION }}
+        run: poetry run python -m vega_sim.tools.load_binaries --force
       #----------------------------------------------
       # install playwright
       #----------------------------------------------
       - name: install playwright
-        run: poetry run playwright install --with-deps chromium
+        run: poetry run playwright install
         working-directory: ./console-test
       #----------------------------------------------
       # run tests
       #----------------------------------------------
       - name: Run tests
         working-directory: ./console-test
-        run: poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
+        run: poetry run pytest -v -s --numprocesses 2 --dist loadfile --durations=20
       - name: Check files
         run: |
           ls -al .
@@ -129,13 +105,3 @@ jobs:
           name: playwright-trace
           path: ./traces/
           retention-days: 15
-      #----------------------------------------------
-      #  -----  upload logs  -----
-      #----------------------------------------------
-      - name: Upload worker logs
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: worker-logs
-          path: ./logs/
-          retention-days: 15

.github/workflows/cypress-run.yml

@@ -13,35 +13,13 @@ on:
         type: string
 
 jobs:
-  runner-choice:
-    runs-on: ubuntu-latest
-    outputs:
-      runner: ${{ steps.step.outputs.runner }}
-    steps:
-      - name: Check branch
-        id: step
-        run: |
-          if [[ "${{ github.base_ref }}" == "main" ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          else
-            echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Print runner
-        run: echo ${{ steps.step.outputs.runner }}
-
   e2e:
     strategy:
       fail-fast: false
       matrix:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
-    needs: runner-choice
-    runs-on: ${{ needs.runner-choice.outputs.runner }}
+    runs-on: self-hosted-runner
     timeout-minutes: 120
     steps:
       # Checks if skip cache was requested
@@ -85,7 +63,6 @@ jobs:
       - name: Run Vegacapsule network and Vega wallet
         id: setup-vega
         uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        timeout-minutes: 10
 
       ######
       ## Run some tests

.github/workflows/lint-pr.yml

@@ -2,12 +2,7 @@
 name: Verify PR title
 
 on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
+  workflow_call:
 
 jobs:
   lint_pr:
@@ -16,16 +11,21 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup node
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn
 
-      - name: Install dependencies
-        run: |
-          rm package.json 
-          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
 
       - name: Check PR title
         run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js

.github/workflows/publish-dist.yml

@@ -30,18 +30,12 @@ jobs:
           echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
           echo IS_S3_RELEASE=false >> $GITHUB_ENV
           echo IS_DEV_IMAGE=false >> $GITHUB_ENV
-          echo IS_MAIN_IMAGE=false >> $GITHUB_ENV
 
       - name: Is dev image
-        if: ${{ github.ref_name == 'develop' && github.event_name == 'push' && matrix.app == 'trading' }}
+        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
         run: |
           echo IS_DEV_IMAGE=true >> $GITHUB_ENV
 
-      - name: Is main image
-        if: ${{ github.ref_name == 'main' && github.event_name == 'push' && matrix.app == 'trading' }}
-        run: |
-          echo IS_MAIN_IMAGE=true >> $GITHUB_ENV
-
       - name: Is PR
         if: ${{ github.event_name == 'pull_request' }}
         run: |
@@ -63,7 +57,7 @@ jobs:
           echo IS_IPFS_RELEASE=true >> $GITHUB_ENV
 
       - name: Is S3 Release
-        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' && github.ref_name != 'main'}}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
         run: |
           echo IS_S3_RELEASE=true >> $GITHUB_ENV
 
@@ -87,7 +81,7 @@ jobs:
 
       - name: Log in to the Container registry (docker hub)
         uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -161,10 +155,10 @@ jobs:
       - name: Sanity check docker image
         run: |
           echo "Check ipfs-hash"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'cat /ipfs-hash'
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'cat /ipfs-hash' > ${{ matrix.app }}-ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
           echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'apk add --update tree; tree /usr/share/nginx/html'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'
 
       - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
@@ -185,7 +179,7 @@ jobs:
         uses: docker/build-push-action@v3
         continue-on-error: true
         id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -195,7 +189,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || '' }}
 
       - name: Publish dist as docker image (ghcr - retry)
         uses: docker/build-push-action@v3
@@ -222,7 +216,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
@@ -335,9 +329,7 @@ jobs:
             fi
 
             # create commit
-            if ! git diff --cached --exit-code; then
-              commit_msg="Automated hash update from ${{ github.ref }}"
-              git commit -m "$commit_msg"
-              git push -u origin "main"
-            fi
+            commit_msg="Automated hash update from ${{ github.ref }}"
+            git commit -m "$commit_msg"
+            git push -u origin "main"
           )

CODEOWNERS

@@ -1,3 +1,2 @@
-* @vegaprotocol/frontend
-* @vegaprotocol/frontend-qa
+* @vegaprotocol/frontend @vegaprotocol/frontend-qa
 *.graphql @vegaprotocol/core

README.md

@@ -113,20 +113,6 @@ In order to run a container on port 3000:
 docker run -p 3000:80 [TAG]
 ```
 
-On top of that there are two possible scenarios for running docker image - using nginx server (default) of ipfs daemon.
-
-to run ipfs on port 3000:
-
-```bash
-docker run -p 3000:80 [TAG] /run-ipfs.sh
-```
-
-to run nginx on port 3000:
-
-```bash
-docker run -p 3000:80 [TAG]
-```
-
 ## Build instructions
 
 The [`docker`](./docker) subfolder has some docker configurations for easily setting up your own hosted version of Console either for the web, or ready for pinning on IPFS.
@@ -164,7 +150,7 @@ As a prerequisite you need to perform build of `dist` directory and move its con
 You can build any of the containers locally with the following command:
 
 ```bash
-docker build -f docker/node-outside-docker.Dockerfile . --tag=[TAG]
+docker build --dockerfile docker/node-outside-docker.Dockerfile . --tag=[TAG]
 ```
 
 ### Verifying ipfs-hash of existing current application version

apps/explorer-e2e/.env.devnet

@@ -4,8 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer-e2e/.env.mainnet

@@ -4,7 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocke
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer-e2e/.env.testnet

@@ -4,7 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.capsule

@@ -3,7 +3,6 @@ NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # App flags
 NX_EXPLORER_TXS_LIST=0

apps/explorer/.env.devnet

@@ -8,7 +8,6 @@ NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket

apps/explorer/.env.mainnet

@@ -9,7 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/explorer/.env.mainnet-mirror

@@ -9,7 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

apps/explorer/.env.stagnet1

@@ -1,3 +1,2 @@
 # .env is stagnet1, so there are no overrides required
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET1":"https://stagnet1.explorer.vega.xyz"}'
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

apps/explorer/.env.testnet

@@ -9,7 +9,6 @@ NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/explorer/.env.validators-testnet

@@ -11,7 +11,6 @@ NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
 NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket

apps/explorer/.env.vegacapsule

@@ -5,5 +5,4 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_VEGA_EXPLORER_URL=/

apps/explorer/src/app/components/assets/assets-table.tsx

@@ -4,7 +4,7 @@ import { AssetTypeMapping, AssetStatusMapping } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';

apps/explorer/src/app/components/markets/markets-table.tsx

@@ -4,7 +4,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueGetterParams,

apps/explorer/src/app/components/proposals/proposals-table.tsx

@@ -2,7 +2,7 @@ import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
@@ -33,7 +33,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
   const { params } = useNetworkParams([
     NetworkParams.governance_proposal_market_requiredMajority,
   ]);
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
   const requiredMajorityPercentage = useMemo(() => {
     const requiredMajority =
       params?.governance_proposal_market_requiredMajority ?? 1;
@@ -105,7 +105,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
               ? new BigNumber(0)
               : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
             return (
-              <div className="flex items-center justify-center h-full pt-2 uppercase">
+              <div className="uppercase flex h-full items-center justify-center pt-2">
                 <VoteProgress
                   threshold={requiredMajorityPercentage}
                   progress={yesPercentage}

apps/explorer/src/app/components/txs/details/proposal/signature-bundle/bundle-signers.tsx

@@ -35,7 +35,7 @@ export const BundleSigners = ({
   tx,
   id,
 }: BundleSignersProps) => {
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
 
   const bridgeFunction: BridgeFunction =
     tx?.changes?.erc20 && 'contractAddress' in tx.changes.erc20

apps/explorer/src/app/routes/oracles/home/index.tsx

@@ -8,9 +8,7 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';
 
 const Oracles = () => {
-  const { data, loading, error } = useExplorerOracleSpecsQuery({
-    errorPolicy: 'ignore',
-  });
+  const { data, loading, error } = useExplorerOracleSpecsQuery();
 
   useDocumentTitle(['Oracles']);
   useScrollToLocation();

apps/explorer/src/app/routes/validators/validators-page.tsx

@@ -139,7 +139,7 @@ export const ValidatorsPage = () => {
   const [vegaDialog, setVegaDialog] = useState<boolean>(false);
   const [tmDialog, setTmDialog] = useState<boolean>(false);
 
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
 
   return (
     <>

apps/governance-e2e/.env

@@ -14,8 +14,6 @@ NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

apps/governance-e2e/.env.devnet

@@ -3,4 +3,3 @@ NX_VEGA_ENV=DEVNET
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

apps/governance-e2e/.env.mainnet

@@ -3,4 +3,3 @@ NX_VEGA_ENV=MAINNET
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

apps/governance-e2e/.env.testnet

@@ -3,4 +3,3 @@ NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

apps/governance-e2e/src/fixtures/mocks/network-upgrade.ts

@@ -19,22 +19,7 @@ export const upgradeProposalsData = {
       },
       {
         node: {
-          upgradeBlockHeight: '10001',
-          vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
-          approvers: [
-            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
-            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
-            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
-            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
-          ],
-          status: 'PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED',
-          __typename: 'ProtocolUpgradeProposal',
-        },
-        __typename: 'ProtocolUpgradeProposalEdge',
-      },
-      {
-        node: {
-          upgradeBlockHeight: '20',
+          upgradeBlockHeight: '1955065',
           vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
           approvers: [
             '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',

apps/governance-e2e/src/integration/flow/staking-flow.cy.ts

@@ -212,7 +212,7 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         cy.get(`[row-id="${0}"]`)
-          .first()
+          .eq(1)
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
               .should('have.text', '3,002.00')
@@ -222,7 +222,7 @@ context(
               .and('be.visible');
           });
         cy.get(`[row-id="${1}"]`)
-          .first()
+          .eq(1)
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
               .scrollIntoView()
@@ -262,10 +262,10 @@ context(
             '2'
           );
           waitForBeginningOfEpoch();
-          cy.getByTestId(
-            stakeValidatorListStakePercentage,
-            epochTimeout
-          ).should('have.text', '50.02%');
+          cy.getByTestId(stakeValidatorListStakePercentage).should(
+            'have.text',
+            '50.02%'
+          );
           navigateTo(navigation.validators);
           validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
         }

apps/governance-e2e/src/integration/view/proposal.cy.ts

@@ -15,7 +15,6 @@ const proposalDocumentationLink = 'proposal-documentation-link';
 const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
 const governanceDocsUrl = 'https://vega.xyz/governance';
 const networkUpgradeProposalListItem = 'protocol-upgrade-proposals-list-item';
-const proposalUpgradeBlockHeight = 'protocol-upgrade-proposal-block-height';
 const closedProposals = 'closed-proposals';
 const closedProposalToggle = 'closed-proposals-toggle-networkUpgrades';
 const protocolUpgradeTime = 'protocol-upgrade-time';
@@ -185,7 +184,7 @@ context(
               'have.text',
               'Vega release tag: v1'
             );
-            cy.getByTestId(proposalUpgradeBlockHeight).should(
+            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
               'have.text',
               'Upgrade block height: 2015942'
             );
@@ -200,15 +199,7 @@ context(
       });
       cy.getByTestId(closedProposalToggle).click();
       cy.getByTestId(closedProposals).within(() => {
-        cy.getByTestId(networkUpgradeProposalListItem).should('have.length', 2);
-        cy.getByTestId(networkUpgradeProposalListItem)
-          .first()
-          .within(() => {
-            cy.getByTestId(proposalUpgradeBlockHeight).should(
-              'contain.text',
-              '10001'
-            );
-          });
+        cy.getByTestId(networkUpgradeProposalListItem).should('have.length', 1);
       });
     });
 

apps/governance-e2e/src/support/staking.functions.ts

@@ -170,20 +170,21 @@ export function clickOnValidatorFromList(
   validatorName = null
 ) {
   cy.contains('Loading...', epochTimeout).should('not.exist');
+  waitForBeginningOfEpoch();
   // below is to ensure validator list is shown
   cy.get(stakeValidatorListName, { timeout: 10000 }).should('exist');
   cy.get(stakeValidatorListPendingStake, txTimeout).should(
     'not.contain',
     '2,000,000,000,000,000,000.00' // number due to bug #936
   );
-  waitForBeginningOfEpoch();
   if (validatorName) {
     cy.contains(validatorName).click();
   } else {
     cy.get(`[row-id="${validatorNumber}"]`)
       .should('be.visible')
       .first()
-      .click();
+      .as('validatorOnList');
+    cy.get('@validatorOnList').click();
   }
 }
 
@@ -195,7 +196,7 @@ export function validateValidatorListTotalStakeAndShare(
   cy.contains('Loading...', epochTimeout).should('not.exist');
   waitForBeginningOfEpoch();
   cy.get(`[row-id="${positionOnList}"]`)
-    .first()
+    .eq(1)
     .within(() => {
       cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
         'have.text',

apps/governance/.env

@@ -8,7 +8,6 @@ NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 

apps/governance/.env.capsule

@@ -22,8 +22,6 @@ NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
 
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 

apps/governance/.env.devnet

@@ -19,8 +19,6 @@ NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fa
 
 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/governance/.env.mainnet

@@ -16,8 +16,7 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.vega.community/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 

apps/governance/.env.mainnet-mirror

@@ -15,7 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket

apps/governance/.env.stagnet1

@@ -9,8 +9,6 @@ NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground

apps/governance/.env.testnet

@@ -14,8 +14,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground

apps/governance/.env.validators-testnet

@@ -11,7 +11,6 @@ NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground

apps/governance/src/routes/home/index.tsx

@@ -45,7 +45,7 @@ const HomeProposals = ({
   const { t } = useTranslation();
 
   return (
-    <section className="mb-16 break-all" data-testid="home-proposals">
+    <section className="mb-16" data-testid="home-proposals">
       <Heading title={t('vegaGovernance')} />
       <h3 className="mb-6">{t('homeProposalsIntro')}</h3>
       <div className="mb-8">

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

@@ -127,7 +127,7 @@ export const Proposal = ({
         voteState={voteState}
       />
 
-      <div className="my-10 break-all">
+      <div className="my-10">
         <ProposalChangeTable proposal={proposal} />
       </div>
 

apps/governance/src/routes/proposals/proposal/proposal-container.spec.tsx

@@ -6,11 +6,6 @@ import { MockedProvider } from '@apollo/client/testing';
 import { MemoryRouter, Route, Routes } from 'react-router-dom';
 import { ProposalDocument } from './__generated__/Proposal';
 
-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useDataProvider: jest.fn(() => ({ data: [], loading: false })),
-}));
-
 jest.mock('../components/proposal', () => ({
   Proposal: () => <div data-testid="proposal" />,
 }));

apps/governance/src/routes/rewards/epoch-individual-rewards/epoch-individual-rewards.tsx

@@ -1,4 +1,4 @@
-import { useMemo, useEffect, useState, useCallback, useRef } from 'react';
+import { useMemo, useEffect, useState, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { AsyncRenderer, Pagination } from '@vegaprotocol/ui-toolkit';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
@@ -86,18 +86,12 @@ export const EpochIndividualRewards = ({
     [epochId, page, refetch, delegationsPagination, pubKey]
   );
 
-  const prevEpochIdRef = useRef<number | null>(null);
-
   useEffect(() => {
-    if (prevEpochIdRef.current === null) {
-      prevEpochIdRef.current = epochId;
-    } else if (epochId !== prevEpochIdRef.current) {
-      // When the epoch changes, we want to refetch the data to update the current page
+    // when the epoch changes, we want to refetch the data to update the current page
+    if (data) {
       refetchData();
     }
-
-    prevEpochIdRef.current = epochId;
-  }, [epochId, refetchData]);
+  }, [epochId, data, refetchData]);
 
   return (
     <AsyncRenderer

apps/governance/src/routes/staking/home/validator-tables/consensus-validators-table.tsx

@@ -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 { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -85,17 +85,17 @@ const TopThirdCellRenderer = (
       }}
       className="grid grid-cols-[60px_1fr] w-full h-full py-4 px-0 text-sm text-white text-center overflow-scroll"
     >
-      <div className="px-3 text-xs text-left">
+      <div className="text-xs text-left px-3">
         {params?.data?.rankingDisplay}
       </div>
-      <div className="px-3 whitespace-normal">
+      <div className="whitespace-normal px-3">
         <div className="mb-4">
           <Button
             data-testid="show-all-validators"
             rightIcon={
               <Icon
                 name="arrow-right"
-                className="mr-2 align-text-top fill-current"
+                className="fill-current mr-2 align-text-top"
               />
             }
             className="inline-flex items-center"
@@ -103,7 +103,7 @@ const TopThirdCellRenderer = (
             {t('Reveal top validators')}
           </Button>
         </div>
-        <p className="mb-0 font-semibold text-white">
+        <p className="font-semibold text-white mb-0">
           {t(
             'Validators with too great a stake share will have the staking rewards for their delegators penalised.'
           )}
@@ -352,6 +352,7 @@ export const ConsensusValidatorsTable = ({
           field: ValidatorFields.RANKING_INDEX,
           headerName: '#',
           width: 60,
+          pinned: 'left',
         },
         {
           field: ValidatorFields.VALIDATOR,
@@ -361,6 +362,7 @@ export const ConsensusValidatorsTable = ({
             if (a === b) return 0;
             return a > b ? 1 : -1;
           },
+          pinned: 'left',
           width: 260,
         },
         {

apps/governance/src/routes/staking/home/validator-tables/standby-pending-validators-table.tsx

@@ -1,7 +1,7 @@
 import { forwardRef, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import {
@@ -195,12 +195,14 @@ export const StandbyPendingValidatorsTable = ({
           field: ValidatorFields.RANKING_INDEX,
           headerName: '#',
           width: 60,
+          pinned: 'left',
         },
         {
           field: ValidatorFields.VALIDATOR,
           headerName: t(ValidatorFields.VALIDATOR).toString(),
           cellRenderer: ValidatorRenderer,
           comparator: ({ name: a }, { name: b }) => Math.sign(a - b),
+          pinned: 'left',
           width: 260,
         },
         {

apps/governance/src/routes/staking/node/validator-table.tsx

@@ -122,43 +122,38 @@ export const ValidatorTable = ({
 
       <div className="my-12" data-testid="validator-table">
         <SubHeading title={t('profile')} />
-        <div className="break-all">
-          <RoundedWrapper paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-profile">
-              <KeyValueTableRow>
-                <span>{t('id')}</span>
-                <ValidatorTableCell dataTestId="validator-id">
-                  {node.id}
-                </ValidatorTableCell>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('ABOUT THIS VALIDATOR')}</span>
+        <RoundedWrapper paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-profile">
+            <KeyValueTableRow>
+              <span>{t('id')}</span>
+              <ValidatorTableCell dataTestId="validator-id">
+                {node.id}
+              </ValidatorTableCell>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('ABOUT THIS VALIDATOR')}</span>
 
-                <Tooltip description={t('AboutThisValidatorDescription')}>
-                  <a
-                    data-testid="validator-description-url"
-                    href={node.infoUrl}
-                  >
-                    {node.infoUrl}
-                  </a>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>
-                  <strong>{t('STATUS')}</strong>
+              <Tooltip description={t('AboutThisValidatorDescription')}>
+                <a data-testid="validator-description-url" href={node.infoUrl}>
+                  {node.infoUrl}
+                </a>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>
+                <strong>{t('STATUS')}</strong>
+              </span>
+
+              <Tooltip description={t('ValidatorStatusDescription')}>
+                <span data-testid="validator-status">
+                  <strong>
+                    {t(statusTranslationKey(node.rankingScore.status))}
+                  </strong>
                 </span>
-
-                <Tooltip description={t('ValidatorStatusDescription')}>
-                  <span data-testid="validator-status">
-                    <strong>
-                      {t(statusTranslationKey(node.rankingScore.status))}
-                    </strong>
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              </Tooltip>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>
 
         <div className="mb-10">
           {t('validatorTableIntro')}{' '}
@@ -172,154 +167,144 @@ export const ValidatorTable = ({
         </div>
 
         <SubHeading title={t('ADDRESS')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-address">
-              <KeyValueTableRow>
-                <span>{t('VEGA ADDRESS / PUBLIC KEY')}</span>
-                <ValidatorTableCell dataTestId="validator-public-key">
-                  {node.pubkey}
-                </ValidatorTableCell>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('SERVER LOCATION')}</span>
-                <ValidatorTableCell dataTestId="validator-server-location">
-                  {countryData.find((c) => c.code === node.location)?.name ||
-                    t('not available')}
-                </ValidatorTableCell>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>{t('ETHEREUM ADDRESS')}</span>
-                <span data-testid="validator-eth-address">
-                  <Link
-                    title={t('View on Etherscan (opens in a new tab)')}
-                    href={`${ETHERSCAN_URL}/address/${node.ethereumAddress}`}
-                    target="_blank"
-                  >
-                    {node.ethereumAddress}
-                  </Link>
-                </span>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-address">
+            <KeyValueTableRow>
+              <span>{t('VEGA ADDRESS / PUBLIC KEY')}</span>
+              <ValidatorTableCell dataTestId="validator-public-key">
+                {node.pubkey}
+              </ValidatorTableCell>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('SERVER LOCATION')}</span>
+              <ValidatorTableCell dataTestId="validator-server-location">
+                {countryData.find((c) => c.code === node.location)?.name ||
+                  t('not available')}
+              </ValidatorTableCell>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>{t('ETHEREUM ADDRESS')}</span>
+              <span data-testid="validator-eth-address">
+                <Link
+                  title={t('View on Etherscan (opens in a new tab)')}
+                  href={`${ETHERSCAN_URL}/address/${node.ethereumAddress}`}
+                  target="_blank"
+                >
+                  {node.ethereumAddress}
+                </Link>
+              </span>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>
 
         <SubHeading title={t('STAKE')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-stake">
-              <KeyValueTableRow>
-                <span>{t('STAKED BY OPERATOR')}</span>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-stake">
+            <KeyValueTableRow>
+              <span>{t('STAKED BY OPERATOR')}</span>
 
-                <Tooltip description={t('StakedByOperatorDescription')}>
-                  <span data-testid="staked-by-operator">
-                    {formatNumber(toBigNum(node.stakedByOperator, decimals))}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('STAKED BY DELEGATES')}</span>
-
-                <Tooltip description={t('StakedByDelegatesDescription')}>
-                  <span data-testid="staked-by-delegates">
-                    {formatNumber(toBigNum(node.stakedByDelegates, decimals))}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>
-                  <strong>{t('TOTAL STAKE')}</strong>
+              <Tooltip description={t('StakedByOperatorDescription')}>
+                <span data-testid="staked-by-operator">
+                  {formatNumber(toBigNum(node.stakedByOperator, decimals))}
                 </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('STAKED BY DELEGATES')}</span>
 
-                <span data-testid="total-stake">
-                  <strong>
-                    {formatNumber(toBigNum(node.stakedTotal, decimals))}
-                  </strong>
+              <Tooltip description={t('StakedByDelegatesDescription')}>
+                <span data-testid="staked-by-delegates">
+                  {formatNumber(toBigNum(node.stakedByDelegates, decimals))}
                 </span>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('PENDING STAKE')}</span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>
+                <strong>{t('TOTAL STAKE')}</strong>
+              </span>
 
-                <Tooltip description={t('PendingStakeDescription')}>
-                  <span data-testid="pending-stake">
-                    {formatNumber(toBigNum(node.pendingStake, decimals))}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>{t('STAKE SHARE')}</span>
+              <span data-testid="total-stake">
+                <strong>
+                  {formatNumber(toBigNum(node.stakedTotal, decimals))}
+                </strong>
+              </span>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('PENDING STAKE')}</span>
 
-                <Tooltip description={t('StakeShareDescription')}>
-                  <span data-testid="stake-percentage">{stakePercentage}</span>
-                </Tooltip>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              <Tooltip description={t('PendingStakeDescription')}>
+                <span data-testid="pending-stake">
+                  {formatNumber(toBigNum(node.pendingStake, decimals))}
+                </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>{t('STAKE SHARE')}</span>
+
+              <Tooltip description={t('StakeShareDescription')}>
+                <span data-testid="stake-percentage">{stakePercentage}</span>
+              </Tooltip>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>
 
         <SubHeading title={t('PENALTIES')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-penalties">
-              <KeyValueTableRow>
-                <span>{t('OVERSTAKED PENALTY')}</span>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-penalties">
+            <KeyValueTableRow>
+              <span>{t('OVERSTAKED PENALTY')}</span>
 
-                <Tooltip description={t('OverstakedPenaltyDescription')}>
-                  <span data-testid="overstaking-penalty">
-                    {formatNumberPercentage(penalties.overstaked, 2)}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow>
-                <span>{t('PERFORMANCE PENALTY')}</span>
+              <Tooltip description={t('OverstakedPenaltyDescription')}>
+                <span data-testid="overstaking-penalty">
+                  {formatNumberPercentage(penalties.overstaked, 2)}
+                </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow>
+              <span>{t('PERFORMANCE PENALTY')}</span>
 
-                <Tooltip description={t('PerformancePenaltyDescription')}>
-                  <span data-testid="performance-penalty">
-                    {formatNumberPercentage(penalties.performance, 2)}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>
-                  <strong>{t('TOTAL PENALTIES')}</strong>
+              <Tooltip description={t('PerformancePenaltyDescription')}>
+                <span data-testid="performance-penalty">
+                  {formatNumberPercentage(penalties.performance, 2)}
                 </span>
-                <span data-testid="total-penalties">
-                  <strong>
-                    {formatNumberPercentage(penalties.overall, 2)}
-                  </strong>
-                </span>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>
+                <strong>{t('TOTAL PENALTIES')}</strong>
+              </span>
+              <span data-testid="total-penalties">
+                <strong>{formatNumberPercentage(penalties.overall, 2)}</strong>
+              </span>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>
 
         <SubHeading title={t('VOTING POWER')} />
-        <div className="break-all">
-          <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-            <KeyValueTable data-testid="validator-table-voting-power">
-              <KeyValueTableRow>
-                <span>{t('UNNORMALISED VOTING POWER')}</span>
+        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
+          <KeyValueTable data-testid="validator-table-voting-power">
+            <KeyValueTableRow>
+              <span>{t('UNNORMALISED VOTING POWER')}</span>
 
-                <Tooltip description={t('UnnormalisedVotingPowerDescription')}>
-                  <span data-testid="unnormalised-voting-power">
-                    {getUnnormalisedVotingPower(rawValidatorScore)}
-                  </span>
-                </Tooltip>
-              </KeyValueTableRow>
-              <KeyValueTableRow noBorder={true}>
-                <span>
-                  <strong>{t('NORMALISED VOTING POWER')}</strong>
+              <Tooltip description={t('UnnormalisedVotingPowerDescription')}>
+                <span data-testid="unnormalised-voting-power">
+                  {getUnnormalisedVotingPower(rawValidatorScore)}
                 </span>
+              </Tooltip>
+            </KeyValueTableRow>
+            <KeyValueTableRow noBorder={true}>
+              <span>
+                <strong>{t('NORMALISED VOTING POWER')}</strong>
+              </span>
 
-                <Tooltip description={t('NormalisedVotingPowerDescription')}>
-                  <strong data-testid="normalised-voting-power">
-                    {getNormalisedVotingPower(node.rankingScore.votingPower)}
-                  </strong>
-                </Tooltip>
-              </KeyValueTableRow>
-            </KeyValueTable>
-          </RoundedWrapper>
-        </div>
+              <Tooltip description={t('NormalisedVotingPowerDescription')}>
+                <strong data-testid="normalised-voting-power">
+                  {getNormalisedVotingPower(node.rankingScore.votingPower)}
+                </strong>
+              </Tooltip>
+            </KeyValueTableRow>
+          </KeyValueTable>
+        </RoundedWrapper>
       </div>
     </>
   );

apps/governance/src/routes/token/token-details/token-details.tsx

@@ -54,7 +54,7 @@ export const TokenDetails = ({
     config.token_vesting_contract?.address || ENV.addresses.tokenVestingAddress;
 
   return (
-    <div className="token-details break-all">
+    <div className="token-details">
       <RoundedWrapper>
         <KeyValueTable>
           <KeyValueTableRow>

apps/trading-e2e/.env

@@ -15,8 +15,6 @@ NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 NX_SENTRY_DSN=https://dummy@o999999.ingest.sentry.io/9999999
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 
 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session

apps/trading-e2e/.env.capsule

@@ -12,8 +12,6 @@ NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
 
 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session

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

@@ -104,7 +104,7 @@ describe('deposit actions', { tags: '@smoke' }, () => {
     cy.visit('/#/markets/market-1');
   });
 
-  it.skip('Deposit to trade is visible', () => {
+  it('Deposit to trade is visible', () => {
     cy.getByTestId('Collateral').click();
     cy.get('[row-id="asset-id"]').contains('tEURO').should('be.visible');
     cy.contains('[data-testid="deposit"]', 'Deposit').should('be.visible');

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

@@ -0,0 +1,256 @@
+import { MarketTradingModeMapping } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
+import compact from 'lodash/compact';
+
+const accordionContent = 'accordion-content';
+const blockExplorerLink = 'block-explorer-link';
+const dialogClose = 'dialog-close';
+const dialogContent = 'dialog-content';
+const externalLink = 'external-link';
+const githubLink = 'github-link';
+const liquidityLink = 'view-liquidity-link';
+const marketInfoBtn = 'Info';
+const marketTitle = 'accordion-title';
+const providerName = 'provider-name';
+const row = 'key-value-table-row';
+const verifiedProofs = 'verified-proofs';
+
+describe('market info is displayed', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.mockTradingPage();
+  });
+
+  before(() => {
+    cy.setOnBoardingViewed();
+    cy.mockTradingPage(MarketState.STATE_ACTIVE);
+    cy.mockSubscription();
+    cy.visit('/#/markets/market-0');
+    cy.wait('@Markets');
+    cy.getByTestId(marketInfoBtn).click();
+    cy.wait('@MarketInfo');
+  });
+
+  it('current fees displayed', () => {
+    // 6002-MDET-101
+    cy.getByTestId(marketTitle).contains('Current fees').click();
+    validateMarketDataRow(0, 'Maker Fee', '0.02%');
+    validateMarketDataRow(1, 'Infrastructure Fee', '0.05%');
+    validateMarketDataRow(2, 'Liquidity Fee', '1.00%');
+    validateMarketDataRow(3, 'Total Fees', '1.07%');
+  });
+
+  it('market price', () => {
+    // 6002-MDET-102
+    cy.getByTestId(marketTitle).contains('Market price').click();
+    validateMarketDataRow(0, 'Mark Price', '46,126.90058');
+    validateMarketDataRow(1, 'Best Bid Price', '44,126.90058 ');
+    validateMarketDataRow(2, 'Best Offer Price', '48,126.90058 ');
+    validateMarketDataRow(3, 'Quote Unit', 'BTC');
+  });
+
+  it('market volume displayed', () => {
+    // 6002-MDET-103
+    cy.getByTestId(marketTitle).contains('Market volume').click();
+    validateMarketDataRow(1, 'Open Interest', '-');
+    validateMarketDataRow(2, 'Best Bid Volume', '1');
+    validateMarketDataRow(3, 'Best Offer Volume', '3');
+    validateMarketDataRow(4, 'Best Static Bid Volume', '2');
+    validateMarketDataRow(5, 'Best Static Offer Volume', '4');
+  });
+
+  it('insurance pool displayed', () => {
+    // 6002-MDET-104
+    cy.getByTestId(marketTitle).contains('Insurance pool').click();
+    validateMarketDataRow(0, 'Balance', '0');
+  });
+
+  it('key details displayed', () => {
+    // 6002-MDET-201
+    cy.getByTestId(marketTitle).contains('Key details').click();
+
+    const rows: [string, string][] = compact([
+      ['Name', 'BTCUSD Monthly (30 Jun 2022)'],
+      ['Market ID', 'market-0'],
+      Cypress.env('NX_SUCCESSOR_MARKETS') && ['Parent Market ID', 'PARENT-A'],
+      Cypress.env('NX_SUCCESSOR_MARKETS') && [
+        'Insurance Pool Fraction',
+        '0.75',
+      ],
+      ['Trading Mode', MarketTradingModeMapping.TRADING_MODE_CONTINUOUS],
+      ['Market Decimal Places', '5'],
+      ['Position Decimal Places', '0'],
+      ['Settlement Asset Decimal Places', '5'],
+    ]);
+
+    for (const rowNumber in rows) {
+      const [name, value] = rows[rowNumber];
+      validateMarketDataRow(Number(rowNumber), name, value);
+    }
+  });
+
+  it('instrument displayed', () => {
+    // 6002-MDET-202
+    cy.getByTestId(marketTitle).contains('Instrument').click();
+
+    validateMarketDataRow(0, 'Market Name', 'BTCUSD Monthly (30 Jun 2022)');
+    validateMarketDataRow(1, 'Code', 'BTCUSD.MF21');
+    validateMarketDataRow(2, 'Product Type', 'Future');
+    validateMarketDataRow(3, 'Quote Name', 'BTC');
+  });
+
+  it('oracle displayed', () => {
+    // 6002-MDET-203
+    cy.getByTestId(marketTitle).contains('Oracle').click();
+
+    cy.getByTestId(accordionContent)
+      .getByTestId(providerName)
+      .and('contain', 'Another oracle');
+
+    cy.getByTestId(providerName).should('be.visible').click();
+    cy.getByTestId(dialogContent)
+      .eq(1)
+      .within(() => {
+        cy.getByTestId(blockExplorerLink).contains('Block explorer');
+        cy.getByTestId(githubLink).contains('Oracle repository');
+      });
+    cy.getByTestId(dialogClose).click();
+
+    cy.getByTestId(accordionContent)
+      .getByTestId(verifiedProofs)
+      .and('contain', '1');
+  });
+
+  it('settlement asset displayed', () => {
+    // 6002-MDET-206
+    cy.getByTestId(marketTitle).contains('Settlement asset').click();
+    cy.window().then((win) => {
+      cy.stub(win, 'prompt').returns('DISABLED WINDOW PROMPT');
+    });
+    validateMarketDataRow(0, 'ID', 'asset-id');
+    validateMarketDataRow(1, 'Type', 'ERC20');
+    validateMarketDataRow(2, 'Name', 'Euro');
+    validateMarketDataRow(3, 'Symbol', 'tEURO');
+    validateMarketDataRow(4, 'Decimals', '5');
+    validateMarketDataRow(5, 'Quantum', '1');
+    validateMarketDataRow(6, 'Status', 'Enabled');
+    validateMarketDataRow(7, 'Contract address', '0x0158…78a4');
+    validateMarketDataRow(8, 'Withdrawal threshold', '0.0005');
+    validateMarketDataRow(9, 'Lifetime limit', '1,230');
+    validateMarketDataRow(10, 'Infrastructure fee account balance', '0.00001');
+    validateMarketDataRow(11, 'Global reward pool account balance', '0.00002');
+  });
+
+  it('metadata displayed', () => {
+    // 6002-MDET-207
+    cy.getByTestId(marketTitle).contains('Metadata').click();
+
+    validateMarketDataRow(0, 'Formerly', '076BB86A5AA41E3E');
+    validateMarketDataRow(1, 'Base', 'BTC');
+    validateMarketDataRow(2, 'Quote', 'USD');
+    validateMarketDataRow(3, 'Class', 'fx/crypto');
+    validateMarketDataRow(4, 'Sector', 'crypto');
+  });
+
+  it('risk model displayed', () => {
+    // 6002-MDET-208
+    cy.getByTestId(marketTitle).contains('Risk model').click();
+    validateMarketDataRow(0, 'Tau', '0.0001140771161');
+    validateMarketDataRow(1, 'Risk Aversion Parameter', '0.01');
+  });
+
+  it('risk parameters displayed', () => {
+    // 6002-MDET-209
+    cy.getByTestId(marketTitle).contains('Risk parameters').click();
+    validateMarketDataRow(0, 'R', '0.016');
+    validateMarketDataRow(1, 'Sigma', '0.3');
+  });
+
+  it('risk factors displayed', () => {
+    // 6002-MDET-210
+    cy.getByTestId(marketTitle).contains('Risk factors').click();
+
+    validateMarketDataRow(0, 'Short', '0.008571790367285281');
+    validateMarketDataRow(1, 'Long', '0.008508132993273576');
+  });
+
+  it('price monitoring bounds displayed', () => {
+    // 6002-MDET-211
+    cy.getByTestId(marketTitle).contains('Price monitoring bounds 1').click();
+    cy.get('p.col-span-1').contains('99.99999% probability price bounds');
+    cy.get('p.col-span-1').contains('Within 43,200 seconds');
+    validateMarketDataRow(0, 'Highest Price', '7.97323 ');
+    validateMarketDataRow(1, 'Lowest Price', '6.54701 ');
+  });
+
+  it('liquidity monitoring parameters displayed', () => {
+    // 6002-MDET-212
+    cy.getByTestId(marketTitle)
+      .contains('Liquidity monitoring parameters')
+      .click();
+
+    validateMarketDataRow(0, 'Triggering Ratio', '0.7');
+    validateMarketDataRow(1, 'Time Window', '3,600');
+    validateMarketDataRow(2, 'Scaling Factor', '10');
+  });
+
+  it('liquidity displayed', () => {
+    // 6002-MDET-213
+    cy.getByTestId(marketTitle)
+      .contains(/Liquidity(?! m)/)
+      .click();
+
+    validateMarketDataRow(0, 'Target Stake', '10.00 tBTC');
+    validateMarketDataRow(1, 'Supplied Stake', '0.01 tBTC');
+    validateMarketDataRow(2, 'Market Value Proxy', '20.00 tBTC');
+    cy.getByTestId(liquidityLink).should(
+      'have.text',
+      'View liquidity provision table'
+    );
+  });
+
+  it('liquidity price range displayed', () => {
+    // 6002-MDET-214
+    cy.getByTestId(marketTitle).contains('Liquidity price range').click();
+
+    validateMarketDataRow(0, 'Liquidity Price Range', '2.00% of mid price');
+    validateMarketDataRow(1, 'Lowest Price', '45,204.362 BTC');
+    validateMarketDataRow(2, 'Highest Price', '47,049.438 BTC');
+  });
+
+  it('proposal displayed', () => {
+    // 6002-MDET-301
+    cy.getByTestId(marketTitle).contains('Proposal').click();
+
+    cy.getByTestId(accordionContent)
+      .find(`[data-testid="${externalLink}"]`)
+      .first()
+      .should('have.text', 'View governance proposal')
+      .and('have.attr', 'href')
+      .and('contain', '/proposals/market-0');
+    cy.getByTestId(accordionContent)
+      .find(`[data-testid="${externalLink}"]`)
+      .eq(1)
+      .should('have.text', 'Propose a change to market')
+      .and('have.attr', 'href')
+      .and('contain', '/proposals/propose/update-market');
+  });
+
+  afterEach('close toggle', () => {
+    cy.get('[data-state="open"]').then((tab) => {
+      if (tab) tab.find('button').trigger('click');
+    });
+  });
+
+  function validateMarketDataRow(
+    rowNumber: number,
+    name: string,
+    value: string
+  ) {
+    cy.getByTestId(row)
+      .eq(rowNumber)
+      .within(() => {
+        cy.get('dt').should('contain.text', name);
+        cy.get('dd').should('contain.text', value);
+      });
+  }
+});

apps/trading-e2e/src/integration/trading-deal-ticket-order.cy.ts

@@ -24,7 +24,9 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
 
   beforeEach(() => {
     cy.mockTradingPage();
-    cy.getByTestId('deal-ticket-fee-margin-required').click();
+    cy.getByTestId('deal-ticket-fee-margin-required').within(() => {
+      cy.get('button').click();
+    });
   });
 
   describe('limit order', () => {
@@ -109,7 +111,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
           'Total margin available100.01 tDAI'
         );
       });
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
     });
 
     it('must have current margin allocation', () => {
@@ -119,7 +120,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
           'Current margin allocation'
         );
       });
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
     });
 
     it('should open usage breakdown dialog when clicked on current margin allocation', () => {
@@ -128,7 +128,6 @@ describe('deal ticker order validation', { tags: '@smoke' }, () => {
       });
       cy.getByTestId('usage-breakdown').should('exist');
       cy.getByTestId('dialog-close').click();
-      cy.getByTestId('deal-ticket-fee-margin-required').click();
     });
   });
 });

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

@@ -9,7 +9,7 @@ import {
   testOrderAmendment,
 } from '../support/order-validation';
 
-const orderSymbol = 'instrument-code';
+const orderSymbol = 'market.tradableInstrument.instrument.code';
 const orderSize = 'size';
 const orderType = 'type';
 const orderStatus = 'status';
@@ -229,7 +229,10 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
       status: Schema.OrderStatus.STATUS_FILLED,
     });
     cy.getByTestId(`order-status-${orderId}`).should('have.text', 'Filled');
-    cy.get(`[col-id="${orderSymbol}"]`).contains('[title="Future"]', 'Futr');
+    cy.get('[col-id="market.tradableInstrument.instrument.code"]').contains(
+      '[title="Future"]',
+      'Futr'
+    );
   });
 
   it('must see a rejected order', () => {

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

@@ -86,8 +86,8 @@ describe('trades', { tags: '@smoke' }, () => {
   });
 
   it('copy price to deal ticket form', () => {
+    cy.getByTestId('Order').click();
     // 6005-THIS-007
-    cy.getByTestId('order-type-Limit').click();
     cy.get(colIdPrice).last().should('be.visible').click();
     cy.getByTestId('order-price').should('have.value', '171.16898');
   });

apps/trading-e2e/src/integration/wallet-vega.cy.ts

@@ -10,10 +10,10 @@ const dialogContent = 'dialog-content';
 describe('connect vega wallet', { tags: '@smoke', testIsolation: true }, () => {
   beforeEach(() => {
     // Using portfolio page as it requires vega wallet connection
+    cy.visit('/#/portfolio');
     cy.mockTradingPage();
     cy.mockSubscription();
     cy.setOnBoardingViewed();
-    cy.visit('/#/portfolio');
     cy.get('[data-testid="pathname-/portfolio"]').should('exist');
   });
 

apps/trading/.env

@@ -1,30 +1,27 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_SENTRY_DSN=https://2ffce43721964aafa78277c50654ece4@o286262.ingest.sentry.io/6300613
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
-NX_VEGA_ENV=TESTNET
-NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
+NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
+NX_VEGA_ENV=STAGNET1
+NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://console.vega.xyz\",\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://trading.stagnet1.vega.rocks\"}
 NX_VEGA_TOKEN_URL=https://governance.fairground.wtf
 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_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
-NX_ICEBERG_ORDERS=true
+# NX_ICEBERG_ORDERS
 # NX_PRODUCT_PERPETUALS
 NX_METAMASK_SNAPS=true
 
-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket

apps/trading/.env.mainnet

@@ -15,15 +15,15 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-mainnet/codfcglpplgmmlokgilfkpcjnmkbfiel
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-mainnet
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
+# TAG name of the current app version - TODO: bump to the latest upon release
+NX_APP_VERSION=v0.21.0-core-0.72.14
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket

apps/trading/.env.stagnet1

@@ -15,8 +15,6 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

apps/trading/.env.testnet

@@ -16,15 +16,13 @@ NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true
 NX_STOP_ORDERS=true
 NX_ICEBERG_ORDERS=true
 # NX_PRODUCT_PERPETUALS
-NX_METAMASK_SNAPS=true
+NX_METAMASK_SNAPS=false
 
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket

apps/trading/.env.validators-testnet

@@ -17,7 +17,6 @@ NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks
 
 NX_CHROME_EXTENSION_URL=https://chrome.google.com/webstore/detail/vega-wallet-fairground/nmmjkiafpmphlikhefgjbblebfgclikn
 NX_MOZILLA_EXTENSION_URL=https://addons.mozilla.org/firefox/addon/vega-wallet-fairground
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
 
 # Cosmic elevator flags
 NX_SUCCESSOR_MARKETS=true

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

@@ -1,5 +0,0 @@
-import MarketPage from '../market';
-
-export const ClosedMarketPage = () => {
-  return <MarketPage closed />;
-};

apps/trading/client-pages/closed-market/index.ts

@@ -1 +0,0 @@
-export { ClosedMarketPage as default } from './closed-market';

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

@@ -1,58 +1,18 @@
 import { DepositContainer } from '@vegaprotocol/deposits';
+import { GetStarted } from '../../components/welcome-dialog';
 import { t } from '@vegaprotocol/i18n';
-import { Intent, TradingAnchorButton } from '@vegaprotocol/ui-toolkit';
-import { GetStartedCheckList } from '../../components/welcome-dialog';
-import {
-  useGetOnboardingStep,
-  useOnboardingStore,
-  OnboardingStep,
-} from '../../components/welcome-dialog/use-get-onboarding-step';
-import { Links, Routes } from '../../pages/client-router';
-import classNames from 'classnames';
 
 export const Deposit = () => {
   return (
-    <div className="max-w-[600px] px-4 py-8 mx-auto lg:px-8">
-      <h1 className="mb-6 text-4xl uppercase xl:text-5xl font-alpha calt">
-        {t('Deposit')}
-      </h1>
-      <div className="flex flex-col gap-6">
-        <DepositContainer />
-        <DepositGetStarted />
-      </div>
-    </div>
-  );
-};
-
-const DepositGetStarted = () => {
-  const onboardingDismissed = useOnboardingStore((store) => store.dismissed);
-  const dismiss = useOnboardingStore((store) => store.dismiss);
-  const step = useGetOnboardingStep();
-  const wrapperClasses = classNames(
-    'flex flex-col py-4 px-6 gap-4 rounded',
-    'bg-vega-blue-300 dark:bg-vega-blue-700',
-    'border border-vega-blue-350 dark:border-vega-blue-650'
-  );
-
-  // Dont show unless still onboarding
-  if (onboardingDismissed) {
-    return null;
-  }
-
-  return (
-    <div className="pt-6 border-t border-default">
-      <div className={wrapperClasses}>
-        <h3 className="text-lg">{t('Get started')}</h3>
-        <GetStartedCheckList />
-        {step > OnboardingStep.ONBOARDING_DEPOSIT_STEP && (
-          <TradingAnchorButton
-            href={Links[Routes.HOME]()}
-            onClick={() => dismiss()}
-            intent={Intent.Info}
-          >
-            {t('Start trading')}
-          </TradingAnchorButton>
-        )}
+    <div className="py-16 px-8 flex w-full justify-center">
+      <div className="lg:min-w-[700px] min-w-[300px] max-w-[700px]">
+        <h1 className="text-4xl xl:text-5xl uppercase font-alpha calt">
+          {t('Deposit')}
+        </h1>
+        <div className="mt-10">
+          <DepositContainer />
+          <GetStarted />
+        </div>
       </div>
     </div>
   );

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

@@ -1,16 +1,20 @@
 import { useEffect } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
+import { marketsWithDataProvider } from '@vegaprotocol/markets';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { Links, Routes } from '../../pages/client-router';
 import { useGlobalStore } from '../../stores';
-import { useTopTradedMarkets } from '../../lib/hooks/use-top-traded-markets';
 
-// The home pages only purpose is to redirect to the users last market,
-// the top traded if they are new, or fall back to the list of markets.
-// Thats why we just render a loader here
 export const Home = () => {
   const navigate = useNavigate();
-  const { data } = useTopTradedMarkets();
+  // The default market selected in the platform behind the overlay
+  // should be the oldest market that is currently trading in continuous mode(i.e. not in auction).
+  const { data, error, loading } = useDataProvider({
+    dataProvider: marketsWithDataProvider,
+    variables: undefined,
+  });
+  const update = useGlobalStore((store) => store.update);
   const marketId = useGlobalStore((store) => store.marketId);
 
   useEffect(() => {
@@ -28,11 +32,12 @@ export const Home = () => {
         navigate(Links[Routes.MARKETS]());
       }
     }
-  }, [marketId, data, navigate]);
+  }, [marketId, data, navigate, update]);
 
   return (
-    <Splash>
-      <Loader />
-    </Splash>
+    <AsyncRenderer data={data} loading={loading} error={error}>
+      {/* Render a loading and error state but we will redirect if markets are found */}
+      {null}
+    </AsyncRenderer>
   );
 };

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

@@ -11,8 +11,6 @@ import { TradePanels } from './trade-panels';
 import { useNavigate, useParams } from 'react-router-dom';
 import { Links, Routes } from '../../pages/client-router';
 import { ViewType, useSidebar } from '../../components/sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
-import { MarketState } from '@vegaprotocol/types';
 
 const calculatePrice = (markPrice?: string, decimalPlaces?: number) => {
   return markPrice && decimalPlaces
@@ -57,12 +55,10 @@ const TitleUpdater = ({
   return null;
 };
 
-export const MarketPage = ({ closed }: { closed?: boolean }) => {
+export const MarketPage = () => {
   const { marketId } = useParams();
   const navigate = useNavigate();
-  const currentRouteId = useGetCurrentRouteId();
-  const { setViews, getView } = useSidebar();
-  const view = getView(currentRouteId);
+  const { init, view, setView } = useSidebar();
   const { screenSize } = useScreenDimensions();
   const largeScreen = ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize);
   const update = useGlobalStore((store) => store.update);
@@ -71,33 +67,17 @@ export const MarketPage = ({ closed }: { closed?: boolean }) => {
   const { data, error, loading } = useMarket(marketId);
 
   useEffect(() => {
-    if (
-      data?.state &&
-      [
-        MarketState.STATE_SETTLED,
-        MarketState.STATE_TRADING_TERMINATED,
-      ].includes(data.state) &&
-      currentRouteId !== Routes.CLOSED_MARKETS &&
-      marketId
-    ) {
-      navigate(Links[Routes.CLOSED_MARKETS](marketId));
-    }
-  }, [data?.state, currentRouteId, navigate, marketId]);
-
-  useEffect(() => {
-    if (data?.id && data.id !== lastMarketId && !closed) {
+    if (data?.id && data.id !== lastMarketId) {
       update({ marketId: data.id });
     }
-  }, [update, lastMarketId, data?.id, closed]);
+  }, [update, lastMarketId, data?.id]);
 
+  // Make sidebar open on deal ticket by default
   useEffect(() => {
-    if (largeScreen && view === undefined) {
-      setViews(
-        { type: closed ? ViewType.Info : ViewType.Order },
-        currentRouteId
-      );
+    if (init && view === null) {
+      setView({ type: ViewType.Order });
     }
-  }, [setViews, view, currentRouteId, largeScreen, closed]);
+  }, [init, view, setView]);
 
   const tradeView = useMemo(() => {
     if (largeScreen) {

apps/trading/client-pages/market/trade-grid.tsx

@@ -56,7 +56,6 @@ const MainGrid = memo(
                 <Tabs storageKey="console-trade-grid-main-left">
                   <Tab
                     id="chart"
-                    overflowHidden
                     name={t('Chart')}
                     menu={<TradingViews.candles.menu />}
                   >
@@ -73,7 +72,7 @@ const MainGrid = memo(
             </ResizableGridPanel>
             <ResizableGridPanel
               minSize={200}
-              preferredSize={sizesMiddle[1] || 275}
+              preferredSize={sizesMiddle[1] || 300}
             >
               <TradeGridChild>
                 <Tabs storageKey="console-trade-grid-main-right">
@@ -128,7 +127,7 @@ const MainGrid = memo(
                 </Tab>
               ) : null}
               <Tab id="fills" name={t('Fills')}>
-                <TradingViews.fills.component />
+                <TradingViews.fills.component marketId={marketId} />
               </Tab>
               <Tab
                 id="accounts"
@@ -181,7 +180,7 @@ const TradeGridChild = ({ children }: TradeGridChildProps) => {
         {({ width, height }) => (
           <div
             style={{ width, height }}
-            className="border rounded-sm border-default"
+            className="border border-default rounded-sm"
           >
             {children}
           </div>

apps/trading/client-pages/markets/closed.spec.tsx

@@ -1,4 +1,4 @@
-import { act, render, screen, within } from '@testing-library/react';
+import { act, render, screen, within, waitFor } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import { Closed } from './closed';
 import { MarketStateMapping, PropertyKeyType } from '@vegaprotocol/types';
@@ -10,21 +10,55 @@ import type {
   OracleSpecDataConnectionQuery,
   MarketsDataQuery,
   MarketsQuery,
+  SuccessorMarketIdsQuery,
 } from '@vegaprotocol/markets';
 import {
   OracleSpecDataConnectionDocument,
   MarketsDataDocument,
   MarketsDocument,
+  SuccessorMarketIdsDocument,
 } from '@vegaprotocol/markets';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+import { FLAGS } from '@vegaprotocol/environment';
 import {
   createMarketFragment,
   marketsQuery,
   marketsDataQuery,
   createMarketsDataFragment,
 } from '@vegaprotocol/mock';
+import type { FeatureFlags } from '@vegaprotocol/environment';
+
+jest.mock('@vegaprotocol/markets', () => ({
+  ...jest.requireActual('@vegaprotocol/markets'),
+  useSuccessorMarket: (marketId: string) =>
+    marketId === 'include-0'
+      ? {
+          data: {
+            id: 'successorMarketID',
+            state: 'STATE_ACTIVE',
+            tradableInstrument: {
+              instrument: {
+                name: 'Successor Market Name',
+                code: 'SuccessorCode',
+              },
+            },
+          },
+        }
+      : { data: undefined },
+}));
+
+jest.mock('@vegaprotocol/environment', () => {
+  const actual = jest.requireActual('@vegaprotocol/environment');
+  return {
+    ...actual,
+    FLAGS: {
+      ...actual.FLAGS,
+      SUCCESSOR_MARKETS: true,
+    } as FeatureFlags,
+  };
+});
 
 describe('Closed', () => {
   let originalNow: typeof Date.now;
@@ -184,8 +218,10 @@ describe('Closed', () => {
     const headers = screen.getAllByRole('columnheader');
     const expectedHeaders = [
       'Market',
+      'Description',
       'Status',
       'Settlement date',
+      'Successor market',
       'Best bid',
       'Best offer',
       'Mark price',
@@ -199,8 +235,10 @@ describe('Closed', () => {
     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(
@@ -302,26 +340,43 @@ describe('Closed', () => {
       .getAllByRole('gridcell')
       .filter((cell) => cell.getAttribute('col-id') === 'code')
       .map((cell) => {
-        const marketCode = within(cell).getByTestId('stack-cell-primary');
-        return marketCode.textContent;
+        const marketId = within(cell)
+          .getByTestId('market-code')
+          .getAttribute('data-market-id');
+        return marketId;
       });
-    expect(cells).toEqual(
-      expectedRows.map((m) => m.node.tradableInstrument.instrument.code)
-    );
+    expect(cells).toEqual(expectedRows.map((m) => m.node.id));
   });
 
   it('successor marked should be visible', async () => {
-    const marketsWithSuccessorID = [
+    const mixedMarkets = [
       {
         __typename: 'MarketEdge' as const,
         node: createMarketFragment({
           id: 'include-0',
           state: MarketState.STATE_SETTLED,
-          successorMarketID: 'successor',
         }),
       },
+      {
+        __typename: 'MarketEdge' as const,
+        node: {
+          ...createMarketFragment({
+            id: 'successorMarketID',
+            state: MarketState.STATE_ACTIVE,
+          }),
+          tradableInstrument: {
+            ...createMarketFragment().tradableInstrument,
+            instrument: {
+              ...createMarketFragment().tradableInstrument.instrument,
+              id: 'successorAssset',
+              name: 'Successor Market Name',
+              code: 'SuccessorCode',
+            },
+          },
+        },
+      },
     ];
-    const mockWithSuccessors: MockedResponse<MarketsQuery> = {
+    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
       request: {
         query: MarketsDocument,
       },
@@ -329,17 +384,42 @@ describe('Closed', () => {
         data: {
           marketsConnection: {
             __typename: 'MarketConnection',
-            edges: marketsWithSuccessorID,
+            edges: mixedMarkets,
           },
         },
       },
     };
-
-    await act(async () => {
+    const successorMarketsMock: MockedResponse<SuccessorMarketIdsQuery> = {
+      request: {
+        query: SuccessorMarketIdsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: [
+              {
+                node: {
+                  id: 'include-0',
+                  successorMarketID: 'successorMarketID',
+                  parentMarketID: '',
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+    await act(() => {
       render(
         <MemoryRouter>
           <MockedProvider
-            mocks={[mockWithSuccessors, marketsDataMock, oracleDataMock]}
+            mocks={[
+              mixedMarketsMock,
+              marketsDataMock,
+              oracleDataMock,
+              successorMarketsMock,
+            ]}
           >
             <VegaWalletContext.Provider
               value={{ pubKey } as VegaWalletContextShape}
@@ -351,15 +431,122 @@ describe('Closed', () => {
       );
     });
 
-    const container = within(
-      document.querySelector('.ag-center-cols-container') as HTMLElement
-    );
-    const cell = container.getAllByRole('gridcell', {
-      name: (_name, element) => element.getAttribute('col-id') === 'code',
-    })[0];
+    await waitFor(() => {
+      expect(
+        screen.getByRole('button', { name: /^SuccessorCode/ })
+      ).toBeInTheDocument();
+    });
+    expect(
+      screen.getByRole('columnheader', {
+        name: (_name, element) =>
+          element.getAttribute('col-id') === 'successorMarket',
+      })
+    ).toBeInTheDocument();
+    screen
+      .getAllByRole('gridcell', {
+        name: (_name, element) =>
+          element.getAttribute('col-id') === 'successorMarket',
+      })
+      .forEach((element) => {
+        expect(element.querySelector('[title="Future"]')?.textContent).toEqual(
+          'Futr'
+        );
+      });
+  });
 
-    expect(within(cell).getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'PRNT'
+  it('feature flag should hide successors', async () => {
+    const mockedFlags = jest.mocked(FLAGS);
+    mockedFlags.SUCCESSOR_MARKETS = false;
+
+    const mixedMarkets = [
+      {
+        __typename: 'MarketEdge' as const,
+        node: createMarketFragment({
+          id: 'include-0',
+          state: MarketState.STATE_SETTLED,
+        }),
+      },
+      {
+        __typename: 'MarketEdge' as const,
+        node: {
+          ...createMarketFragment({
+            id: 'successorMarketID',
+            state: MarketState.STATE_ACTIVE,
+          }),
+          tradableInstrument: {
+            ...createMarketFragment().tradableInstrument,
+            instrument: {
+              ...createMarketFragment().tradableInstrument.instrument,
+              id: 'successorAssset',
+              name: 'Successor Market Name',
+              code: 'SuccessorCode',
+            },
+          },
+        },
+      },
+    ];
+    const mixedMarketsMock: MockedResponse<MarketsQuery> = {
+      request: {
+        query: MarketsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: mixedMarkets,
+          },
+        },
+      },
+    };
+    const successorMarketsMock: MockedResponse<SuccessorMarketIdsQuery> = {
+      request: {
+        query: SuccessorMarketIdsDocument,
+      },
+      result: {
+        data: {
+          marketsConnection: {
+            __typename: 'MarketConnection',
+            edges: [
+              {
+                node: {
+                  id: 'include-0',
+                  successorMarketID: 'successorMarketID',
+                  parentMarketID: '',
+                },
+              },
+            ],
+          },
+        },
+      },
+    };
+    render(
+      <MemoryRouter>
+        <MockedProvider
+          mocks={[
+            mixedMarketsMock,
+            marketsDataMock,
+            oracleDataMock,
+            successorMarketsMock,
+          ]}
+        >
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Closed />
+          </VegaWalletContext.Provider>
+        </MockedProvider>
+      </MemoryRouter>
     );
+    await waitFor(() => {
+      expect(
+        screen.getByRole('columnheader', {
+          name: (_name, element) =>
+            element.getAttribute('col-id') === 'settlementDate',
+        })
+      ).toBeInTheDocument();
+    });
+    screen.getAllByRole('columnheader').forEach((element) => {
+      expect(element.getAttribute('col-id')).not.toEqual('successorMarket');
+    });
   });
 });

apps/trading/client-pages/markets/closed.tsx

@@ -4,10 +4,13 @@ import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGrid, COL_DEFS } from '@vegaprotocol/datagrid';
+import {
+  AgGridLazy as AgGrid,
+  COL_DEFS,
+  MarketNameCell,
+} from '@vegaprotocol/datagrid';
 import { useMemo } from 'react';
 import { t } from '@vegaprotocol/i18n';
-import type { ProductType } from '@vegaprotocol/types';
 import { MarketState, MarketStateMapping } from '@vegaprotocol/types';
 import {
   addDecimalsFormatNumber,
@@ -17,15 +20,17 @@ import type {
   DataSourceFilterFragment,
   MarketMaybeWithData,
 } from '@vegaprotocol/markets';
-import { closedMarketsWithDataProvider } from '@vegaprotocol/markets';
+import {
+  MarketActionsDropdown,
+  closedMarketsWithDataProvider,
+} from '@vegaprotocol/markets';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
+import type { ColDef } from 'ag-grid-community';
+import { FLAGS } from '@vegaprotocol/environment';
 import { SettlementDateCell } from './settlement-date-cell';
 import { SettlementPriceCell } from './settlement-price-cell';
 import { useDataProvider } from '@vegaprotocol/data-provider';
-import { MarketActionsDropdown } from './market-table-actions';
-import { MarketCodeCell } from './market-code-cell';
-import type { CellClickedEvent } from 'ag-grid-community';
-import { useClosedMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+import { SuccessorMarketRenderer } from './successor-market-cell';
 
 type SettlementAsset =
   MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
@@ -46,9 +51,7 @@ interface Row {
   setlementDataSourceFilter: DataSourceFilterFragment | undefined;
   tradingTerminationOracleId: string;
   settlementAsset: SettlementAsset;
-  productType: ProductType | undefined;
-  successorMarketID: string | null | undefined;
-  parentMarketID: string | null | undefined;
+  productType: string;
 }
 
 export const Closed = () => {
@@ -92,19 +95,16 @@ export const Closed = () => {
       tradingTerminationOracleId:
         instrument.product.dataSourceSpecForTradingTermination.id,
       settlementAsset: instrument.product.settlementAsset,
-      productType: instrument.product.__typename,
-      successorMarketID: market.successorMarketID,
-      parentMarketID: market.parentMarketID,
+      productType: instrument.product.__typename || '',
     };
 
     return row;
   });
-
-  return <ClosedMarketsDataGrid rowData={rowData} error={error} />;
-};
-
-const components = {
-  MarketCodeCell,
+  return (
+    <div className="h-full relative">
+      <ClosedMarketsDataGrid rowData={rowData} error={error} />
+    </div>
+  );
 };
 
 const ClosedMarketsDataGrid = ({
@@ -114,15 +114,18 @@ const ClosedMarketsDataGrid = ({
   rowData: Row[];
   error: Error | undefined;
 }) => {
-  const handleOnSelect = useClosedMarketClickHandler();
   const openAssetDialog = useAssetDetailsDialogStore((store) => store.open);
 
   const colDefs = useMemo(() => {
-    return [
+    const cols: ColDef[] = compact([
       {
         headerName: t('Market'),
         field: 'code',
-        cellRenderer: 'MarketCodeCell',
+        cellRenderer: 'MarketNameCell',
+      },
+      {
+        headerName: t('Description'),
+        field: 'name',
       },
       {
         headerName: t('Status'),
@@ -173,6 +176,12 @@ const ClosedMarketsDataGrid = ({
           },
         },
       },
+      FLAGS.SUCCESSOR_MARKETS && {
+        headerName: t('Successor market'),
+        field: 'id',
+        colId: 'successorMarket',
+        cellRenderer: 'SuccessorMarketRenderer',
+      },
       {
         headerName: t('Best bid'),
         field: 'bestBidPrice',
@@ -254,13 +263,12 @@ const ClosedMarketsDataGrid = ({
             <MarketActionsDropdown
               marketId={data.id}
               assetId={data.settlementAsset.id}
-              successorMarketID={data.successorMarketID}
-              parentMarketID={data.parentMarketID}
             />
           );
         },
       },
-    ];
+    ]);
+    return cols;
   }, [openAssetDialog]);
 
   return (
@@ -268,30 +276,8 @@ const ClosedMarketsDataGrid = ({
       rowData={rowData}
       columnDefs={colDefs}
       getRowId={({ data }) => data.id}
+      components={{ SuccessorMarketRenderer, MarketNameCell }}
       overlayNoRowsTemplate={error ? error.message : t('No markets')}
-      components={components}
-      rowHeight={45}
-      onCellClicked={({ data, column, event }: CellClickedEvent<Row>) => {
-        if (!data) return;
-
-        // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
-        const colId = column.getColId();
-
-        if (
-          [
-            'settlementDate',
-            'settlementDataOracleId',
-            'settlementAsset',
-            'market-actions',
-          ].includes(colId)
-        ) {
-          return;
-        }
-
-        // @ts-ignore metaKey exists
-        handleOnSelect(data.id, event ? event.metaKey : false);
-      }}
     />
   );
 };

apps/trading/client-pages/markets/market-code-cell.spec.tsx

@@ -1,82 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { ProductTypeShortName } from '@vegaprotocol/types';
-import type { MarketCodeCellProps } from './market-code-cell';
-import { MarketCodeCell } from './market-code-cell';
-
-describe('MarketCodeCell', () => {
-  const renderComponent = (props: MarketCodeCellProps) => {
-    return render(<MarketCodeCell {...props} />);
-  };
-
-  it('renders SCCR if the market is a successor', () => {
-    const productType = 'Future';
-    const code = 'code';
-    const props = {
-      value: 'code',
-      data: {
-        productType,
-        parentMarketID: 'foo',
-        successorMarketID: undefined,
-      },
-    } as const;
-    renderComponent(props);
-    expect(screen.getByTestId('stack-cell-primary')).toHaveTextContent(code);
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      ProductTypeShortName[productType]
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'SCCR'
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).not.toHaveTextContent(
-      'PRNT'
-    );
-  });
-
-  it('renders PRNT if the market is a parent', () => {
-    const productType = 'Future';
-    const code = 'code';
-    const props = {
-      value: 'code',
-      data: {
-        productType,
-        parentMarketID: undefined,
-        successorMarketID: 'foo',
-      },
-    } as const;
-    renderComponent(props);
-    expect(screen.getByTestId('stack-cell-primary')).toHaveTextContent(code);
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      ProductTypeShortName[productType]
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'PRNT'
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).not.toHaveTextContent(
-      'SCCR'
-    );
-  });
-
-  it('renders both SCCR and PRNT if the market is both a parent and a successor', () => {
-    const productType = 'Future';
-    const code = 'code';
-    const props = {
-      value: 'code',
-      data: {
-        productType,
-        parentMarketID: 'foo',
-        successorMarketID: 'bar',
-      },
-    } as const;
-    renderComponent(props);
-    expect(screen.getByTestId('stack-cell-primary')).toHaveTextContent(code);
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      ProductTypeShortName[productType]
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'PRNT'
-    );
-    expect(screen.getByTestId('stack-cell-secondary')).toHaveTextContent(
-      'SCCR'
-    );
-  });
-});

apps/trading/client-pages/markets/market-code-cell.tsx

@@ -1,51 +0,0 @@
-import compact from 'lodash/compact';
-import type { ProductType } from '@vegaprotocol/types';
-import { ProductTypeMapping, ProductTypeShortName } from '@vegaprotocol/types';
-import { StackedCell } from '@vegaprotocol/datagrid';
-import { t } from '@vegaprotocol/i18n';
-
-export interface MarketCodeCellProps {
-  value: string | undefined; // market code
-  data: {
-    productType: ProductType | undefined;
-    parentMarketID: string | null | undefined;
-    successorMarketID: string | null | undefined;
-  };
-}
-
-export const MarketCodeCell = ({ value, data }: MarketCodeCellProps) => {
-  if (!value || !data || !data.productType) return null;
-
-  const infoSpanClasses =
-    'mr-1 pr-1 uppercase border-r last:pr-0 last:mr-0 last:border-r-0 border-vega-clight-200 dark:border-vega-cdark-200';
-
-  const info = compact([
-    <span
-      className={infoSpanClasses}
-      key="productType"
-      title={ProductTypeMapping[data.productType]}
-    >
-      {ProductTypeShortName[data.productType]}
-    </span>,
-    data.parentMarketID && (
-      <span
-        className={infoSpanClasses}
-        key="successor"
-        title={t('Successor of a market')}
-      >
-        {t('SCCR')}
-      </span>
-    ),
-    data.successorMarketID && (
-      <span
-        className={infoSpanClasses}
-        key="parent"
-        title={t('Parent of a market')}
-      >
-        {t('PRNT')}
-      </span>
-    ),
-  ]);
-
-  return <StackedCell primary={value} secondary={info} />;
-};

apps/trading/client-pages/markets/market-list-table.tsx

@@ -1,35 +0,0 @@
-import type { TypedDataAgGrid } from '@vegaprotocol/datagrid';
-import { AgGrid, PriceFlashCell } from '@vegaprotocol/datagrid';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
-import { useColumnDefs } from './use-column-defs';
-
-export const getRowId = ({ data }: { data: { id: string } }) => data.id;
-
-const defaultColDef = {
-  sortable: true,
-  filter: true,
-  filterParams: { buttons: ['reset'] },
-};
-
-const components = {
-  PriceFlashCell,
-};
-
-type Props = TypedDataAgGrid<MarketMaybeWithData>;
-
-export const MarketListTable = (props: Props) => {
-  const columnDefs = useColumnDefs();
-
-  return (
-    <AgGrid
-      getRowId={getRowId}
-      defaultColDef={defaultColDef}
-      columnDefs={columnDefs}
-      components={components}
-      rowHeight={45}
-      {...props}
-    />
-  );
-};
-
-export default MarketListTable;

apps/trading/client-pages/markets/markets-page.tsx

@@ -6,7 +6,7 @@ import {
   Tab,
   TradingAnchorButton,
 } from '@vegaprotocol/ui-toolkit';
-import { OpenMarkets } from './open-markets';
+import { Markets } from './markets';
 import { Proposed } from './proposed';
 import { usePageTitleStore } from '../../stores';
 import { Closed } from './closed';
@@ -21,8 +21,8 @@ export const MarketsPage = () => {
     updateTitle: store.updateTitle,
   }));
 
-  const governanceLink = useLinks(DApp.Governance);
-  const externalLink = governanceLink(TOKEN_NEW_MARKET_PROPOSAL);
+  const tokenLink = useLinks(DApp.Token);
+  const externalLink = tokenLink(TOKEN_NEW_MARKET_PROPOSAL);
 
   useEffect(() => {
     updateTitle(titlefy(['Markets']));
@@ -33,7 +33,7 @@ export const MarketsPage = () => {
       <div className="h-full my-1 border rounded-sm border-default">
         <Tabs storageKey="console-markets">
           <Tab id="open-markets" name={t('Open markets')}>
-            <OpenMarkets />
+            <Markets />
           </Tab>
           <Tab
             id="proposed-markets"

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

@@ -0,0 +1,13 @@
+import { MarketsContainer } from '@vegaprotocol/markets';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+import { SuccessorMarketRenderer } from './successor-market-cell';
+
+export const Markets = () => {
+  const handleOnSelect = useMarketClickHandler();
+  return (
+    <MarketsContainer
+      onSelect={handleOnSelect}
+      SuccessorMarketRenderer={SuccessorMarketRenderer}
+    />
+  );
+};

apps/trading/client-pages/markets/open-markets.tsx

@@ -1,63 +0,0 @@
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { MarketMaybeWithData } from '@vegaprotocol/markets';
-import { marketListProvider } from '@vegaprotocol/markets';
-import { useEffect } from 'react';
-import { t } from '@vegaprotocol/i18n';
-import type { CellClickedEvent } from 'ag-grid-community';
-import MarketListTable from './market-list-table';
-import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
-import { Interval } from '@vegaprotocol/types';
-import { useYesterday } from '@vegaprotocol/react-helpers';
-
-const POLLING_TIME = 2000;
-
-export const OpenMarkets = () => {
-  const handleOnSelect = useMarketClickHandler();
-  const yesterday = useYesterday();
-  const { data, error, reload } = useDataProvider({
-    dataProvider: marketListProvider,
-    variables: {
-      since: new Date(yesterday).toISOString(),
-      interval: Interval.INTERVAL_I1H,
-    },
-  });
-
-  useEffect(() => {
-    const interval = setInterval(() => {
-      reload();
-    }, POLLING_TIME);
-    return () => {
-      clearInterval(interval);
-    };
-  }, [reload]);
-
-  return (
-    <MarketListTable
-      rowData={data}
-      onCellClicked={({
-        data,
-        column,
-        event,
-      }: CellClickedEvent<MarketMaybeWithData>) => {
-        if (!data) return;
-
-        // prevent navigating to the market page if any of the below cells are clicked
-        // event.preventDefault or event.stopPropagation dont seem to apply for aggird
-        const colId = column.getColId();
-
-        if (
-          [
-            'tradableInstrument.instrument.product.settlementAsset.symbol',
-            'market-actions',
-          ].includes(colId)
-        ) {
-          return;
-        }
-
-        // @ts-ignore metaKey exists
-        handleOnSelect(data.id, event ? event.metaKey : false);
-      }}
-      overlayNoRowsTemplate={error ? error.message : t('No markets')}
-    />
-  );
-};

apps/trading/client-pages/markets/oracle-status.tsx

@@ -1,46 +0,0 @@
-import { useEnvironment } from '@vegaprotocol/environment';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@blueprintjs/icons';
-import type { Market } from '@vegaprotocol/markets';
-import {
-  getMatchingOracleProvider,
-  getVerifiedStatusIcon,
-  useOracleProofs,
-} from '@vegaprotocol/markets';
-
-export const OracleStatus = ({
-  dataSourceSpecForSettlementData,
-  dataSourceSpecForTradingTermination,
-}: Pick<
-  Market['tradableInstrument']['instrument']['product'],
-  'dataSourceSpecForSettlementData' | 'dataSourceSpecForTradingTermination'
->) => {
-  const { ORACLE_PROOFS_URL } = useEnvironment();
-  const { data: providers } = useOracleProofs(ORACLE_PROOFS_URL);
-
-  if (providers) {
-    const settlementDataProvider = getMatchingOracleProvider(
-      dataSourceSpecForSettlementData.data,
-      providers
-    );
-    const tradingTerminationDataProvider = getMatchingOracleProvider(
-      dataSourceSpecForTradingTermination.data,
-      providers
-    );
-    let maliciousOracleProvider = null;
-
-    if (settlementDataProvider?.oracle.status !== 'GOOD') {
-      maliciousOracleProvider = settlementDataProvider;
-    } else if (tradingTerminationDataProvider?.oracle.status !== 'GOOD') {
-      maliciousOracleProvider = tradingTerminationDataProvider;
-    }
-
-    if (!maliciousOracleProvider) return null;
-
-    const { icon } = getVerifiedStatusIcon(maliciousOracleProvider);
-
-    return <Icon size={3} name={icon as IconName} className="ml-1" />;
-  }
-
-  return null;
-};

apps/trading/client-pages/markets/parent-market-cell.tsx

@@ -1,15 +0,0 @@
-import { useMarketsMapProvider } from '@vegaprotocol/markets';
-
-export const ParentMarketCell = ({
-  value,
-}: {
-  value: string; // parentMarketId
-}) => {
-  const { data, loading } = useMarketsMapProvider();
-
-  if (loading) return null;
-
-  if (!data || !data[value]) return <span>-</span>;
-
-  return <div>{data[value].tradableInstrument.instrument.code}</div>;
-};

apps/trading/client-pages/markets/proposed.tsx

@@ -1,10 +1,6 @@
 import { ProposalsList } from '@vegaprotocol/proposals';
-import { ParentMarketCell } from './parent-market-cell';
-
-const cellRenderers = {
-  ParentMarketCell,
-};
+import { SuccessorMarketRenderer } from './successor-market-cell';
 
 export const Proposed = () => {
-  return <ProposalsList cellRenderers={cellRenderers} />;
+  return <ProposalsList SuccessorMarketRenderer={SuccessorMarketRenderer} />;
 };

apps/trading/client-pages/markets/successor-market-cell.spec.tsx

@@ -0,0 +1,190 @@
+import { render, screen, act, waitFor } from '@testing-library/react';
+import { MockedProvider } from '@apollo/client/testing';
+import userEvent from '@testing-library/user-event';
+import type { Market } from '@vegaprotocol/markets';
+import { SuccessorMarketRenderer } from './successor-market-cell';
+import {
+  MarketsDocument,
+  SuccessorMarketIdsDocument,
+} from '@vegaprotocol/markets';
+import { createMarketFragment } from '@vegaprotocol/mock';
+
+const mockSuccessorsQuery = [
+  {
+    id: 'market1',
+    parentMarketID: 'parentMarket1',
+    successorMarketID: 'successorMarket1',
+  },
+  { id: 'market2', parentMarketID: 'parentMarket2' },
+  { id: 'market3', successorMarketID: 'successorMarket3' },
+];
+const parentMarket1 = {
+  id: 'parentMarket1',
+  tradableInstrument: {
+    instrument: { code: 'code parent 1', id: '1' },
+  },
+} as unknown as Market;
+const successorMarket1 = {
+  id: 'successorMarket1',
+  tradableInstrument: {
+    instrument: { code: 'code successor 1', id: '2' },
+  },
+} as unknown as Market;
+const parentMarket2 = {
+  id: 'parentMarket2',
+  tradableInstrument: {
+    instrument: { code: 'code parent 2', id: '3' },
+  },
+} as unknown as Market;
+const successorMarket3 = {
+  id: 'successorMarket3',
+  tradableInstrument: {
+    instrument: { code: 'code successor 3', id: '4' },
+  },
+} as unknown as Market;
+
+const mockMarkets = [
+  parentMarket1,
+  successorMarket1,
+  parentMarket2,
+  successorMarket3,
+];
+
+const mockClickHandler = jest.fn();
+jest.mock('../../lib/hooks/use-market-click-handler', () => ({
+  useMarketClickHandler: jest.fn().mockImplementation(() => mockClickHandler),
+}));
+
+const marketMock = {
+  request: {
+    query: MarketsDocument,
+    variables: undefined,
+  },
+  result: {
+    data: {
+      marketsConnection: {
+        edges: mockMarkets.map((item) => ({
+          node: {
+            ...createMarketFragment(item),
+          },
+        })),
+      },
+    },
+  },
+};
+
+const successorMock = {
+  request: {
+    query: SuccessorMarketIdsDocument,
+  },
+  result: {
+    data: {
+      marketsConnection: {
+        edges: mockSuccessorsQuery.map((item) => ({
+          node: {
+            ...item,
+          },
+        })),
+      },
+    },
+  },
+};
+
+const mocks = [marketMock, successorMock];
+
+describe('SuccessorMarketRenderer', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  it('should properly rendered successor market', async () => {
+    const successorValue = 'market1';
+    render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code successor 1')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('successorMarket1', false);
+    });
+  });
+  it('should properly rendered parent market', async () => {
+    const successorValue = 'market1';
+    render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} parent />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code parent 1')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('parentMarket1', false);
+    });
+  });
+  it('should properly rendered only parent market', async () => {
+    const successorValue = 'market2';
+    const { rerender } = render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} parent />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code parent 2')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('parentMarket2', false);
+    });
+
+    rerender(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+
+    expect(screen.getByText('-')).toBeInTheDocument();
+  });
+  it('should properly rendered only successor market', async () => {
+    const successorValue = 'market3';
+    const { rerender } = render(
+      <MockedProvider mocks={[...mocks]}>
+        <SuccessorMarketRenderer value={successorValue} />
+      </MockedProvider>
+    );
+    await waitFor(() => {
+      expect(screen.getByTestId('market-code')).toBeInTheDocument();
+    });
+    expect(screen.getByText('code successor 3')).toBeInTheDocument();
+    expect(screen.getByText('Futr')).toBeInTheDocument();
+
+    await userEvent.click(screen.getByRole('button'));
+
+    await waitFor(() => {
+      expect(mockClickHandler).toHaveBeenCalledWith('successorMarket3', false);
+    });
+
+    await act(() => {
+      rerender(
+        <MockedProvider mocks={[...mocks]}>
+          <SuccessorMarketRenderer value={successorValue} parent />
+        </MockedProvider>
+      );
+    });
+    expect(screen.getByText('-')).toBeInTheDocument();
+  });
+});

apps/trading/client-pages/markets/successor-market-cell.tsx

@@ -0,0 +1,41 @@
+import React from 'react';
+import { MarketNameCell } from '@vegaprotocol/datagrid';
+import { useDataProvider } from '@vegaprotocol/data-provider';
+import { marketProvider, useSuccessorMarketIds } from '@vegaprotocol/markets';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+
+export const SuccessorMarketRenderer = ({
+  value,
+  parent,
+}: {
+  value: string;
+  parent?: boolean;
+}) => {
+  const successors = useSuccessorMarketIds(value);
+  const onMarketClick = useMarketClickHandler();
+
+  const lookupValue = successors
+    ? parent
+      ? successors.parentMarketID
+      : successors.successorMarketID
+    : '';
+
+  const { data } = useDataProvider({
+    dataProvider: marketProvider,
+    variables: {
+      marketId: lookupValue || '',
+    },
+    skip: !lookupValue,
+  });
+
+  return data ? (
+    <MarketNameCell
+      value={data.tradableInstrument.instrument.code}
+      data={data}
+      onMarketClick={onMarketClick}
+      productType={data.tradableInstrument.instrument?.product.__typename}
+    />
+  ) : (
+    '-'
+  );
+};

apps/trading/client-pages/markets/use-column-defs.tsx

@@ -1,226 +0,0 @@
-import { useMemo } from 'react';
-import type { ColDef, ValueFormatterParams } from 'ag-grid-community';
-import { t } from '@vegaprotocol/i18n';
-import type {
-  VegaICellRendererParams,
-  VegaValueFormatterParams,
-  VegaValueGetterParams,
-} from '@vegaprotocol/datagrid';
-import { COL_DEFS, SetFilter } from '@vegaprotocol/datagrid';
-import * as Schema from '@vegaprotocol/types';
-import { addDecimalsFormatNumber, toBigNum } from '@vegaprotocol/utils';
-import { ButtonLink, Tooltip } from '@vegaprotocol/ui-toolkit';
-import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import type {
-  MarketMaybeWithData,
-  MarketMaybeWithDataAndCandles,
-} from '@vegaprotocol/markets';
-import { MarketActionsDropdown } from './market-table-actions';
-import { calcCandleVolume } from '@vegaprotocol/markets';
-import { MarketCodeCell } from './market-code-cell';
-
-const { MarketTradingMode, AuctionTrigger } = Schema;
-
-export const useColumnDefs = () => {
-  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
-  return useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('Market'),
-        field: 'tradableInstrument.instrument.code',
-        flex: 2,
-        cellRenderer: ({
-          value,
-          data,
-        }: VegaICellRendererParams<
-          MarketMaybeWithData,
-          'tradableInstrument.instrument.code'
-        >) => (
-          <MarketCodeCell
-            value={value}
-            data={{
-              productType:
-                data?.tradableInstrument.instrument.product.__typename,
-              successorMarketID: data?.successorMarketID,
-              parentMarketID: data?.parentMarketID,
-            }}
-          />
-        ),
-      },
-      {
-        headerName: t('Description'),
-        field: 'tradableInstrument.instrument.name',
-        flex: 2,
-      },
-      {
-        headerName: t('Trading mode'),
-        field: 'tradingMode',
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<MarketMaybeWithData, 'data'>) => {
-          if (!data?.data) return '-';
-          const { trigger, marketTradingMode } = data.data;
-
-          const withTriggerInfo =
-            marketTradingMode ===
-              MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-            trigger &&
-            trigger !== AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED;
-
-          if (withTriggerInfo) {
-            return (
-              <Tooltip
-                description={`${Schema.MarketTradingModeMapping[marketTradingMode]}
-                - ${Schema.AuctionTriggerMapping[trigger]}`}
-              >
-                <span>
-                  {Schema.MarketTradingModeMapping[marketTradingMode]}
-                </span>
-              </Tooltip>
-            );
-          }
-
-          return Schema.MarketTradingModeMapping[marketTradingMode];
-        },
-        filter: SetFilter,
-        filterParams: {
-          set: Schema.MarketTradingModeMapping,
-        },
-      },
-      {
-        headerName: t('Status'),
-        field: 'state',
-        valueFormatter: ({
-          data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'state'>) => {
-          return data?.state ? Schema.MarketStateMapping[data.state] : '-';
-        },
-        filter: SetFilter,
-        filterParams: {
-          set: Schema.MarketStateMapping,
-        },
-      },
-      {
-        headerName: t('Mark price'),
-        field: 'data.markPrice',
-        type: 'rightAligned',
-        cellRenderer: 'PriceFlashCell',
-        filter: 'agNumberColumnFilter',
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
-          return data?.data?.markPrice === undefined
-            ? undefined
-            : toBigNum(data?.data?.markPrice, data.decimalPlaces).toNumber();
-        },
-        valueFormatter: ({
-          data,
-        }: VegaValueFormatterParams<MarketMaybeWithData, 'data.markPrice'>) =>
-          data?.data?.bestOfferPrice === undefined
-            ? '-'
-            : addDecimalsFormatNumber(data.data.markPrice, data.decimalPlaces),
-      },
-      {
-        headerName: t('24h volume'),
-        type: 'rightAligned',
-        field: 'data.candles',
-        valueGetter: ({
-          data,
-        }: VegaValueGetterParams<MarketMaybeWithDataAndCandles>) => {
-          if (!data) return 0;
-          const candles = data?.candles;
-          const vol = candles ? calcCandleVolume(candles) : '0';
-          return Number(vol);
-        },
-        valueFormatter: ({
-          data,
-        }: ValueFormatterParams<MarketMaybeWithDataAndCandles, 'candles'>) => {
-          const candles = data?.candles;
-          const vol = candles ? calcCandleVolume(candles) : '0';
-          const volume =
-            data && vol && vol !== '0'
-              ? addDecimalsFormatNumber(vol, data.positionDecimalPlaces)
-              : '0.00';
-          return volume;
-        },
-      },
-      {
-        headerName: t('Settlement asset'),
-        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<
-          MarketMaybeWithData,
-          'tradableInstrument.instrument.product.settlementAsset.symbol'
-        >) => {
-          const value =
-            data?.tradableInstrument.instrument.product.settlementAsset;
-          return value ? (
-            <ButtonLink
-              onClick={(e) => {
-                openAssetDetailsDialog(value.id, e.target as HTMLElement);
-              }}
-            >
-              {value.symbol}
-            </ButtonLink>
-          ) : (
-            ''
-          );
-        },
-      },
-      {
-        headerName: t('Spread'),
-        field: 'data.bestBidPrice',
-        type: 'rightAligned',
-        filter: 'agNumberColumnFilter',
-        cellRenderer: 'PriceFlashCell',
-        valueGetter: ({ data }: VegaValueGetterParams<MarketMaybeWithData>) => {
-          if (!data || !data.data?.bestOfferPrice || !data.data?.bestBidPrice) {
-            return undefined;
-          }
-
-          const offer = toBigNum(data.data.bestOfferPrice, data.decimalPlaces);
-          const bid = toBigNum(data.data.bestBidPrice, data.decimalPlaces);
-
-          const spread = offer.minus(bid).toNumber();
-
-          // The calculation above can result in '-0' being rendered after formatting
-          // so return Math.abs to remove it and just render '0'
-          if (spread === 0) {
-            return Math.abs(spread);
-          }
-
-          return spread;
-        },
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<
-          MarketMaybeWithData,
-          'data.bestBidPrice'
-        >) => {
-          if (!value) return '-';
-          return value.toString();
-        },
-      },
-      {
-        colId: 'market-actions',
-        field: 'id',
-        ...COL_DEFS.actions,
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<MarketMaybeWithData>) => {
-          if (!data) return null;
-          return (
-            <MarketActionsDropdown
-              marketId={data.id}
-              assetId={
-                data.tradableInstrument.instrument.product.settlementAsset.id
-              }
-              successorMarketID={data.successorMarketID}
-              parentMarketID={data.parentMarketID}
-            />
-          );
-        },
-      },
-    ],
-    [openAssetDetailsDialog]
-  );
-};

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

@@ -23,7 +23,6 @@ import { ViewType, useSidebar } from '../../components/sidebar';
 import { AccountsMenu } from '../../components/accounts-menu';
 import { DepositsMenu } from '../../components/deposits-menu';
 import { WithdrawalsMenu } from '../../components/withdrawals-menu';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 
 const WithdrawalsIndicator = () => {
   const { ready } = useIncompleteWithdrawals();
@@ -38,10 +37,7 @@ const WithdrawalsIndicator = () => {
 };
 
 export const Portfolio = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const { getView, setViews } = useSidebar();
-  const view = getView(currentRouteId);
-
+  const { init, view, setView } = useSidebar();
   const { updateTitle } = usePageTitleStore((store) => ({
     updateTitle: store.updateTitle,
   }));
@@ -52,10 +48,10 @@ export const Portfolio = () => {
 
   // Make transfer sidebar open by default
   useEffect(() => {
-    if (view === undefined) {
-      setViews({ type: ViewType.Transfer }, currentRouteId);
+    if (init && view === null) {
+      setView({ type: ViewType.Transfer });
     }
-  }, [view, setViews, currentRouteId]);
+  }, [init, view, setView]);
 
   const [sizes, handleOnLayoutChange] = usePaneLayout({ id: 'portfolio' });
   const wrapperClasses = 'p-0.5 h-full max-h-full flex flex-col';

apps/trading/components/accounts-container/accounts-container.tsx

@@ -12,7 +12,6 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { ViewType, useSidebar } from '../sidebar';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 
 export const AccountsContainer = ({
   pinnedAsset,
@@ -22,8 +21,7 @@ export const AccountsContainer = ({
   const onMarketClick = useMarketClickHandler(true);
   const { pubKey, isReadOnly } = useVegaWallet();
   const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);
 
   const gridStore = useAccountStore((store) => store.gridStore);
   const updateGridStore = useAccountStore((store) => store.updateGridStore);
@@ -51,13 +49,13 @@ export const AccountsContainer = ({
       partyId={pubKey}
       onClickAsset={onClickAsset}
       onClickWithdraw={(assetId) => {
-        setViews({ type: ViewType.Withdraw, assetId }, currentRouteId);
+        setView({ type: ViewType.Withdraw, assetId });
       }}
       onClickDeposit={(assetId) => {
-        setViews({ type: ViewType.Deposit, assetId }, currentRouteId);
+        setView({ type: ViewType.Deposit, assetId });
       }}
       onClickTransfer={(assetId) => {
-        setViews({ type: ViewType.Transfer, assetId }, currentRouteId);
+        setView({ type: ViewType.Transfer, assetId });
       }}
       onMarketClick={onMarketClick}
       isReadOnly={isReadOnly}

apps/trading/components/accounts-menu/accounts-menu.tsx

@@ -1,24 +1,22 @@
 import { t } from '@vegaprotocol/i18n';
 import { TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 
 export const AccountsMenu = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);
 
   return (
     <>
       <TradingButton
         size="extra-small"
         data-testid="open-transfer"
-        onClick={() => setViews({ type: ViewType.Transfer }, currentRouteId)}
+        onClick={() => setView({ type: ViewType.Transfer })}
       >
         {t('Transfer')}
       </TradingButton>
       <TradingButton
         size="extra-small"
-        onClick={() => setViews({ type: ViewType.Deposit }, currentRouteId)}
+        onClick={() => setView({ type: ViewType.Deposit })}
       >
         {t('Deposit')}
       </TradingButton>

apps/trading/components/banner/announcement-banner.tsx

@@ -9,11 +9,5 @@ export const AnnouncementBanner = () => {
     return null;
   }
 
-  return (
-    <Banner
-      app="console"
-      configUrl={ANNOUNCEMENTS_CONFIG_URL}
-      background="url('/banner-bg.jpg')"
-    />
-  );
+  return <Banner app="console" configUrl={ANNOUNCEMENTS_CONFIG_URL} />;
 };

apps/trading/components/banner/index.tsx

@@ -1 +1,2 @@
 export * from './announcement-banner';
+export * from './upgrade-banner';

apps/trading/components/banner/upgrade-banner.tsx

@@ -0,0 +1,84 @@
+import { useMemo, useState } from 'react';
+import { gt, prerelease } from 'semver';
+import {
+  ReleasesFeed,
+  useEnvironment,
+  useReleases,
+  Networks,
+} from '@vegaprotocol/environment';
+import { t } from '@vegaprotocol/i18n';
+import {
+  CopyWithTooltip,
+  ExternalLink,
+  Intent,
+  NotificationBanner,
+  VegaIcon,
+  VegaIconNames,
+} from '@vegaprotocol/ui-toolkit';
+
+// v0.20.12-core-0.71.4 -> v0.20.12
+// we need to strip the "core" suffix in order to determine whether a release
+// is a pre-release (candidate); example: v.0.21.0-beta.1-core-0.71.4
+const parseTagName = (tagName: string) => tagName.replace(/-core-[\d.]+$/i, '');
+
+type UpgradeBannerProps = {
+  showVersionChange: boolean;
+};
+export const UpgradeBanner = ({ showVersionChange }: UpgradeBannerProps) => {
+  const [visible, setVisible] = useState(true);
+  const { data } = useReleases(ReleasesFeed.FrontEnd);
+  const { APP_VERSION, VEGA_ENV, VEGA_NETWORKS } = useEnvironment();
+
+  const CANONICAL_URL = VEGA_NETWORKS[VEGA_ENV] || 'https://console.vega.xyz';
+
+  const newest = useMemo(() => {
+    if (!APP_VERSION || !data) return undefined;
+    const newer = data.filter((r) => gt(r.tagName, APP_VERSION));
+    const valid =
+      // filter pre-releases on mainnet
+      VEGA_ENV === Networks.MAINNET
+        ? newer?.filter((r) => !prerelease(parseTagName(r.tagName)))
+        : newer;
+    return valid.sort((a, b) => (gt(a.tagName, b.tagName) ? -1 : 1))[0];
+  }, [APP_VERSION, VEGA_ENV, data]);
+
+  if (!visible || !newest) {
+    return null;
+  }
+
+  return (
+    <NotificationBanner
+      intent={Intent.Warning}
+      onClose={() => {
+        setVisible(false);
+      }}
+    >
+      <div className="uppercase mb-1">
+        <ExternalLink href={CANONICAL_URL}>
+          {t('Upgrade to the latest version of Console')}
+        </ExternalLink>
+      </div>
+      <div data-testid="bookmark-message">
+        <a
+          className="underline"
+          href={newest.htmlUrl}
+          rel="noreferrer nofollow noopener"
+          target="_blank"
+        >
+          {t("View what's changed")}
+        </a>{' '}
+        {t(' or bookmark')}{' '}
+        <a className="underline" href={CANONICAL_URL}>
+          {t('console.vega.xyz')}
+        </a>{' '}
+        <CopyWithTooltip text={CANONICAL_URL}>
+          <button title={t('Copy %s', CANONICAL_URL)}>
+            <span className="sr-only">{t('Copy %s', CANONICAL_URL)}</span>
+            <VegaIcon size={14} name={VegaIconNames.COPY} />
+          </button>
+        </CopyWithTooltip>{' '}
+        {'to always see the latest version.'}
+      </div>
+    </NotificationBanner>
+  );
+};

apps/trading/components/constants.ts

@@ -1 +1,2 @@
 export const THROTTLE_UPDATE_TIME = 500;
+export const ONBOARDING_VIEWED_KEY = 'vega_onboarding_viewed';

apps/trading/components/deposits-menu/deposits-menu.tsx

@@ -1,16 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { TradingButton } from '@vegaprotocol/ui-toolkit';
 import { ViewType, useSidebar } from '../sidebar';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 
 export const DepositsMenu = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);
 
   return (
     <TradingButton
       size="extra-small"
-      onClick={() => setViews({ type: ViewType.Deposit }, currentRouteId)}
+      onClick={() => setView({ type: ViewType.Deposit })}
       data-testid="deposit-button"
     >
       {t('Deposit')}

apps/trading/components/fills-container/fills-container.tsx

@@ -9,7 +9,7 @@ import type { DataGridSlice } from '../../stores/datagrid-store-slice';
 import { createDataGridSlice } from '../../stores/datagrid-store-slice';
 import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
 
-export const FillsContainer = () => {
+export const FillsContainer = ({ marketId }: { marketId?: string }) => {
   const onMarketClick = useMarketClickHandler(true);
   const { pubKey } = useVegaWallet();
 
@@ -31,6 +31,7 @@ export const FillsContainer = () => {
   return (
     <FillsManager
       partyId={pubKey}
+      marketId={marketId}
       onMarketClick={onMarketClick}
       gridProps={gridStoreCallbacks}
     />

apps/trading/components/header/header.tsx

@@ -53,7 +53,7 @@ export const HeaderStat = ({
       <div data-testid="item-header" id={id}>
         {heading}
       </div>
-      <Tooltip description={description} underline>
+      <Tooltip description={description}>
         <div
           data-testid="item-value"
           aria-labelledby={id}

apps/trading/components/layouts/layout-with-sidebar.tsx

@@ -4,19 +4,16 @@ import classNames from 'classnames';
 import { Routes as AppRoutes } from '../../pages/client-router';
 import { MarketHeader } from '../market-header';
 import { LiquidityHeader } from '../liquidity-header';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 
 export const LayoutWithSidebar = () => {
-  const currentRouteId = useGetCurrentRouteId();
-  const views = useSidebar((store) => store.views);
-  const sidebarView = views[currentRouteId] || null;
+  const sidebarView = useSidebar((store) => store.view);
   const sidebarOpen = sidebarView !== null;
+
   const gridClasses = classNames(
     'h-full relative z-0 grid',
     'grid-rows-[min-content_1fr_40px]',
     'lg:grid-rows-[min-content_1fr]',
-    'lg:grid-cols-[1fr_280px_40px]',
-    'xxxl:grid-cols-[1fr_320px_40px]'
+    'lg:grid-cols-[1fr_350px_40px]'
   );
 
   return (
@@ -24,7 +21,6 @@ export const LayoutWithSidebar = () => {
       <div className="col-span-full">
         <Routes>
           <Route path={AppRoutes.MARKET} element={<MarketHeader />} />
-          <Route path={AppRoutes.CLOSED_MARKETS} element={<MarketHeader />} />
           <Route path={AppRoutes.LIQUIDITY} element={<LiquidityHeader />} />
         </Routes>
       </div>

apps/trading/components/market-banner/market-successor-proposal-banner.tsx

@@ -29,7 +29,7 @@ export const MarketSuccessorProposalBanner = ({
             ?.successorConfiguration?.parentMarketId === marketId
       ) ?? [];
   const [visible, setVisible] = useState(true);
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
   if (visible && successors.length) {
     return (
       <NotificationBanner

apps/trading/components/market-selector/market-selector.spec.tsx

@@ -10,7 +10,7 @@ import type { SortType } from './sort-dropdown';
 import { SortTypeMapping } from './sort-dropdown';
 import { Sort } from './sort-dropdown';
 import { subDays } from 'date-fns';
-import { isMarketActive } from '../../lib/utils';
+import { isMarketActive } from './use-market-selector-list';
 
 jest.mock('@vegaprotocol/markets');
 const mockUseMarketList = useMarketList as jest.Mock;

apps/trading/components/market-selector/use-market-selector-list.spec.tsx

@@ -1,13 +1,15 @@
 import merge from 'lodash/merge';
 import { renderHook } from '@testing-library/react';
-import { useMarketSelectorList } from './use-market-selector-list';
-import { isMarketActive } from '../../lib/utils';
-import { Product } from './product-selector';
+import {
+  isMarketActive,
+  useMarketSelectorList,
+} from './use-market-selector-list';
+import { Product } from '../../components/market-selector/product-selector';
 import { Sort } from './sort-dropdown';
 import { createMarketFragment } from '@vegaprotocol/mock';
 import { MarketState } from '@vegaprotocol/types';
 import { useMarketList } from '@vegaprotocol/markets';
-import type { Filter } from './market-selector';
+import type { Filter } from '../../components/market-selector';
 import { subDays } from 'date-fns';
 
 jest.mock('@vegaprotocol/markets', () => ({

apps/trading/components/market-selector/use-market-selector-list.ts

@@ -1,11 +1,18 @@
 import { useMemo } from 'react';
 import orderBy from 'lodash/orderBy';
+import { MarketState } from '@vegaprotocol/types';
 import { calcTradedFactor, useMarketList } from '@vegaprotocol/markets';
 import { priceChangePercentage } from '@vegaprotocol/utils';
 import type { Filter } from '../../components/market-selector/market-selector';
 import { Sort } from './sort-dropdown';
 import { Product } from './product-selector';
-import { isMarketActive } from '../../lib/utils';
+
+// Used for sort order and filter
+const MARKET_TEMPLATE = [
+  MarketState.STATE_ACTIVE,
+  MarketState.STATE_SUSPENDED,
+  MarketState.STATE_PENDING,
+];
 
 export const useMarketSelectorList = ({
   product,
@@ -80,3 +87,7 @@ export const useMarketSelectorList = ({
 
   return { markets, data, loading, error, reload };
 };
+
+export const isMarketActive = (state: MarketState) => {
+  return MARKET_TEMPLATE.includes(state);
+};

apps/trading/components/navbar/navbar.spec.tsx

@@ -57,7 +57,6 @@ describe('Navbar', () => {
       ['/markets/all', 'Markets'],
       [`/markets/${marketId}`, 'Trading'],
       ['/portfolio', 'Portfolio'],
-      [expect.stringContaining('governance'), 'Governance'],
     ];
 
     const links = screen.getAllByRole('link');
@@ -89,7 +88,6 @@ describe('Navbar', () => {
       ['/markets/all', 'Markets'],
       [`/markets/${marketId}`, 'Trading'],
       ['/portfolio', 'Portfolio'],
-      [expect.stringContaining('governance'), 'Governance'],
     ];
     const links = menu.getAllByRole('link');
     links.forEach((link, i) => {

apps/trading/components/navbar/navbar.tsx

@@ -1,12 +1,6 @@
 import type { ButtonHTMLAttributes, LiHTMLAttributes, ReactNode } from 'react';
 import { useState } from 'react';
-import {
-  useEnvironment,
-  DocsLinks,
-  Networks,
-  DApp,
-  useLinks,
-} from '@vegaprotocol/environment';
+import { useEnvironment, DocsLinks, Networks } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
@@ -65,14 +59,14 @@ export const Navbar = ({
         <VLogo className="w-4" />
       </NavLink>
       {/* Left section */}
-      <div className="flex items-center lg:hidden">{children}</div>
+      <div className="lg:hidden flex items-center">{children}</div>
       {/* Used to show header in nav on mobile */}
       <div className="hidden lg:block">
         <NavbarMenu onClick={() => setMenu(null)} />
       </div>
 
       {/* Right section */}
-      <div className="flex items-center justify-end ml-auto gap-2">
+      <div className="ml-auto flex justify-end items-center gap-2">
         <ProtocolUpgradeCountdown />
         <NavbarMobileButton
           onClick={() => {
@@ -106,7 +100,7 @@ export const Navbar = ({
           onOpenChange={(open) => setMenu((x) => (open ? x : null))}
         >
           <D.Overlay
-            className="fixed inset-0 z-20 lg:hidden dark:bg-black/80 bg-black/50"
+            className="lg:hidden fixed inset-0 dark:bg-black/80 bg-black/50 z-20"
             data-testid="navbar-menu-overlay"
           />
           <D.Content
@@ -117,7 +111,7 @@ export const Navbar = ({
             )}
             data-testid="navbar-menu-content"
           >
-            <div className="flex items-center justify-end h-10 p-1">
+            <div className="flex justify-end items-center h-10 p-1">
               <NavbarMobileButton onClick={() => setMenu(null)}>
                 <span className="sr-only">{t('Close menu')}</span>
                 <VegaIcon name={VegaIconNames.CROSS} size={24} />
@@ -185,11 +179,6 @@ const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
             {t('Portfolio')}
           </NavbarLink>
         </NavbarItem>
-        <NavbarItem>
-          <NavbarLinkExternal to={useLinks(DApp.Governance)()}>
-            {t('Governance')}
-          </NavbarLinkExternal>
-        </NavbarItem>
         <NavbarItem>
           <NavbarTrigger>{t('Resources')}</NavbarTrigger>
           <NavbarContent data-testid="navbar-content-resources">
@@ -347,7 +336,7 @@ const NavbarLinkExternal = ({
       <NavLink
         to={to}
         className={classNames(
-          'flex gap-2 lg:h-full items-center',
+          'flex lg:inline-flex gap-2 justify-between items-center relative',
           'px-6 py-2 lg:p-0 text-lg lg:text-sm',
           'hover:text-vega-clight-100 dark:hover:text-vega-cdark-100'
         )}
@@ -355,7 +344,7 @@ const NavbarLinkExternal = ({
         target="_blank"
       >
         <span>{children}</span>
-        <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} size={14} />
+        <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
       </NavLink>
     </N.Link>
   );
@@ -375,8 +364,8 @@ const BurgerIcon = () => (
 
 const NavbarListDivider = () => {
   return (
-    <div className="px-6 py-2 lg:px-0" role="separator">
-      <div className="w-full h-px lg:h-full lg:w-px bg-vega-clight-500 dark:bg-vega-cdark-500" />
+    <div className="py-2 px-6 lg:px-0" role="separator">
+      <div className="h-px lg:h-full w-full lg:w-px bg-vega-clight-500 dark:bg-vega-cdark-500" />
     </div>
   );
 };

apps/trading/components/orderbook-container/orderbook-container.tsx

@@ -1,18 +1,16 @@
 import { OrderbookManager } from '@vegaprotocol/market-depth';
 import { ViewType, useSidebar } from '../sidebar';
 import { useDealTicketFormValues } from '@vegaprotocol/deal-ticket';
-import { useGetCurrentRouteId } from '../../lib/hooks/use-get-current-route-id';
 
 export const OrderbookContainer = ({ marketId }: { marketId: string }) => {
-  const currentRouteId = useGetCurrentRouteId();
   const update = useDealTicketFormValues((state) => state.updateAll);
-  const setViews = useSidebar((store) => store.setViews);
+  const setView = useSidebar((store) => store.setView);
   return (
     <OrderbookManager
       marketId={marketId}
       onClick={(values) => {
         update(marketId, values);
-        setViews({ type: ViewType.Order }, currentRouteId);
+        setView({ type: ViewType.Order });
       }}
     />
   );