Merge remote-tracking branch 'origin/develop' into fix/4046-wrong-margin-requirement-in-order

fix: deal ticket margin estimation - add unit test
2023-07-25 16:04:18 +02:00 · 2023-07-25 16:04:00 +02:00 · 2023-07-25 11:13:40 +02:00 · 2023-07-25 11:13:20 +02:00
163 changed files with 1413 additions and 3801 deletions
@@ -51,8 +51,7 @@
            "ul": ["list"],
            "ol": ["list"]
          }
-        ],
-        "no-console": ["error", { "allow": ["warn", "error"] }]
+        ]
      }
    },
    {
@@ -7,7 +7,7 @@ on:
 jobs:
  after-release:
    runs-on: ubuntu-22.04
-    timeout-minutes: 45
+    timeout-minutes: 30
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@@ -30,20 +30,18 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

-      - name: Wait for publish to complete
-        uses: lewagon/wait-on-check-action@v1.3.1
-        with:
-          ref: ${{ github.event.release.tag_name }}
-          check-name: '(CD) publish dist / trading'
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          wait-interval: 10
-
      - name: resolve ipfs hashes for release
        run: |
          echo "Name: ${{ github.event.release.name }}"
          echo "Description: ${{ github.event.release.body }}"
          echo "Tag: ${{ github.event.release.tag_name }}"
-          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
+          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
+          echo "Commit: $commit"
+          until docker pull vegaprotocol/trading:$commit; do
+            echo "Image not pushed yet, waiting 60 seconds"
+            sleep 60
+          done
+          docker run --rm vegaprotocol/trading:$commit cat /ipfs-hash > ipfs-hash
          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
          tar -xzf kubo.tgz
          export PATH="$PATH:$PWD/kubo"
@@ -81,22 +81,6 @@ jobs:
        with:
          main-branch-name: develop

-      # See affected apps
-      - name: See affected apps
-        run: |
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
-          python3 tools/ci/check-affected.py --github-ref="${{ github.ref }}" --branch-slug="$branch_slug" --event-name="${{ github.event_name }}"
-
-      - name: Verify script result
-        run: |
-          echo "Check outputs from script"
-          echo "projects: ${{ env.PROJECTS }}"
-          echo "projects-e2e: ${{ env.PROJECTS_E2E }}"
-          echo "preview_governance: ${{ env.PREVIEW_GOVERNANCE }}"
-          echo "preview_trading: ${{ env.PREVIEW_TRADING }}"
-          echo "preview_explorer: ${{ env.PREVIEW_EXPLORER }}"
-          echo "preview_tools: ${{ env.PREVIEW_TOOLS }}"
-
      - name: Check formatting
        run: yarn nx format:check

@@ -112,6 +96,126 @@ jobs:
      - name: Build affected
        run: yarn nx affected:build || (yarn install && yarn nx affected:build)

+      # See affected apps
+      - name: See affected apps
+        run: |
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
+
+          echo ">>>> debug"
+          echo "NX_BASE: ${{ env.NX_BASE }}"
+          echo "NX_HEAD: ${{ env.NX_HEAD }}"
+          echo "Affected: ${affected}"
+          echo "Branch slug: ${branch_slug}"
+          echo "Current ref: ${{ github.ref }}"
+          echo ">>>> eof debug"
+
+          projects_array=()
+
+          preview_governance="not deployed"
+          preview_trading="not deployed"
+          preview_explorer="not deployed"
+          preview_tools="not deployed"
+
+          # parse if affected is any of three main applications, if none - use all of them
+          if echo "$affected" | grep -q governance; then
+            echo "Governance is affected"
+            projects_array+=("governance")
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+          fi
+          if echo "$affected" | grep -q trading; then
+            echo "Trading is affected"
+            projects_array+=("trading")
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+          fi
+          if echo "$affected" | grep -q explorer; then
+            echo "Explorer is affected"
+            projects_array+=("explorer")
+            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          fi
+          if [[ ${#projects_array[@]} -eq 0 ]]; then
+            projects_array=("governance" "trading" "explorer")
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+          fi
+
+          # applications parsed before this loop are applicable for running e2e-tests
+          projects_e2e_array=()
+          for project in "${projects_array[@]}"; do
+            projects_e2e_array+=("${project}-e2e")
+          done
+          # all applications below this loop are not applicable for running e2e-test
+
+          # check if pull request event to deploy tools
+          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
+            if echo "$affected" | grep -q multisig-signer; then
+              echo "Tools are affected"
+              echo "Deploying tools on preview"
+              preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
+
+              projects_array+=("multisig-signer")
+            fi
+          # those apps deploy only from develop to mainnet
+          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+            if echo "$affected" | grep -q multisig-signer; then
+              echo "Tools are affected"
+              echo "Deploying tools on s3"
+
+              projects_array+=("multisig-signer")
+            fi
+            if echo "$affected" | grep -q static; then
+              echo "static is affected"
+              echo "Deploying static on s3"
+
+              projects_array+=("static")
+            fi
+            if echo "$affected" | grep -q ui-toolkit; then
+              echo "ui-toolkit is affected"
+              echo "Deploying ui-toolkit on s3"
+
+              projects_array+=("ui-toolkit")
+            fi
+          fi
+
+          # if branch starts with release/ and ends with trading / governance or explorer - overwrite the array of affected projects with fixed single application
+          if [[ "${{ github.ref }}" == *release* ]]; then
+            echo ">> This is a relase branch"
+            case "${{ github.ref }}" in
+              *trading)
+                echo ">> Only trading will be deployed"
+                projects_array=(trading)
+                projects_e2e_array=(trading)
+              ;;
+              *governance)
+                echo ">> Only governance will be deployed"
+                projects_array=(governance)
+                projects_e2e_array=(governance)
+              ;;
+              *explorer)
+                echo ">> Only explorer will be deployed"
+                projects_array=(explorer)
+                projects_e2e_array=(explorer)
+              ;;
+              *)
+                echo ">> All apps will be deployed"
+              ;;
+            esac
+          fi
+
+          echo "Projects: ${projects_array[@]}"
+          echo "Projects E2E: ${projects_e2e_array[@]}"
+          projects_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_array[@]}")
+          projects_e2e_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_e2e_array[@]}")
+
+          echo PROJECTS_E2E=$projects_e2e_json >> $GITHUB_ENV
+          echo PROJECTS=$projects_json >> $GITHUB_ENV
+
+          echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
+          echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
+          echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
+          echo PREVIEW_TOOLS=$preview_tools >> $GITHUB_ENV
+
    outputs:
      projects: ${{ env.PROJECTS }}
      projects-e2e: ${{ env.PROJECTS_E2E }}
@@ -120,15 +224,6 @@ jobs:
      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
      preview_tools: ${{ env.PREVIEW_TOOLS }}

-  console-e2e:
-    needs: lint-test-build
-    name: '(CI) console python'
-    uses: ./.github/workflows/console-test-run.yml
-    secrets: inherit
-    if: ${{ contains(fromJSON(needs.lint-test-build.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
-    with:
-      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
-
  cypress:
    needs: lint-test-build
    name: '(CI) cypress'
@@ -1,138 +1,55 @@
-name: (CI) Console tests
-
+name: console-test-run
 on:
  workflow_call:
    inputs:
      github-sha:
        required: true
        type: string
-
 jobs:
-  run-tests:
-    name: run-tests
-    runs-on: ubuntu-22.04
-    timeout-minutes: 25
+  console-test:
+    timeout-minutes: 5
+    runs-on: self-hosted-runner
    steps:
-      #----------------------------------------------
-      #       check-out frontend-monorepo
-      #----------------------------------------------
-      - name: Checkout console test repo
-        uses: actions/checkout@v3
-        with:
-          ref: ${{ inputs.github-sha }}
-      #----------------------------------------------
-      #       cache node modules
-      #----------------------------------------------
-      - name: Cache node modules
-        id: cache
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-          # comment out "restore-keys" if you need to rebuild yarn from 0
-          restore-keys: |
-            ${{ runner.os }}-cache-node-modules-
-      #----------------------------------------------
-      #       setup node
-      #----------------------------------------------
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
-      #----------------------------------------------
-      #       install deps if cache missing
-      #----------------------------------------------
-      - name: yarn install
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --pure-lockfile
-      #----------------------------------------------
-      #       build trading
-      #----------------------------------------------
-      - name: Build affected spec
-        run: |
-          yarn env-cmd -f ./apps/trading/.env.stagnet1 yarn nx export trading
-      #----------------------------------------------
-      #       run trading server
-      #----------------------------------------------
-      - name: Run trading server
-        run: |
-          docker run -d -p 80:4200 -v $PWD/docker/nginx.conf:/etc/nginx/conf.d/default.conf -v $PWD/dist/apps/trading/exported:/usr/share/nginx/html nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
-          sleep 5
-          docker ps
-      #----------------------------------------------
-      #       check if container persists between runs
-      #----------------------------------------------
-      - name: Check server
-        run: |
-          docker ps
-      #----------------------------------------------
-      #       check-out tests repo
-      #----------------------------------------------
      - name: Checkout console test repo
        uses: actions/checkout@v3
        with:
          repository: vegaprotocol/console-test
          path: './console-test'
-      #----------------------------------------------
-      #       set-up python
-      #----------------------------------------------
-      - name: Set up python
-        id: setup-python
+
+      - name: Set up Python
        uses: actions/setup-python@v4
        with:
          python-version: '3.10.11'
-      #----------------------------------------------
-      #  -----  install & configure poetry  -----
-      #----------------------------------------------
+
      - name: Install Poetry
        uses: snok/install-poetry@v1
-        with:
-          virtualenvs-create: true
-          virtualenvs-in-project: true
-          virtualenvs-path: console-test/.venv
-      #----------------------------------------------
-      #       load cached venv if cache exists
-      #----------------------------------------------
-      - name: Load cached venv
-        id: cached-poetry-dependencies
-        uses: actions/cache@v3
-        with:
-          path: console-test/.venv
-          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
-      #----------------------------------------------
-      # install dependencies if cache does not exist
-      #----------------------------------------------
+
      - name: Install dependencies
+        run: |
+          poetry install --no-root
        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
+
+      - name: load Binaries
+        run: |
+          poetry run python -m vega_sim.tools.load_binaries
        working-directory: ./console-test
-        run: poetry run python -m vega_sim.tools.load_binaries --force
-      #----------------------------------------------
-      # install playwright
-      #----------------------------------------------
+
+      - name: pull console
+        run: |
+          poetry run docker pull ghcr.io/vegaprotocol/frontend/trading:${{ inputs.github-sha }}
+
+      - name: Update container_name in config.py
+        run: |
+          sed -i "s/container_name = \".*\"/container_name = \"vegaprotocol\/frontend\/trading:${{ inputs.github-sha }}\"/g" config.py
+
      - name: install playwright
        run: poetry run playwright install
        working-directory: ./console-test
-      #----------------------------------------------
-      # run tests
-      #----------------------------------------------
-      - name: Run tests
-        working-directory: ./console-test
+
+      - name: run tests
        run: poetry run pytest --numprocesses auto
-      - name: Check files
-        run: |
-          ls -al .
-          ls -al console-test
-      #----------------------------------------------
-      # upload traces
-      #----------------------------------------------
+        working-directory: ./console-test
+
      - name: Upload Playwright Trace
        uses: actions/upload-artifact@v3
        if: always()
@@ -29,12 +29,6 @@ jobs:
          echo IS_TESTNET_RELEASE=false >> $GITHUB_ENV
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
          echo IS_S3_RELEASE=false >> $GITHUB_ENV
-          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
-
-      - name: Is dev image
-        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
-        run: |
-          echo IS_DEV_IMAGE=true >> $GITHUB_ENV

      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
@@ -42,7 +36,7 @@ jobs:
          echo IS_PR=true >> $GITHUB_ENV

      - name: Is mainnet release
-        if: ${{ contains(github.ref, 'release/mainnet') && !contains(github.ref, 'mirror') }}
+        if: ${{ contains(github.ref, 'release/mainnnet') && !contains(github.ref, 'mirror') }}
        run: |
          echo IS_MAINNET_RELEASE=true >> $GITHUB_ENV

@@ -81,7 +75,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' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -103,13 +97,52 @@ jobs:
      - name: Define dist variables
        if: ${{ github.event_name == 'push' }}
        run: |
-          python3 tools/ci/define-dist-variables.py --github-ref="${{ github.ref }}" --app="${{ matrix.app }}"
+          envName=''
+          domain="vega.rocks"
+          bucketName=''

-      - name: Verify script result
-        if: ${{ github.event_name == 'push' }}
-        run: |
-          echo "BUCKET_NAME=${{ env.BUCKET_NAME }}"
-          echo "ENV_NAME=${{ env.ENV_NAME }}"
+          if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
+            # remove prefixing release/ and take the first string limited by - which is supposed to be name of the environment for releasing (format: release/testnet-trading)
+            envName="$(echo ${{ github.ref }} | sed -e "s|refs/heads/release/||" | cut -d '-' -f 1 )"
+          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+            envName="stagnet1"
+            if [[ "${{ matrix.app }}" = "multisig-signer" ]]; then
+              envName="mainnet"
+              bucketName="tools.vega.xyz"
+            fi
+            if [[ "${{ matrix.app }}" = "static" ]]; then
+              envName="mainnet"
+              bucketName="static.vega.xyz"
+            fi
+            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
+              envName="mainnet"
+              bucketName="ui.vega.rocks"
+            fi
+          elif [[ "${{ github.ref }}" =~ .*mainnet$ ]]; then
+            envName="mainnet"
+          fi
+
+          if [[ "${envName}" = "mainnet" ]]; then
+            domain="vega.xyz"
+            if [[ -z "${bucketName}" ]]; then
+              bucketName="${{ matrix.app }}.${domain}"
+            fi
+          elif [[ "${envName}" = "testnet" ]]; then
+            domain="fairground.wtf"
+            if [[ -z "${bucketName}" ]]; then
+              bucketName="${{ matrix.app }}.${domain}"
+            fi
+          fi
+
+          if [[ -z "${bucketName}" ]]; then
+            bucketName="${{ matrix.app }}.${envName}.${domain}"
+          fi
+
+          echo "bucket name: ${bucketName}"
+          echo "env name: ${envName}"
+
+          echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
+          echo ENV_NAME=${envName} >> $GITHUB_ENV

      - name: Build local dist
        run: |
@@ -124,12 +157,8 @@ jobs:
          elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
            NODE_ENV=production yarn nx run ui-toolkit:build-storybook
            DIST_LOCATION=dist/storybook/ui-toolkit
-          elif [ "${{ matrix.app }}" = "static" ]; then
-            yarn nx build static || (yarn install && yarn nx build static)
          else
            $envCmd yarn nx build ${{ matrix.app }} || (yarn install && $envCmd yarn nx build ${{ matrix.app }})
-          fi
-          if [[ -z "$DIST_LOCATION" ]]; then
            DIST_LOCATION=dist/apps/${{ matrix.app }}
          fi
          mv $DIST_LOCATION dist-result
@@ -179,7 +208,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'  }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -189,7 +218,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' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -7,11 +7,7 @@ context('Validator page', { tags: '@smoke' }, function () {
    it('should be able to see validator tiles', function () {
      cy.getNodes().then((nodes) => {
        nodes.forEach((node) => {
-          if (node.rankingScore.performanceScore > 0) {
-            cy.get(`[validator-id="${node.id}"]`).should('be.visible');
-          } else {
-            cy.get(`[validator-id="${node.id}"]`).should('not.exist');
-          }
+          cy.get(`[validator-id="${node.id}"]`).should('be.visible');
        });
      });
    });
@@ -10,6 +10,7 @@ import {
  DropdownMenuTrigger,
  DropdownMenuSubContent,
  Icon,
+  Button,
 } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction } from 'react';
 import { FilterLabel } from './tx-filter-label';
@@ -99,13 +100,15 @@ export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
    <DropdownMenu
      modal={false}
      trigger={
-        <DropdownMenuTrigger>
-          <FilterLabel filters={filters} />
+        <DropdownMenuTrigger className="ml-0">
+          <Button size="xs" data-testid="filter-trigger">
+            <FilterLabel filters={filters} />
+          </Button>
        </DropdownMenuTrigger>
      }
    >
      <DropdownMenuContent>
-        {filters.size > 1 ? null : (
+        {filters.size > 0 ? null : (
          <>
            <DropdownMenuCheckboxItem
              onCheckedChange={() => setFilters(new Set(AllFilterOptions))}
@@ -44,7 +44,7 @@ export const TxsListNavigation = ({
          </Button>
          <Button
            size="xs"
-            disabled={!hasMoreTxs}
+            disabled={!hasMoreTxs || loading}
            onClick={() => {
              nextPage();
            }}
@@ -86,18 +86,14 @@ describe('Txs infinite list item', () => {
    render(
      <MockedProvider>
        <MemoryRouter>
-          <table>
-            <tbody>
-              <TxsInfiniteListItem
-                type="testType"
-                submitter="testPubKey"
-                hash="testTxHash"
-                block="1"
-                code={0}
-                command={{}}
-              />
-            </tbody>
-          </table>
+          <TxsInfiniteListItem
+            type="testType"
+            submitter="testPubKey"
+            hash="testTxHash"
+            block="1"
+            code={0}
+            command={{}}
+          />
        </MemoryRouter>
      </MockedProvider>
    );
@@ -14,9 +14,9 @@ const DEFAULT_TRUNCATE_LENGTH = 7;

 export function getIdTruncateLength(screen: Screen): number {
  if (['xxxl', 'xxl'].includes(screen)) {
-    return 32;
+    return 64;
  } else if (['xl', 'lg', 'md'].includes(screen)) {
-    return 16;
+    return 32;
  }
  return DEFAULT_TRUNCATE_LENGTH;
 }
@@ -5,17 +5,11 @@ import type { BlockExplorerTransactionResult } from '../../routes/types/block-ex
 import { Side } from '@vegaprotocol/types';
 import { MockedProvider } from '@apollo/client/testing';

-const generateHash = (): string =>
-  Array.from(
-    { length: 64 },
-    () => '0123456789ABCDEF'[Math.floor(Math.random() * 16)]
-  ).join('');
-
 const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
  return Array.from(Array(number)).map((_) => ({
    block: '87901',
    index: 2,
-    hash: generateHash(),
+    hash: '0F8B98DA0923A50786B852D9CA11E051CACC4C733E1DB93D535C7D81DBD10F6F',
    submitter:
      '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
    type: 'Submit Order',
@@ -2,7 +2,7 @@ import { Table, TableRow } from '../table';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type { BlockExplorerTransactions } from '../../routes/types/block-explorer-response';
-import { getTxsDataUrl } from '../../hooks/get-txs-data-url';
+import { getTxsDataUrl } from '../../hooks/use-txs-data';
 import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
@@ -14,7 +14,7 @@ interface TxsPerBlockProps {

 export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
  const filters = `filters[block.height]=${blockHeight}`;
-  const url = getTxsDataUrl({ filters, count: txCount });
+  const url = getTxsDataUrl({ limit: txCount.toString(), filters });
  const {
    state: { data, loading, error },
  } = useFetch<BlockExplorerTransactions>(url);
@@ -1,59 +0,0 @@
-import { DATA_SOURCES } from '../config';
-
-type IGetTxsDataFirstPage = {
-  baseUrl?: string;
-  count?: number;
-  party?: string;
-  filters?: string;
-};
-
-interface IGetTxsDataPrevious extends IGetTxsDataFirstPage {
-  before: string;
-}
-
-interface IGetTxsDataNext extends IGetTxsDataFirstPage {
-  after: string;
-}
-
-type IGetTxsDataUrl =
-  | IGetTxsDataPrevious
-  | IGetTxsDataNext
-  | IGetTxsDataFirstPage;
-
-export const BE_TXS_PER_REQUEST = 25;
-
-/**
- * Properly encodes the filters and parameters for a request to the block explorer
- * API for transactions. As the API uses a slightly less common format for encoding
- * filters, some of it is more manual than you might expect.
- *
- * @param params An object containing the pagination and filters
- * @returns string URL to call
- */
-export const getTxsDataUrl = (params: IGetTxsDataUrl) => {
-  const baseUrl =
-    params.baseUrl || `${DATA_SOURCES.blockExplorerUrl}/transactions`;
-  const url = new URL(baseUrl);
-  const count = `${params.count || BE_TXS_PER_REQUEST}`;
-
-  if ('before' in params && params.before?.length > 0) {
-    url.searchParams.append('last', count);
-    url.searchParams.append('before', params.before);
-  } else if ('after' in params && params.after?.length > 0) {
-    url.searchParams.append('first', count);
-    url.searchParams.append('after', params.after);
-  } else {
-    url.searchParams.append('first', count);
-  }
-
-  // Hacky fix for param as array
-  let urlAsString = url.toString();
-  if (params.filters && params.filters?.length > 0) {
-    urlAsString += '&' + params.filters.replaceAll(' ', '%20');
-  }
-  if (params.party && params.party?.length > 0) {
-    urlAsString += `&filters[tx.submitter]=${params.party}`;
-  }
-
-  return urlAsString;
-};
@@ -1,48 +0,0 @@
-import { getTxsDataUrl } from './get-txs-data-url'; // import the function to be tested
-
-describe('getTxsDataUrl', () => {
-  it('should return the correct URL without filters and party', () => {
-    const params = {
-      count: 10,
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl = 'https://example.com/transactions?first=10';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-
-  it('should return the correct URL with "before" in params', () => {
-    const params = {
-      count: 5,
-      before: '100.1',
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl = 'https://example.com/transactions?last=5&before=100.1';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-
-  it('should return the correct URL with "after" in params', () => {
-    const params = {
-      count: 5,
-      after: '222.1',
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl = 'https://example.com/transactions?first=5&after=222.1';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-
-  it('should return the correct URL with filters and party', () => {
-    const params = {
-      count: 10,
-      filters: 'filters[cmd.type]=Made Up Transaction',
-      party: '1234',
-      baseUrl: 'https://example.com/transactions',
-    };
-    const expectedUrl =
-      'https://example.com/transactions?first=10&filters[cmd.type]=Made%20Up%20Transaction&filters[tx.submitter]=1234';
-
-    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
-  });
-});
@@ -1,141 +1,130 @@
-import { useSearchParams } from 'react-router-dom';
-import type { URLSearchParamsInit } from 'react-router-dom';
-import { useCallback } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type {
  BlockExplorerTransactionResult,
  BlockExplorerTransactions,
 } from '../routes/types/block-explorer-response';
+import { DATA_SOURCES } from '../config';
 import isNumber from 'lodash/isNumber';
-import { AllFilterOptions } from '../components/txs/tx-filter';
-import type { FilterOption } from '../components/txs/tx-filter';
-import { BE_TXS_PER_REQUEST, getTxsDataUrl } from './get-txs-data-url';

-export function getTypeFilters(filters?: Set<FilterOption>) {
-  if (!filters) {
-    return '';
-  } else if (filters.size > 1) {
-    return '';
-  }
-
-  const forcedSingleFilter = Array.from(filters)[0];
-  return `filters[cmd.type]=${forcedSingleFilter}`;
+export interface TxsStateProps {
+  txsData: BlockExplorerTransactionResult[];
+  hasMoreTxs: boolean;
+  cursor: string;
+  previousCursors: string[];
+  hasPreviousPage: boolean;
 }

 export interface IUseTxsData {
-  count?: number;
-  before?: string;
-  after?: string;
-  party?: string;
-  filters?: Set<FilterOption>;
+  limit: number;
+  filters?: string;
 }

-export const useTxsData = ({
-  count = 25,
-  before,
-  after,
-  filters,
-  party,
-}: IUseTxsData) => {
-  const [, setSearchParams] = useSearchParams();
-  let hasMoreTxs = true;
-  let txsData: BlockExplorerTransactionResult[] = [];
+interface IGetTxsDataUrl {
+  limit: string;
+  filters?: string;
+}

-  const url = getTxsDataUrl({
-    filters: getTypeFilters(filters),
-    count,
-    before,
-    after,
-    party,
+export const getTxsDataUrl = ({ limit, filters }: IGetTxsDataUrl) => {
+  const url = new URL(`${DATA_SOURCES.blockExplorerUrl}/transactions`);
+
+  if (limit) {
+    url.searchParams.append('limit', limit);
+  }
+
+  // Hacky fix for param as array
+  let urlAsString = url.toString();
+  if (filters) {
+    urlAsString += '&' + filters.replace(' ', '%20');
+  }
+
+  return urlAsString;
+};
+
+export const useTxsData = ({ limit, filters }: IUseTxsData) => {
+  const [
+    { txsData, hasMoreTxs, cursor, previousCursors, hasPreviousPage },
+    setTxsState,
+  ] = useState<TxsStateProps>({
+    txsData: [],
+    hasMoreTxs: false,
+    previousCursors: [],
+    cursor: '',
+    hasPreviousPage: false,
  });

+  const url = getTxsDataUrl({ limit: limit.toString(), filters });
+
  const {
    state: { data, error, loading },
    refetch,
  } = useFetch<BlockExplorerTransactions>(url, {}, true);

-  if (!loading && data && isNumber(data.transactions.length)) {
-    hasMoreTxs = data.transactions.length >= count;
-    txsData = data.transactions;
-  }
+  useEffect(() => {
+    if (!loading && data && isNumber(data.transactions.length)) {
+      setTxsState((prev) => {
+        return {
+          ...prev,
+          txsData: data.transactions,
+          hasMoreTxs: data.transactions.length >= limit,
+          cursor: data?.transactions.at(-1)?.cursor || '',
+        };
+      });
+    }
+  }, [loading, setTxsState, data, limit]);

  const nextPage = useCallback(() => {
-    const after = data?.transactions.at(-1)?.cursor || '';
-    const params: URLSearchParamsInit = { after };
-    if (filters) {
-      params.filters = Array.from(filters).join(',');
-    }
-    setSearchParams(params);
-  }, [filters, data, setSearchParams]);
+    const c = data?.transactions.at(0)?.cursor;
+    const newPreviousCursors = c ? [...previousCursors, c] : previousCursors;
+
+    setTxsState((prev) => ({
+      ...prev,
+      hasPreviousPage: true,
+      previousCursors: newPreviousCursors,
+    }));
+
+    return refetch({
+      limit,
+      before: cursor,
+    });
+  }, [data, previousCursors, cursor, limit, refetch]);

  const previousPage = useCallback(() => {
-    const before = data?.transactions[0]?.cursor || '';
-    const params: URLSearchParamsInit = { before };
-    if (filters && filters.size > 0 && filters.size === 1) {
-      params.filters = Array.from(filters)[0];
-    }
-    setSearchParams(params);
-  }, [filters, data, setSearchParams]);
+    const previousCursor = [...previousCursors].pop();
+    const newPreviousCursors = previousCursors.slice(0, -1);
+    setTxsState((prev) => ({
+      ...prev,
+      hasPreviousPage: newPreviousCursors.length > 0,
+      previousCursors: newPreviousCursors,
+    }));
+    return refetch({
+      limit,
+      before: previousCursor,
+    });
+  }, [previousCursors, limit, refetch]);

  const refreshTxs = useCallback(async () => {
-    const params: URLSearchParamsInit = {};
-    if (filters && filters.size > 0 && filters.size === 1) {
-      params.filters = Array.from(filters)[0];
-    }
-    setSearchParams(params);
+    setTxsState(() => ({
+      txsData: [],
+      cursor: '',
+      previousCursors: [],
+      hasMoreTxs: false,
+      hasPreviousPage: false,
+    }));

-    refetch({ count: BE_TXS_PER_REQUEST });
-  }, [setSearchParams, refetch, filters]);
-
-  const updateFilters = useCallback(
-    (newFilters: Set<FilterOption>) => {
-      const params: URLSearchParamsInit = {};
-      if (newFilters && newFilters.size === 1) {
-        params.filters = Array.from(newFilters)[0];
-      }
-
-      setSearchParams(params);
-    },
-    [setSearchParams]
-  );
+    refetch({ limit });
+  }, [setTxsState, limit, refetch, filters]); // eslint-disable-line react-hooks/exhaustive-deps

  return {
-    updateFilters,
    txsData,
    loading,
    error,
    hasMoreTxs,
+    hasPreviousPage,
+    previousCursors,
+    cursor,
    refreshTxs,
    nextPage,
    previousPage,
  };
 };
-
-/**
- * Returns a Set of filters based on the URLSearchParams, or
- * defaults to all.
- * @param params
- * @returns Set
- */
-export function getInitialFilters(params: URLSearchParams): Set<FilterOption> {
-  const defaultFilters = new Set(AllFilterOptions);
-
-  const p = params.get('filters');
-
-  if (!p) {
-    return defaultFilters;
-  }
-
-  const filters = new Set<FilterOption>();
-  p.split(',').forEach((f) => {
-    if (AllFilterOptions.includes(f as FilterOption)) {
-      filters.add(f as FilterOption);
-    }
-  });
-
-  if (filters.size === 0) {
-    return defaultFilters;
-  }
-
-  return filters;
-}
@@ -204,7 +204,6 @@ describe('Block', () => {
    (useFetch as jest.Mock).mockReturnValue({
      state: { data: createBlockResponse(1), loading: false, error: null },
    });
-
    render(renderComponent(1));
    await waitFor(() => screen.getByTestId('block-header'));
    expect(screen.getByTestId('previous-block-button')).toHaveAttribute(
@@ -15,13 +15,9 @@ import { PartyBlockAccounts } from './components/party-block-accounts';
 import { isValidPartyId } from './components/party-id-error';
 import { useDataProvider } from '@vegaprotocol/data-provider';
 import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';
-import type { FilterOption } from '../../../components/txs/tx-filter';
 import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
-import { useSearchParams } from 'react-router-dom';

 const Party = () => {
-  const [params] = useSearchParams();
-
  const [filters, setFilters] = useState(new Set(AllFilterOptions));
  const { party } = useParams<{ party: string }>();

@@ -31,21 +27,24 @@ const Party = () => {
  const partyId = toNonHex(party ? party : '');
  const { isMobile } = useScreenDimensions();
  const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
+  const baseFilters = `filters[tx.submitter]=${partyId}`;
+  const f =
+    filters && filters.size === 1
+      ? `${baseFilters}&filters[cmd.type]=${Array.from(filters)[0]}`
+      : baseFilters;

  const {
+    hasMoreTxs,
    nextPage,
-    refreshTxs,
    previousPage,
    error,
+    refreshTxs,
    loading,
    txsData,
-    hasMoreTxs,
-    updateFilters,
+    hasPreviousPage,
  } = useTxsData({
-    filters: filters.size === 1 ? filters : undefined,
-    before: params.get('before') || undefined,
-    after: !params.get('before') ? params.get('after') || undefined : undefined,
-    party: partyId,
+    limit: 25,
+    filters: f,
  });

  const variables = useMemo(() => ({ partyId }), [partyId]);
@@ -103,21 +102,15 @@ const Party = () => {
        refreshTxs={refreshTxs}
        nextPage={nextPage}
        previousPage={previousPage}
-        hasPreviousPage={true}
+        hasPreviousPage={hasPreviousPage}
        loading={loading}
        hasMoreTxs={hasMoreTxs}
      >
-        <TxsFilter
-          filters={filters}
-          setFilters={(f) => {
-            setFilters(f);
-            updateFilters(f as Set<FilterOption>);
-          }}
-        />
+        <TxsFilter filters={filters} setFilters={setFilters} />
      </TxsListNavigation>
      {!error && txsData ? (
        <TxsInfiniteList
-          hasMoreTxs={true}
+          hasMoreTxs={hasMoreTxs}
          areTxsLoading={loading}
          txs={txsData}
          loadMoreTxs={nextPage}
@@ -1,14 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../../components/route-title';
 import { TxsInfiniteList } from '../../../components/txs';
-import { useTxsData, getInitialFilters } from '../../../hooks/use-txs-data';
+import { useTxsData } from '../../../hooks/use-txs-data';
 import { useDocumentTitle } from '../../../hooks/use-document-title';

 import { useState } from 'react';
-import { TxsFilter } from '../../../components/txs/tx-filter';
-import type { FilterOption } from '../../../components/txs/tx-filter';
+import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
 import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';
-import { useSearchParams } from 'react-router-dom';
+
+const BE_TXS_PER_REQUEST = 25;

 export const TxsList = () => {
  useDocumentTitle(['Transactions']);
@@ -27,22 +27,25 @@ export const TxsList = () => {
 * @returns {JSX.Element} Transaction List and controls
 */
 export const TxsListFiltered = () => {
-  const [params] = useSearchParams();
-  const [filters, setFilters] = useState(getInitialFilters(params));
+  const [filters, setFilters] = useState(new Set(AllFilterOptions));
+
+  const f =
+    filters && filters.size === 1
+      ? `filters[cmd.type]=${Array.from(filters)[0]}`
+      : '';

  const {
+    hasMoreTxs,
    nextPage,
    previousPage,
    error,
    refreshTxs,
    loading,
    txsData,
-    hasMoreTxs,
-    updateFilters,
+    hasPreviousPage,
  } = useTxsData({
-    filters: filters.size === 1 ? filters : undefined,
-    before: params.get('before') || undefined,
-    after: !params.get('before') ? params.get('after') || undefined : undefined,
+    limit: BE_TXS_PER_REQUEST,
+    filters: f,
  });

  return (
@@ -51,17 +54,11 @@ export const TxsListFiltered = () => {
        refreshTxs={refreshTxs}
        nextPage={nextPage}
        previousPage={previousPage}
-        hasPreviousPage={true}
+        hasPreviousPage={hasPreviousPage}
        loading={loading}
        hasMoreTxs={hasMoreTxs}
      >
-        <TxsFilter
-          filters={filters}
-          setFilters={(f) => {
-            setFilters(f);
-            updateFilters(f as Set<FilterOption>);
-          }}
-        />
+        <TxsFilter filters={filters} setFilters={setFilters} />
      </TxsListNavigation>
      <TxsInfiniteList
        hasFilters={filters.size > 0}
@@ -15,9 +15,6 @@ query ExplorerNodes {
        stakedByDelegates
        stakedTotal
        pendingStake
-        rankingScore {
-          performanceScore
-        }
        epochData {
          total
          offline
@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
 export type ExplorerNodesQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, rankingScore: { __typename?: 'RankingScore', performanceScore: string }, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };
+export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };


 export const ExplorerNodesDocument = gql`
@@ -27,9 +27,6 @@ export const ExplorerNodesDocument = gql`
        stakedByDelegates
        stakedTotal
        pendingStake
-        rankingScore {
-          performanceScore
-        }
        epochData {
          total
          offline
@@ -91,15 +91,7 @@ export const ValidatorsPage = () => {
  const { data: tmData } = useTendermintValidators(5000);
  const { data, loading, error, refetch } = useExplorerNodesQuery();

-  const validators = compact(
-    data?.nodesConnection.edges
-      ?.map((e) => e?.node)
-      .filter(
-        (node) =>
-          node?.rankingScore?.performanceScore &&
-          new BigNumber(node.rankingScore.performanceScore).isGreaterThan(0)
-      )
-  );
+  const validators = compact(data?.nodesConnection.edges?.map((e) => e?.node));

  // voting power
  const powers = compact(tmData?.result.validators).map(
@@ -218,33 +218,17 @@ describe(
      getProposalInformationFromTable('Tokens for proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
-          // 3002-PROP-021
-          cy.getByTestId('user-voted-yes').should('exist');
-          cy.getByTestId(viewProposalButton).click();
-        });
-      });
      cy.getByTestId(changeVoteButton).should('be.visible').click();
      voteForProposal('against');
      cy.getByTestId(proposalVoteProgressAgainstPercentage)
        .contains('100.00%')
        .and('be.visible');
-      cy.getByTestId(voteBreakdownToggle).click();
      getProposalInformationFromTable('Tokens against proposal')
        .should('have.text', (1).toFixed(2))
        .and('be.visible');
      getProposalInformationFromTable('Number of voting parties')
        .should('have.text', '1')
        .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
-          cy.getByTestId('user-voted-no').should('exist');
-          cy.getByTestId(viewProposalButton).click();
-        });
-      });
    });

    // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060
@@ -26,8 +26,6 @@ const votesTable = 'votes-table';
 const openProposals = 'open-proposals';
 const proposalVoteProgressForPercentage =
  'vote-progress-indicator-percentage-for';
-const majorityVoteReached = 'majority-reached';
-const minParticipationReached = 'participation-reached';
 const proposalTimeout = { timeout: 8000 };

 context(
@@ -74,7 +72,7 @@ context(
      });
    });

-    // 3001-VOTE-020 3001-VOTE-021 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
+    // 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
    it('Able to enact proposal by voting', function () {
      const proposalTitle = 'Add New proposal with short enactment';
      const proposalTx = createUpdateNetworkProposalTxBody();
@@ -87,18 +85,10 @@ context(
        cy.contains(proposalTitle)
          .parentsUntil(proposalListItem)
          .last()
-          .within(() => {
-            // 3001-VOTE-019 time to vote is highlighted red
-            cy.getByTestId('vote-details')
-              .find('span')
-              .should('have.class', 'text-vega-pink');
-            cy.getByTestId(viewProposalButton).click();
-          });
+          .within(() => cy.getByTestId(viewProposalButton).click());
      });
      cy.getByTestId(proposalStatus).should('have.text', 'Open');
      voteForProposal('for');
-      cy.getByTestId(majorityVoteReached).should('exist');
-      cy.getByTestId(minParticipationReached).should('exist');
      cy.getByTestId(proposalStatus, proposalTimeout)
        .should('have.text', 'Passed')
        .then(() => {
@@ -114,14 +104,6 @@ context(
      cy.getByTestId(proposalVoteProgressForPercentage)
        .contains('100.00%')
        .and('be.visible');
-      navigateTo(navigation.proposals);
-      cy.contains(proposalTitle)
-        .parentsUntil(proposalListItem)
-        .last()
-        .within(() => {
-          cy.getByTestId(majorityVoteReached).should('exist');
-          cy.getByTestId(minParticipationReached).should('exist');
-        });
    });

    // 3001-VOTE-047
@@ -49,8 +49,8 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    navigateTo(navigation.proposals);
  });

-  // 3001-VOTE-018
  it('Newly created proposals list - proposals closest to closing date appear higher in list', function () {
+    // 3001-VOTE-005
    const proposalDays = [364, 50, 2];
    for (let index = 0; index < proposalDays.length; index++) {
      goToMakeNewProposal(governanceProposalType.RAW);
@@ -120,24 +120,16 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
    submitUniqueRawProposal({ proposalTitle: proposalTitle });
    getProposalFromTitle(proposalTitle).within(() => {
      // 3001-VOTE-039
-      cy.getByTestId('participation-not-reached').should(
+      cy.getByTestId(voteStatus).should(
        'have.text',
-        'Min. participation not reached'
+        'Participation not reached'
      );
      cy.getByTestId(viewProposalButton).click();
    });
    voteForProposal('for');
    navigateTo(navigation.proposals);
    getProposalFromTitle(proposalTitle).within(() => {
-      cy.getByTestId(voteStatus).should(
-        'have.text',
-        'Currently expected to  pass'
-      );
-      cy.getByTestId('user-voted-yes').should('exist');
-      cy.getByTestId('participation-reached').should(
-        'have.text',
-        'Min. participation reached'
-      );
+      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
      cy.getByTestId(viewProposalButton).click();
    });
    cy.getByTestId(voteBreakDownToggle).click();
@@ -351,12 +351,6 @@ context(
        );
        stakingPageDisassociateAllTokens();
      });
-
-      it('Able to associate over 1 million tokens', function () {
-        cy.get(ethWalletAssociateButton).click();
-        stakingPageAssociateTokens('2000000', { approve: true });
-        stakingPageDisassociateAllTokens();
-      });
    });
  }
 );
@@ -17,7 +17,6 @@ const governanceDocsUrl = 'https://vega.xyz/governance';
 const networkUpgradeProposalListItem = 'protocol-upgrade-proposals-list-item';
 const closedProposals = 'closed-proposals';
 const closedProposalToggle = 'closed-proposals-toggle-networkUpgrades';
-const protocolUpgradeTime = 'protocol-upgrade-time';

 context(
  'Governance Page - verify elements on page',
@@ -175,7 +174,6 @@ context(
      });
    });

-    // 3009-NTWU-003 3009-NTWU-004 3009-NTWU-007
    it('should see details of network upgrade proposal', function () {
      mockNetworkUpgradeProposal();
      navigateTo(navigation.proposals);
@@ -230,7 +228,6 @@ context(
      cy.getByTestId(closedProposalToggle).should('not.exist');
    });

-    // 3009-NTWU-001 3009-NTWU-002 3009-NTWU-006 3009-NTWU-009
    it('should display network upgrade banner with estimate', function () {
      mockNetworkUpgradeProposal();
      cy.visit('/');
@@ -262,18 +259,10 @@ context(
        .as('displayedEstimate');
      cy.get('@displayedEstimate').then((estimateText) => {
        // Estimated time should automatically update every second
-        cy.getByTestId(protocolUpgradeTime)
+        cy.getByTestId('protocol-upgrade-time')
          .invoke('text')
          .should('not.eq', estimateText);
      });
-      // time estimate on proposal detail
-      cy.getByTestId('protocol-upgrade-proposal').within(() => {
-        cy.get('@displayedEstimate').then((estimateText) => {
-          cy.getByTestId(protocolUpgradeTime)
-            .invoke('text')
-            .should('not.eq', estimateText);
-        });
-      });
    });
  }
 );
@@ -25,5 +25,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 CYPRESS_FAIRGROUND=false
 LC_ALL="en_US.UTF-8"

-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
@@ -25,5 +25,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
@@ -16,6 +16,3 @@ NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/

 NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
-
-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
@@ -17,6 +17,3 @@ NX_VEGA_REST_URL=https://api.vega.community/api/v2/

 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
-
-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
@@ -16,6 +16,3 @@ NX_VEGA_REST_URL=https://api.mainnet-mirror.vega.rocks/api/v2/

 NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
-
-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
@@ -11,7 +11,4 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
-
-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
@@ -16,7 +16,4 @@ NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
-
-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=true
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -13,7 +13,4 @@ NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

 NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
-
-# Cosmic elevator flags
-NX_SUCCESSOR_MARKETS=false
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.
@@ -1 +0,0 @@
-export * from './json-diff';
@@ -1,30 +0,0 @@
-import { render, screen, cleanup } from '@testing-library/react';
-import { JsonDiff } from './json-diff';
-
-describe('JsonDiff', () => {
-  afterEach(cleanup);
-
-  it('renders without crashing', () => {
-    render(<JsonDiff left={{}} right={{}} />);
-    expect(screen.getByTestId('json-diff')).toBeInTheDocument();
-  });
-
-  it('shows the correct message when both objects are identical', () => {
-    render(<JsonDiff left={{}} right={{}} />);
-    expect(screen.getByText('Data is identical')).toBeInTheDocument();
-  });
-
-  it('does not show the "identical" message when both objects are not identical', () => {
-    render(
-      <JsonDiff
-        left={{
-          name: 'test',
-        }}
-        right={{
-          name: 'test2',
-        }}
-      />
-    );
-    expect(screen.queryByText('Data is identical')).not.toBeInTheDocument();
-  });
-});
@@ -1,46 +0,0 @@
-import { useState, useEffect } from 'react';
-import { useTranslation } from 'react-i18next';
-import { formatters, create } from 'jsondiffpatch';
-import 'jsondiffpatch/dist/formatters-styles/html.css';
-import 'jsondiffpatch/dist/formatters-styles/annotated.css';
-
-export type JsonValue =
-  | string
-  | number
-  | boolean
-  | null
-  | JsonValue[]
-  | { [key: string]: JsonValue };
-
-interface JsonDiffProps {
-  left: JsonValue;
-  right: JsonValue;
-  objectHash?: (obj: unknown) => string | undefined;
-}
-
-export const JsonDiff = ({ right, left, objectHash }: JsonDiffProps) => {
-  const { t } = useTranslation();
-  const [html, setHtml] = useState<string | undefined>();
-
-  useEffect(() => {
-    const delta = create({
-      objectHash,
-    }).diff(left, right);
-
-    if (delta) {
-      const deltaHtml = formatters.html.format(delta, left);
-
-      formatters.html.hideUnchanged();
-
-      setHtml(deltaHtml);
-    } else {
-      setHtml(undefined);
-    }
-  }, [right, left, objectHash]);
-
-  return html ? (
-    <div data-testid="json-diff" dangerouslySetInnerHTML={{ __html: html }} />
-  ) : (
-    <p data-testid="json-diff">{t('dataIsIdentical')}</p>
-  );
-};
@@ -18,7 +18,10 @@ import { VegaWallet } from '../vega-wallet';
 import { useLocation, useMatch } from 'react-router-dom';
 import { useEffect } from 'react';
 import { useTelemetryDialog } from '../telemetry-dialog/telemetry-dialog';
-import { ProtocolUpgradeCountdown } from '@vegaprotocol/proposals';
+import {
+  ProtocolUpgradeCountdown,
+  ProtocolUpgradeCountdownMode,
+} from '@vegaprotocol/proposals';

 export const SettingsLink = () => {
  const { open, isOpen, close } = useTelemetryDialog();
@@ -65,7 +68,9 @@ export const Nav = ({ theme }: Pick<NavigationProps, 'theme'>) => {
      actions={
        <>
          <SettingsLink />
-          <ProtocolUpgradeCountdown />
+          <ProtocolUpgradeCountdown
+            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+          />
        </>
      }
    >
@@ -853,7 +853,5 @@
  "consensusNodes": "consensus nodes",
  "activeNodes": "active nodes",
  "Estimated time to upgrade": "Estimated time to upgrade",
-  "Upgraded at": "Upgraded at",
-  "dataIsIdentical": "Data is identical",
-  "updatesToMarket": "Updates to market"
+  "Upgraded at": "Upgraded at"
 }
@@ -20,6 +20,6 @@ export const downloadJson = (jsonString: string, proposalTitle: string) => {
    window.URL.revokeObjectURL(url);
    document.body.removeChild(a);
  } catch (error) {
-    console.error(error);
+    console.log(error);
  }
 };
@@ -22,16 +22,6 @@ import {
 } from '../../test-helpers/mocks';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { MockedResponse } from '@apollo/client/testing';
-import { FLAGS } from '@vegaprotocol/environment';
-import { BrowserRouter } from 'react-router-dom';
-
-jest.mock('@vegaprotocol/proposals', () => ({
-  ...jest.requireActual('@vegaprotocol/proposals'),
-  useSuccessorMarketProposalDetails: () => ({
-    code: 'PARENT_CODE',
-    parentMarketId: 'PARENT_ID',
-  }),
-}));

 const renderComponent = (
  proposal: ProposalQuery['proposal'],
@@ -40,27 +30,20 @@ const renderComponent = (
 ) =>
  render(
    <AppStateProvider>
-      <BrowserRouter>
-        <MockedProvider mocks={mocks}>
-          <VegaWalletContext.Provider value={mockWalletContext}>
-            <ProposalHeader
-              proposal={proposal}
-              isListItem={isListItem}
-              networkParams={mockNetworkParams}
-            />
-          </VegaWalletContext.Provider>
-        </MockedProvider>
-      </BrowserRouter>
+      <MockedProvider mocks={mocks}>
+        <VegaWalletContext.Provider value={mockWalletContext}>
+          <ProposalHeader
+            proposal={proposal}
+            isListItem={isListItem}
+            networkParams={mockNetworkParams}
+          />
+        </VegaWalletContext.Provider>
+      </MockedProvider>
    </AppStateProvider>
  );

 describe('Proposal header', () => {
-  afterAll(() => {
-    jest.clearAllMocks();
-  });
  it('Renders New market proposal', () => {
-    const mockedFlags = jest.mocked(FLAGS);
-    mockedFlags.SUCCESSOR_MARKETS = true;
    renderComponent(
      generateProposal({
        rationale: {
@@ -93,9 +76,6 @@ describe('Proposal header', () => {
    expect(screen.getByTestId('proposal-details')).toHaveTextContent(
      'tGBP settled future.'
    );
-    expect(screen.getByTestId('proposal-successor-info')).toHaveTextContent(
-      'PARENT_CODE'
-    );
  });

  it('Renders Update market proposal', () => {
@@ -11,10 +11,6 @@ import { ProposalInfoLabel } from '../proposal-info-label';
 import { useUserVote } from '../vote-details/use-user-vote';
 import { ProposalVotingStatus } from '../proposal-voting-status';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';
-import { useSuccessorMarketProposalDetails } from '@vegaprotocol/proposals';
-import { FLAGS } from '@vegaprotocol/environment';
-import Routes from '../../../routes';
-import { Link } from 'react-router-dom';

 export const ProposalHeader = ({
  proposal,
@@ -43,9 +39,6 @@ export const ProposalHeader = ({
      fallbackTitle = t('NewMarketProposal');
      details = (
        <>
-          {FLAGS.SUCCESSOR_MARKETS && (
-            <SuccessorCode proposalId={proposal?.id} />
-          )}
          <span>
            {t('Code')}: {change.instrument.code}.
          </span>{' '}
@@ -145,7 +138,7 @@ export const ProposalHeader = ({
              className="flex items-center gap-2"
              data-testid={`user-voted-${voteState.toLowerCase()}`}
            >
-              <div className="text-vega-green" data-testid="you-voted-icon">
+              <div className="text-vega-green">
                <VegaIcon name={VegaIconNames.VOTE} size={24} />
              </div>
              <div>
@@ -188,20 +181,3 @@ export const ProposalHeader = ({
    </>
  );
 };
-
-const SuccessorCode = ({ proposalId }: { proposalId?: string | null }) => {
-  const { t } = useTranslation();
-  const successor = useSuccessorMarketProposalDetails(proposalId);
-
-  return successor.parentMarketId || successor.code ? (
-    <span className="block" data-testid="proposal-successor-info">
-      {t('Successor market to')}:{' '}
-      <Link
-        to={`${Routes.PROPOSALS}/${successor.parentMarketId}`}
-        className="hover:underline"
-      >
-        {successor.code || successor.parentMarketId}
-      </Link>
-    </span>
-  ) : null;
-};
@@ -1 +0,0 @@
-export * from './proposal-market-changes';
@@ -1,91 +0,0 @@
-import { render, fireEvent } from '@testing-library/react';
-import {
-  ProposalMarketChanges,
-  applyImmutableKeysFromEarlierVersion,
-} from './proposal-market-changes';
-import type { JsonValue } from '../../../../components/json-diff';
-
-describe('applyImmutableKeysFromEarlierVersion', () => {
-  it('returns an empty object if any argument is not an object or null', () => {
-    const earlierVersion: JsonValue = null;
-    const updatedVersion: JsonValue = null;
-    expect(
-      applyImmutableKeysFromEarlierVersion(earlierVersion, updatedVersion)
-    ).toEqual({});
-  });
-
-  it('overrides updatedVersion with values from earlierVersion for immutable keys', () => {
-    const earlierVersion: JsonValue = {
-      decimalPlaces: 2,
-      positionDecimalPlaces: 3,
-      instrument: {
-        name: 'Instrument1',
-        future: {
-          settlementAsset: 'Asset1',
-        },
-      },
-    };
-
-    const updatedVersion: JsonValue = {
-      decimalPlaces: 3, // should be overridden by 2
-      positionDecimalPlaces: 4, // should be overridden by 3
-      instrument: {
-        name: 'Instrument2', // should be overridden by 'Instrument1'
-        future: {
-          settlementAsset: 'Asset2', // should be overridden by 'Asset1'
-        },
-      },
-    };
-
-    const expected: JsonValue = {
-      decimalPlaces: 2,
-      positionDecimalPlaces: 3,
-      instrument: {
-        name: 'Instrument1',
-        future: {
-          settlementAsset: 'Asset1',
-        },
-      },
-    };
-
-    expect(
-      applyImmutableKeysFromEarlierVersion(earlierVersion, updatedVersion)
-    ).toEqual(expected);
-  });
-});
-
-describe('ProposalMarketChanges', () => {
-  it('renders correctly', () => {
-    const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    expect(getByTestId('proposal-market-changes')).toBeInTheDocument();
-  });
-
-  it('JsonDiff is not visible when showChanges is false', () => {
-    const { queryByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    expect(queryByTestId('json-diff')).not.toBeInTheDocument();
-  });
-
-  it('JsonDiff is visible when showChanges is true', async () => {
-    const { getByTestId } = render(
-      <ProposalMarketChanges
-        originalProposal={{}}
-        latestEnactedProposal={{}}
-        updatedProposal={{}}
-      />
-    );
-    fireEvent.click(getByTestId('proposal-market-changes-toggle'));
-    expect(getByTestId('json-diff')).toBeInTheDocument();
-  });
-});
@@ -1,86 +0,0 @@
-import cloneDeep from 'lodash/cloneDeep';
-import set from 'lodash/set';
-import get from 'lodash/get';
-import { JsonDiff } from '../../../../components/json-diff';
-import { useTranslation } from 'react-i18next';
-import { useState } from 'react';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { SubHeading } from '../../../../components/heading';
-import type { JsonValue } from '../../../../components/json-diff';
-
-const immutableKeys = [
-  'decimalPlaces',
-  'positionDecimalPlaces',
-  'instrument.name',
-  'instrument.future.settlementAsset',
-];
-
-export const applyImmutableKeysFromEarlierVersion = (
-  earlierVersion: JsonValue,
-  updatedVersion: JsonValue
-) => {
-  if (
-    typeof earlierVersion !== 'object' ||
-    earlierVersion === null ||
-    typeof updatedVersion !== 'object' ||
-    updatedVersion === null
-  ) {
-    // If either version is not an object or is null, return null or throw an error
-    return {};
-  }
-
-  const updatedVersionCopy = cloneDeep(updatedVersion);
-
-  // Overwrite the immutable keys in the updatedVersionCopy with the earlier values
-  immutableKeys.forEach((key) => {
-    set(updatedVersionCopy, key, get(earlierVersion, key));
-  });
-
-  return updatedVersionCopy;
-};
-
-interface ProposalMarketChangesProps {
-  originalProposal: JsonValue;
-  latestEnactedProposal: JsonValue | undefined;
-  updatedProposal: JsonValue;
-}
-
-export const ProposalMarketChanges = ({
-  originalProposal,
-  latestEnactedProposal,
-  updatedProposal,
-}: ProposalMarketChangesProps) => {
-  const { t } = useTranslation();
-  const [showChanges, setShowChanges] = useState(false);
-
-  return (
-    <section data-testid="proposal-market-changes">
-      <CollapsibleToggle
-        toggleState={showChanges}
-        setToggleState={setShowChanges}
-        dataTestId={'proposal-market-changes-toggle'}
-      >
-        <SubHeading title={t('updatesToMarket')} />
-      </CollapsibleToggle>
-
-      {showChanges && (
-        <div className="mb-6">
-          <JsonDiff
-            left={latestEnactedProposal || originalProposal}
-            right={
-              latestEnactedProposal
-                ? applyImmutableKeysFromEarlierVersion(
-                    latestEnactedProposal,
-                    updatedProposal
-                  )
-                : applyImmutableKeysFromEarlierVersion(
-                    originalProposal,
-                    updatedProposal
-                  )
-            }
-          />
-        </div>
-      )}
-    </section>
-  );
-};
@@ -17,7 +17,6 @@ import type { MarketInfoWithData } from '@vegaprotocol/markets';
 import type { AssetQuery } from '@vegaprotocol/assets';
 import { removePaginationWrapper } from '@vegaprotocol/utils';
 import { ProposalState } from '@vegaprotocol/types';
-import { ProposalMarketChanges } from '../proposal-market-changes';
 import type { NetworkParamsResult } from '@vegaprotocol/network-parameters';

 export enum ProposalType {
@@ -35,10 +34,6 @@ export interface ProposalProps {
  assetData?: AssetQuery | null;
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
  restData: any;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  originalMarketProposalRestData?: any;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  mostRecentlyEnactedAssociatedMarketProposal?: any;
 }

 export const Proposal = ({
@@ -47,8 +42,6 @@ export const Proposal = ({
  restData,
  newMarketData,
  assetData,
-  originalMarketProposalRestData,
-  mostRecentlyEnactedAssociatedMarketProposal,
 }: ProposalProps) => {
  const { t } = useTranslation();

@@ -161,24 +154,6 @@ export const Proposal = ({
          </div>
        )}

-        {proposal.terms.change.__typename === 'UpdateMarket' && (
-          <div className="mb-4">
-            <ProposalMarketChanges
-              originalProposal={
-                originalMarketProposalRestData?.data?.proposal?.terms?.newMarket
-                  ?.changes || {}
-              }
-              latestEnactedProposal={
-                mostRecentlyEnactedAssociatedMarketProposal?.node?.proposal
-                  ?.terms?.updateMarket?.changes || {}
-              }
-              updatedProposal={
-                restData?.data?.proposal?.terms?.updateMarket?.changes || {}
-              }
-            />
-          </div>
-        )}
-
        {(proposal.terms.change.__typename === 'NewAsset' ||
          proposal.terms.change.__typename === 'UpdateAsset') &&
          asset && (
@@ -1,5 +1,5 @@
 import { Link } from 'react-router-dom';
-import { Button } from '@vegaprotocol/ui-toolkit';
+import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { differenceInHours, format, formatDistanceToNowStrict } from 'date-fns';
 import { useTranslation } from 'react-i18next';
 import { DATE_FORMAT_DETAILED } from '../../../../lib/date-formats';
@@ -115,6 +115,10 @@ export const ProposalsListItemDetails = ({

  return (
    <div className="mt-4 items-start text-sm">
+      <div className="text-vega-green">
+        <VegaIcon size={16} name={VegaIconNames.VOTE} />
+        <VegaIcon size={16} name={VegaIconNames.TICKET} />
+      </div>
      <div className="flex items-center gap-2 text-vega-light-300 mb-2">
        {voteDetails && <span data-testid="vote-details">{voteDetails}</span>}
        {voteDetails && voteStatus && <span>&middot;</span>}
@@ -1,5 +1,5 @@
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { useEffect, useState } from 'react';
+import { useEffect } from 'react';
 import { useParams } from 'react-router-dom';

 import { Proposal } from '../components/proposal';
@@ -16,12 +16,7 @@ import {
 } from '@vegaprotocol/network-parameters';

 export const ProposalContainer = () => {
-  const [
-    mostRecentlyEnactedAssociatedMarketProposal,
-    setMostRecentlyEnactedAssociatedMarketProposal,
-  ] = useState(undefined);
  const params = useParams<{ proposalId: string }>();
-
  const {
    params: networkParams,
    loading: networkParamsLoading,
@@ -42,11 +37,9 @@ export const ProposalContainer = () => {
    NetworkParams.governance_proposal_updateNetParam_requiredMajority,
    NetworkParams.governance_proposal_freeform_requiredMajority,
  ]);
-
  const {
-    state: { data: restData, loading: restLoading, error: restError },
+    state: { data: restData },
  } = useFetch(`${ENV.rest}governance?proposalId=${params.proposalId}`);
-
  const { data, loading, error, refetch } = useProposalQuery({
    fetchPolicy: 'network-only',
    errorPolicy: 'ignore',
@@ -54,35 +47,6 @@ export const ProposalContainer = () => {
    skip: !params.proposalId,
  });

-  const {
-    state: {
-      data: originalMarketProposalRestData,
-      loading: originalMarketProposalRestLoading,
-      error: originalMarketProposalRestError,
-    },
-  } = useFetch(
-    `${ENV.rest}governance?proposalId=${
-      data?.proposal?.terms.change.__typename === 'UpdateMarket' &&
-      data?.proposal.terms.change.marketId
-    }`,
-    undefined,
-    true,
-    data?.proposal?.terms.change.__typename !== 'UpdateMarket'
-  );
-
-  const {
-    state: {
-      data: previouslyEnactedMarketProposalsRestData,
-      loading: previouslyEnactedMarketProposalsRestLoading,
-      error: previouslyEnactedMarketProposalsRestError,
-    },
-  } = useFetch(
-    `${ENV.rest}governances?proposalState=STATE_ENACTED&proposalType=TYPE_UPDATE_MARKET`,
-    undefined,
-    true,
-    data?.proposal?.terms.change.__typename !== 'UpdateMarket'
-  );
-
  const {
    data: newMarketData,
    loading: newMarketLoading,
@@ -115,39 +79,6 @@ export const ProposalContainer = () => {
    ),
  });

-  useEffect(() => {
-    if (
-      previouslyEnactedMarketProposalsRestData &&
-      data?.proposal?.terms.change.__typename === 'UpdateMarket'
-    ) {
-      const change = data?.proposal?.terms?.change as { marketId: string };
-
-      const filteredProposals =
-        // @ts-ignore rest data is not typed
-        previouslyEnactedMarketProposalsRestData.connection.edges.filter(
-          // @ts-ignore rest data is not typed
-          ({ node }) =>
-            node?.proposal?.terms?.updateMarket?.marketId === change.marketId
-        );
-
-      const sortedProposals = filteredProposals.sort(
-        // @ts-ignore rest data is not typed
-        (a, b) =>
-          new Date(a?.node?.terms?.enactmentTimestamp).getTime() -
-          new Date(b?.node?.terms?.enactmentTimestamp).getTime()
-      );
-
-      setMostRecentlyEnactedAssociatedMarketProposal(
-        sortedProposals[sortedProposals.length - 1]
-      );
-    }
-  }, [
-    previouslyEnactedMarketProposalsRestData,
-    params.proposalId,
-    data?.proposal?.terms.change.__typename,
-    data?.proposal?.terms.change,
-  ]);
-
  useEffect(() => {
    const interval = setInterval(refetch, 2000);
    return () => clearInterval(interval);
@@ -156,39 +87,14 @@ export const ProposalContainer = () => {
  return (
    <AsyncRenderer
      loading={
-        loading ||
-        newMarketLoading ||
-        assetLoading ||
-        networkParamsLoading ||
-        (restLoading ? (restLoading as boolean) : false) ||
-        (originalMarketProposalRestLoading
-          ? (originalMarketProposalRestLoading as boolean)
-          : false) ||
-        (previouslyEnactedMarketProposalsRestLoading
-          ? (previouslyEnactedMarketProposalsRestLoading as boolean)
-          : false)
-      }
-      error={
-        error ||
-        newMarketError ||
-        assetError ||
-        restError ||
-        originalMarketProposalRestError ||
-        previouslyEnactedMarketProposalsRestError ||
-        networkParamsError
+        loading || newMarketLoading || assetLoading || networkParamsLoading
      }
+      error={error || newMarketError || assetError || networkParamsError}
      data={{
        ...data,
        ...networkParams,
        ...(newMarketData ? { newMarketData } : {}),
        ...(assetData ? { assetData } : {}),
-        ...(restData ? { restData } : {}),
-        ...(originalMarketProposalRestData
-          ? { originalMarketProposalRestData }
-          : {}),
-        ...(previouslyEnactedMarketProposalsRestData
-          ? { previouslyEnactedMarketProposalsRestData }
-          : {}),
      }}
    >
      {data?.proposal ? (
@@ -198,10 +104,6 @@ export const ProposalContainer = () => {
          restData={restData}
          newMarketData={newMarketData}
          assetData={assetData}
-          originalMarketProposalRestData={originalMarketProposalRestData}
-          mostRecentlyEnactedAssociatedMarketProposal={
-            mostRecentlyEnactedAssociatedMarketProposal
-          }
        />
      ) : (
        <ProposalNotFound />
@@ -5,6 +5,7 @@ import {
  RewardsTable,
 } from '../shared-rewards-table-assets/shared-rewards-table-assets';
 import type { EpochIndividualReward } from './generate-epoch-individual-rewards-list';
+import { useTranslation } from 'react-i18next';

 interface EpochIndividualRewardsGridProps {
  data: EpochIndividualReward;
@@ -21,11 +22,14 @@ interface RewardItemProps {
 const DisplayReward = ({
  reward,
  decimals,
+  percentageOfTotal,
 }: {
  reward: string;
  decimals: number;
  percentageOfTotal?: string;
 }) => {
+  const { t } = useTranslation();
+
  if (Number(reward) === 0) {
    return <span className="text-vega-dark-300">-</span>;
  }
@@ -35,12 +39,23 @@ const DisplayReward = ({
      description={
        <div className="flex flex-col items-start">
          <span>{formatNumber(toBigNum(reward, decimals), decimals)}</span>
+          {percentageOfTotal && (
+            <span className="text-vega-dark-300">
+              ({percentageOfTotal}% {t('ofTotalDistributed')})
+            </span>
+          )}
        </div>
      }
    >
      <button>
        <div className="flex flex-col items-start">
          <span>{formatNumber(toBigNum(reward, decimals), 4)}</span>
+          {percentageOfTotal && (
+            <span className="text-vega-dark-300">
+              ({formatNumber(percentageOfTotal, 4).toString()}
+              %)
+            </span>
+          )}
        </div>
      </button>
    </Tooltip>
@@ -168,6 +168,17 @@ describe('generateEpochIndividualRewardsList', () => {
    expect(result2[1].epoch).toEqual(1);
  });

+  it('correctly calculates the total value of rewards for an asset', () => {
+    const rewards = [reward1, reward4];
+    const result = generateEpochIndividualRewardsList({
+      rewards,
+      epochId: 1,
+      epochRewardSummaries: [],
+    });
+
+    expect(result[0].rewards[0].totalAmount).toEqual('200');
+  });
+
  it('returns data in the expected shape', () => {
    // Just sanity checking the whole structure here
    const rewards = [reward1, reward2, reward3, reward4];
@@ -447,4 +458,69 @@ describe('generateEpochIndividualRewardsList', () => {
      },
    ]);
  });
+
+  it('correctly calculates the percentage of two or more rewards by referencing the total rewards amount', () => {
+    const result = generateEpochIndividualRewardsList({
+      rewards: [
+        // reward1 is 100 usd, which is 10% of the total rewards amount
+        reward1,
+        {
+          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+          amount: '200',
+          percentageOfTotal: '0.2',
+          receivedAt: new Date(),
+          asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+          party: { id: 'blah' },
+          epoch: { id: '1' },
+        },
+      ],
+      epochId: 1,
+      epochRewardSummaries: [
+        {
+          __typename: 'EpochRewardSummary',
+          epoch: 1,
+          assetId: 'usd',
+          amount: '1000',
+          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
+        },
+      ],
+    });
+
+    expect(result[0]).toEqual({
+      epoch: 1,
+      rewards: [
+        {
+          asset: 'USD',
+          decimals: 6,
+          totalAmount: '300',
+          rewardTypes: {
+            [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
+              amount: '300',
+              percentageOfTotal: '30',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+            [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
+              amount: '0',
+              percentageOfTotal: '0',
+            },
+          },
+        },
+      ],
+    });
+  });
 });
@@ -59,6 +59,7 @@ export const generateEpochIndividualRewardsList = ({
  const epochIndividualRewards = rewards.reduce((acc, reward) => {
    const epochId = reward.epoch.id;
    const assetName = reward.asset.name;
+    const assetId = reward.asset.id;
    const assetDecimals = reward.asset.decimals;
    const rewardType = reward.rewardType;
    const amount = reward.amount;
@@ -76,6 +77,13 @@ export const generateEpochIndividualRewardsList = ({
    const epoch = acc.get(epochId);

    // matchingTotalReward is the total awarded for all users for the reward type in the epoch of the asset
+    const matchingTotalRewardAmount = epochRewardSummaries.find(
+      (summary) =>
+        summary.epoch === Number(epochId) &&
+        summary.assetId === assetId &&
+        summary.rewardType === rewardType
+    )?.amount;
+
    let asset = epoch?.rewards.find((r) => r.asset === assetName);

    if (!asset) {
@@ -98,7 +106,14 @@ export const generateEpochIndividualRewardsList = ({

      asset.rewardTypes[rewardType] = {
        amount: newAmount,
-        percentageOfTotal: percentageOfTotal,
+        percentageOfTotal: matchingTotalRewardAmount
+          ? new BigNumber(newAmount)
+              .dividedBy(matchingTotalRewardAmount)
+              .multipliedBy(100)
+              .toString()
+          : // this should never be reached, if there's an individual reward there should
+            // always be a reward total from the api too, but set it as a fallback just in case
+            percentageOfTotal,
      };
    }

@@ -61,6 +61,8 @@ export const RewardsPage = () => {
    error: paramsError,
  } = useNetworkParams([NetworkParams.reward_staking_delegation_payoutDelay]);

+  console.log('params', params);
+
  const payoutDuration = useMemo(() => {
    if (!params) {
      return 0;
@@ -8,10 +8,9 @@ import { TxState } from '../../../hooks/transaction-reducer';
 import { useTransaction } from '../../../hooks/use-transaction';
 import { BigNumber } from '../../../lib/bignumber';
 import { AssociateInfo } from './associate-info';
-import { toBigNum } from '@vegaprotocol/utils';
+import { removeDecimal, toBigNum } from '@vegaprotocol/utils';
 import type { EthereumConfig } from '@vegaprotocol/web3';
 import { useBalances } from '../../../lib/balances/balances-store';
-import { MaxUint256 } from '@ethersproject/constants';

 export const WalletAssociate = ({
  perform,
@@ -43,7 +42,7 @@ export const WalletAssociate = ({
  } = useTransaction(() => {
    return token.approve(
      ethereumConfig.staking_bridge_contract.address,
-      MaxUint256.toString()
+      removeDecimal('1000000', decimals).toString()
    );
  });

@@ -62,7 +62,7 @@
  cursor: pointer;
 }

-/* Styles required to (effectively) un-override the
+/* Styles required to (effectively) un-override the 
 * reset styles so that the Proposal description fields
 * render as you'd expect them to.
 *
@@ -97,33 +97,3 @@
 .react-markdown-container ul li {
  list-style: circle;
 }
-
-.jsondiffpatch-delta,
-.jsondiffpatch-delta pre {
-  font-family: 'Roboto Mono', monospace !important;
-}
-
-.jsondiffpatch-delta pre {
-  padding: 0 0.25em !important;
-}
-
-.jsondiffpatch-added .jsondiffpatch-property-name,
-.jsondiffpatch-added .jsondiffpatch-value pre,
-.jsondiffpatch-modified .jsondiffpatch-right-value pre,
-.jsondiffpatch-textdiff-added {
-  background: theme(colors.vega.green[650]) !important;
-  color: theme(colors.white) !important;
-}
-
-.jsondiffpatch-deleted .jsondiffpatch-property-name,
-.jsondiffpatch-deleted pre,
-.jsondiffpatch-modified .jsondiffpatch-left-value pre,
-.jsondiffpatch-textdiff-deleted {
-  background: theme(colors.vega.pink[650]) !important;
-  color: theme(colors.white) !important;
-}
-
-.jsondiffpatch-moved .jsondiffpatch-moved-destination {
-  background: theme(colors.vega.yellow[350]) !important;
-  color: theme(colors.vega.dark[200]) !important;
-}
@@ -535,7 +535,6 @@ function checkIfDataAndTimeOfCreationAndUpdateIsEqual(date: string) {
      // unexpected latency
      const minBefore = subSeconds(new Date(), 5);
      const maxAfter = addSeconds(new Date(), 5);
-      // eslint-disable-next-line no-console
      console.log(maxAfter);
      const date = new Date($dateTime.toString());
      expect(isAfter(date, minBefore) && isBefore(date, maxAfter)).to.equal(
@@ -363,11 +363,12 @@ describe('Closed markets', { tags: '@smoke' }, () => {
      .first()
      .find('button svg')
      .should('exist');
+
    if (Cypress.env('NX_SUCCESSOR_MARKETS')) {
      cy.get(rowSelector)
-        .find('[col-id="successorMarket"]')
+        .find('[col-id="successorMarketID"]')
        .first()
-        .should('have.text', '-');
+        .should('have.text', ' - ');
    }
  });

@@ -68,4 +68,22 @@ describe('home', { tags: '@regression' }, () => {
      cy.getByTestId('connect').click();
    });
  });
+
+  describe('Network switcher', () => {
+    before(() => {
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.visit('/');
+    });
+
+    it('switch to fairground network and check status & incidents link', () => {
+      // 0006-NETW-002
+      // 0006-NETW-003
+      cy.getByTestId('navigation')
+        .find('[data-testid="network-switcher"]')
+        .should('have.text', 'Custom')
+        .click();
+      cy.getByTestId('network-item').contains('Fairground testnet');
+    });
+  });
 });
@@ -27,7 +27,6 @@ describe('markets all table', { tags: '@smoke' }, () => {
      'Description',
      'Trading mode',
      'Status',
-      'Successor market',
      'Best bid',
      'Best offer',
      'Mark price',
@@ -1,6 +1,5 @@
 import { MarketTradingModeMapping } from '@vegaprotocol/types';
 import { MarketState } from '@vegaprotocol/types';
-import compact from 'lodash/compact';

 const accordionContent = 'accordion-content';
 const blockExplorerLink = 'block-explorer-link';
@@ -67,24 +66,20 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    // 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'],
-    ]);
+    validateMarketDataRow(0, 'Name', 'BTCUSD Monthly (30 Jun 2022)');
+    validateMarketDataRow(1, 'Market ID', 'market-0');

-    for (const rowNumber in rows) {
-      const [name, value] = rows[rowNumber];
-      validateMarketDataRow(Number(rowNumber), name, value);
+    if (Cypress.env('NX_SUCCESSOR_MARKETS')) {
+      validateMarketDataRow(2, 'Parent Market ID', 'PARENT-A');
    }
+    validateMarketDataRow(
+      3,
+      'Trading Mode',
+      MarketTradingModeMapping.TRADING_MODE_CONTINUOUS
+    );
+    validateMarketDataRow(4, 'Market Decimal Places', '5');
+    validateMarketDataRow(5, 'Position Decimal Places', '0');
+    validateMarketDataRow(6, 'Settlement Asset Decimal Places', '5');
  });

  it('instrument displayed', () => {
@@ -19,7 +19,6 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      'Description',
      'Settlement asset',
      'State',
-      'Parent market',
      'Voting',
      'Closing date',
      'Enactment date',
@@ -84,7 +83,7 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
      .find('button')
      .click();

-    const dropdownContent = '[data-testid="proposal-actions-content"]';
+    const dropdownContent = '[data-testid="market-actions-content"]';
    const dropdownContentItem = '[role="menuitem"]';

    // 6001-MARK-059
@@ -100,7 +99,7 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
          'VEGA_TOKEN_URL'
        )}/proposals/e9ec6d5c46a7e7bcabf9ba7a893fa5a5eeeec08b731f06f7a6eb7bf0e605b829`
      );
-    cy.getByTestId('proposal-actions-content').click();
+    cy.getByTestId('market-actions-content').click();
  });

  // 6001-MARK-060
@@ -0,0 +1,114 @@
+import { mockConnectWallet } from '@vegaprotocol/cypress';
+
+describe('Navbar', { tags: '@smoke' }, () => {
+  beforeEach(() => {
+    cy.clearAllLocalStorage();
+    cy.mockTradingPage();
+    cy.mockSubscription();
+    cy.visit('/');
+    cy.wait('@Markets');
+    cy.wait('@MarketsData');
+  });
+
+  const pages = [
+    { name: 'Markets', link: '#/markets/all' },
+    { name: 'Trading', link: '#/markets' },
+    { name: 'Portfolio', link: '#/portfolio' },
+  ];
+
+  describe('desktop view', () => {
+    pages.forEach(({ name, link }) => {
+      it(`${name} should be correctly rendered`, () => {
+        cy.get('nav')
+          .find(`a[data-testid=${name}]:visible`)
+          .then((element) => {
+            cy.wrap(element).click();
+            cy.location('hash').should('contain', link);
+          });
+      });
+    });
+
+    it('Resources dropdown should be correctly rendered', () => {
+      const resourceSelector = 'ul li:contains(Resources)';
+      ['Docs', 'Give Feedback'].forEach((text, index) => {
+        cy.get('nav').find(resourceSelector).contains('Resources').click();
+        cy.get('nav')
+          .find(resourceSelector)
+          .find('.navigation-content li')
+          .eq(index)
+          .find('a')
+          .then((element) => {
+            expect(element.attr('target')).to.eq('_blank');
+            expect(element.attr('href')).to.not.be.empty;
+            expect(element.text()).to.eq(text);
+          });
+      });
+    });
+
+    it('Disclaimer should be presented after choosing from menu', () => {
+      cy.get('nav')
+        .find('ul li:contains(Resources)')
+        .contains('Resources')
+        .click();
+      cy.getByTestId('Disclaimer').eq(0).click();
+      cy.location('hash').should('equal', '#/disclaimer');
+      cy.get('p').contains(
+        'Vega is a decentralised peer-to-peer protocol that can be used to trade derivatives with cryptoassets.'
+      );
+    });
+  });
+
+  describe('mobile view', () => {
+    const viewportHeight = Cypress.config('viewportHeight');
+    const viewportWidth = Cypress.config('viewportWidth');
+    before(() => {
+      // a little hack to keep the viewport size between tests (cypress bug)
+      Cypress.config({
+        viewportWidth: 560,
+        viewportHeight: 890,
+      });
+      cy.viewport(560, 890);
+    });
+
+    describe('wallet drawer', () => {
+      it('wallet drawer should be correctly rendered', () => {
+        mockConnectWallet();
+        cy.connectVegaWallet(true);
+        cy.getByTestId('connect-vega-wallet-mobile').click();
+        cy.getByTestId('wallets-drawer').should('be.visible');
+        cy.getByTestId('wallets-drawer').within((el) => {
+          cy.wrap(el).get('button').contains('Disconnect').click();
+        });
+        cy.getByTestId('wallets-drawer').should('not.be.visible');
+      });
+    });
+
+    describe('menu drawer', () => {
+      pages.forEach(({ name, link }) => {
+        it(`${name} should be correctly rendered`, () => {
+          cy.getByTestId('button-menu-drawer').click();
+          cy.getByTestId('menu-drawer').should('be.visible');
+          cy.getByTestId('menu-drawer').within((el) => {
+            cy.wrap(el).getByTestId(name).click();
+            cy.location('hash').should('contain', link);
+          });
+        });
+      });
+
+      it('Menu drawer should not be visible until opened', () => {
+        cy.getByTestId('menu-drawer').should('not.be.visible');
+        cy.getByTestId('button-menu-drawer').click();
+        cy.getByTestId('menu-drawer').should('be.visible');
+        cy.getByTestId('button-menu-drawer').click();
+        cy.getByTestId('menu-drawer').should('not.be.visible');
+      });
+    });
+    after(() => {
+      // a little hack to keep the viewport size between tests (cypress bug)
+      Cypress.config({
+        viewportWidth,
+        viewportHeight,
+      });
+    });
+  });
+});
@@ -127,7 +127,7 @@ describe(
        {
          name: 'Price monitoring bounds',
          infoText:
-            'Price Monitoring Bounds 1: Min 162.56291Max 182.96869Reference 172.47489',
+            'Price Monitoring Bounds: Min 162.56291Max 182.96869Reference 172.47489',
        },
      ];

@@ -171,7 +171,6 @@ describe(
        .invoke('text')
        .then((text) => {
          const actualDate = text.slice(0, -67);
-          // eslint-disable-next-line no-console
          console.log(actualDate);
          const actualOhlc = text.slice(-67);
          assert.isTrue(expectedDateRegex.test(actualDate));
@@ -7,7 +7,7 @@ const closePosition = 'close-position';
 const dialogCloseX = 'dialog-close';
 const dialogContent = 'dialog-content';
 const dropDownMenu = 'dropdown-menu';
-const marketActionsContent = 'position-actions-content';
+const marketActionsContent = 'market-actions-content';
 const positions = 'Positions';
 const tabPositions = 'tab-positions';
 const toastContent = 'toast-content';
@@ -36,7 +36,6 @@ import {
  successorMarketQuery,
  parentMarketIdQuery,
  successorMarketIdsQuery,
-  successorMarketProposalDetailsQuery,
 } from '@vegaprotocol/mock';
 import type { PartialDeep } from 'type-fest';
 import type { MarketDataQuery, MarketsQuery } from '@vegaprotocol/markets';
@@ -187,11 +186,6 @@ const mockTradingPage = (
  aliasGQLQuery(req, 'SuccessorMarket', successorMarketQuery());
  aliasGQLQuery(req, 'ParentMarketId', parentMarketIdQuery());
  aliasGQLQuery(req, 'SuccessorMarketIds', successorMarketIdsQuery());
-  aliasGQLQuery(
-    req,
-    'SuccessorMarketProposalDetails',
-    successorMarketProposalDetailsQuery()
-  );
 };
 declare global {
  // eslint-disable-next-line @typescript-eslint/no-namespace
@@ -17,10 +17,7 @@ import {
  usePaneLayout,
 } from '../../components/resizable-grid';
 import { TradingViews } from './trade-views';
-import {
-  MarketSuccessorBanner,
-  MarketSuccessorProposalBanner,
-} from '../../components/market-banner';
+import { MarketSuccessorBanner } from '../../components/market-banner';
 import { FLAGS } from '@vegaprotocol/environment';

 interface TradeGridProps {
@@ -165,12 +162,7 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
  return (
    <div className={wrapperClasses}>
      <div>
-        {FLAGS.SUCCESSOR_MARKETS && (
-          <>
-            <MarketSuccessorBanner market={market} />
-            <MarketSuccessorProposalBanner marketId={market?.id} />
-          </>
-        )}
+        {FLAGS.SUCCESSOR_MARKETS && <MarketSuccessorBanner market={market} />}
        <OracleBanner marketId={market?.id || ''} />
      </div>
      <div className="min-h-0 p-0.5">
@@ -12,10 +12,7 @@ import { Splash } from '@vegaprotocol/ui-toolkit';
 import { NO_MARKET } from './constants';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import classNames from 'classnames';
-import {
-  MarketSuccessorBanner,
-  MarketSuccessorProposalBanner,
-} from '../../components/market-banner';
+import { MarketSuccessorBanner } from '../../components/market-banner';
 import { FLAGS } from '@vegaprotocol/environment';

 interface TradePanelsProps {
@@ -68,12 +65,7 @@ export const TradePanels = ({
  return (
    <div className="h-full grid grid-rows-[min-content_1fr_min-content]">
      <div>
-        {FLAGS.SUCCESSOR_MARKETS && (
-          <>
-            <MarketSuccessorBanner market={market} />
-            <MarketSuccessorProposalBanner marketId={market?.id} />
-          </>
-        )}
+        {FLAGS.SUCCESSOR_MARKETS && <MarketSuccessorBanner market={market} />}
        <OracleBanner marketId={market?.id || ''} />
      </div>
      <div className="h-full">
@@ -88,12 +80,9 @@ export const TradePanels = ({
      <div className="flex flex-nowrap overflow-x-auto max-w-full border-t border-default">
        {Object.keys(TradingViews).map((key) => {
          const isActive = view === key;
-          const className = classNames(
-            'py-2 px-4 min-w-[100px] capitalize text-sm',
-            {
-              'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
-            }
-          );
+          const className = classNames('p-4 min-w-[100px] capitalize', {
+            'bg-vega-clight-500 dark:bg-vega-cdark-500': isActive,
+          });
          return (
            <button
              data-testid={key}
@@ -10,18 +10,15 @@ 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,
@@ -49,16 +46,10 @@ jest.mock('@vegaprotocol/markets', () => ({
      : { data: undefined },
 }));

-jest.mock('@vegaprotocol/environment', () => {
-  const actual = jest.requireActual('@vegaprotocol/environment');
-  return {
-    ...actual,
-    FLAGS: {
-      ...actual.FLAGS,
-      SUCCESSOR_MARKETS: true,
-    } as FeatureFlags,
-  };
-});
+jest.mock('@vegaprotocol/environment', () => ({
+  ...jest.requireActual('@vegaprotocol/environment'),
+  FLAGS: { SUCCESSOR_MARKETS: true } as Partial<FeatureFlags>,
+}));

 describe('Closed', () => {
  let originalNow: typeof Date.now;
@@ -358,25 +349,8 @@ describe('Closed', () => {
          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,
@@ -390,36 +364,11 @@ describe('Closed', () => {
        },
      },
    };
-    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,
-          ]}
+          mocks={[mixedMarketsMock, marketsDataMock, oracleDataMock]}
        >
          <VegaWalletContext.Provider
            value={{ pubKey } as VegaWalletContextShape}
@@ -435,107 +384,5 @@ describe('Closed', () => {
        screen.getByRole('button', { name: 'SuccessorCode' })
      ).toBeInTheDocument();
    });
-    expect(
-      screen.getByRole('columnheader', {
-        name: (_name, element) =>
-          element.getAttribute('col-id') === 'successorMarket',
-      })
-    ).toBeInTheDocument();
-  });
-
-  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');
-    });
  });
 });
@@ -4,7 +4,11 @@ import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
-import { AgGridLazy as 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 { MarketState, MarketStateMapping } from '@vegaprotocol/types';
@@ -19,14 +23,15 @@ import type {
 import {
  MarketActionsDropdown,
  closedMarketsWithDataProvider,
+  useSuccessorMarket,
 } 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 { SuccessorMarketRenderer } from './successor-market-cell';
+import { useMarketClickHandler } from '../../lib/hooks/use-market-click-handler';
+import { FLAGS } from '@vegaprotocol/environment';

 type SettlementAsset =
  MarketMaybeWithData['tradableInstrument']['instrument']['product']['settlementAsset'];
@@ -101,6 +106,22 @@ export const Closed = () => {
  );
 };

+export const SuccessorMarketRenderer = ({
+  value,
+}: VegaICellRendererParams<Row, 'id'>) => {
+  const { data } = useSuccessorMarket(value);
+  const onMarketClick = useMarketClickHandler();
+  return data ? (
+    <MarketNameCell
+      value={data.tradableInstrument.instrument.code}
+      data={data}
+      onMarketClick={onMarketClick}
+    />
+  ) : (
+    ' - '
+  );
+};
+
 const ClosedMarketsDataGrid = ({
  rowData,
  error,
@@ -181,8 +202,8 @@ const ClosedMarketsDataGrid = ({
      },
      FLAGS.SUCCESSOR_MARKETS && {
        headerName: t('Successor market'),
+        colId: 'successorMarketID',
        field: 'id',
-        colId: 'successorMarket',
        cellRenderer: 'SuccessorMarketRenderer',
      },
      {
@@ -1,13 +1,7 @@
 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}
-    />
-  );
+  return <MarketsContainer onSelect={handleOnSelect} />;
 };
@@ -6,7 +6,6 @@ import {
 } from '@vegaprotocol/environment';
 import { ProposalsList } from '@vegaprotocol/proposals';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { SuccessorMarketRenderer } from './successor-market-cell';

 export const Proposed = () => {
  const tokenLink = useLinks(DApp.Token);
@@ -14,7 +13,7 @@ export const Proposed = () => {
  return (
    <>
      <div className="h-[400px]">
-        <ProposalsList SuccessorMarketRenderer={SuccessorMarketRenderer} />
+        <ProposalsList />
      </div>
      <ExternalLink className="py-4 px-[11px] text-sm" href={externalLink}>
        {t('Propose a new market')}
@@ -1,40 +0,0 @@
-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';
-import React from 'react';
-
-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}
-    />
-  ) : (
-    '-'
-  );
-};
@@ -17,7 +17,7 @@ export const Header = ({ title, children }: TradeMarketHeaderProps) => {
  );
  return (
    <header className={headerClasses}>
-      <div className="hidden lg:flex flex-col justify-center items-start pl-3 lg:pl-4 pt-2 xl:pb-2 pb-0">
+      <div className="flex flex-col justify-center items-start pl-3 lg:pl-4 pt-2 xl:pb-2 pb-0">
        {title}
      </div>
      <div data-testid="header-summary" className="min-w-0">
@@ -1,12 +1,10 @@
-import classNames from 'classnames';
-
 export const WalletIcon = ({ className }: { className?: string }) => {
  return (
    <svg
      width="26"
      height="18"
      viewBox="0 0 26 18"
-      className={classNames('fill-current', className)}
+      className={className}
      data-testid="wallet-icon"
    >
      <path d="M4.77437 17.7499H4.74987C3.6504 17.7368 2.77439 16.8489 2.77439 15.7772V12.8495V12.6343L2.5615 12.6023C1.59672 12.4575 0.849609 11.6116 0.849609 10.6266V7.40064C0.849609 6.39018 1.59509 5.56985 2.56147 5.4249L2.77439 5.39297V5.17767V2.24998C2.77439 1.14102 3.66537 0.25 4.77437 0.25H23.7501C24.8591 0.25 25.7501 1.14098 25.7501 2.24998V15.7499C25.7501 16.8588 24.8591 17.7499 23.7501 17.7499H4.77437ZM4.44917 12.5992H4.19917L4.77441 16.075V16.325H4.77466H23.7502C24.0778 16.325 24.3254 16.0777 24.3254 15.7497V2.24984C24.3254 1.9222 24.0782 1.6746 23.7502 1.6746H4.77441C4.44677 1.6746 4.19917 1.92182 4.19917 2.24984V5.12306V5.37306H4.44917H7.0244C8.51139 5.37306 9.67508 6.56094 9.67508 8.02374V9.94852C9.67508 11.4355 8.4872 12.5992 7.0244 12.5992H4.44917ZM2.84963 6.8253C2.52199 6.8253 2.27439 7.07253 2.27439 7.40054V10.6264C2.27439 10.9541 2.52161 11.2017 2.84962 11.2017L7.02419 11.2019C7.73619 11.2019 8.25009 10.6515 8.25009 9.97598V8.0512C8.25009 7.3392 7.69976 6.8253 7.0242 6.8253H2.84963Z" />
@@ -11,9 +11,9 @@ export const LayoutWithSidebar = () => {

  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_350px_40px]'
+    'grid-rows-[min-content_1fr]',
+    'grid-cols-[1fr_45px]',
+    'lg:grid-cols-[1fr_350px_45px]'
  );

  return (
@@ -40,14 +40,7 @@ export const LayoutWithSidebar = () => {
      >
        <SidebarContent />
      </aside>
-      <div
-        className={classNames(
-          'bg-vega-clight-800 dark:bg-vega-cdark-800',
-          'border-t lg:border-l lg:border-t-0 border-default',
-          'row-start-3 col-start-1 cols-span-full',
-          'lg:row-start-2 lg:row-span-full lg:col-start-3'
-        )}
-      >
+      <div className="col-start-2 lg:col-start-3 bg-vega-clight-800 dark:bg-vega-cdark-800 border-l border-default">
        <Sidebar />
      </div>
    </div>
@@ -42,6 +42,8 @@ export const LiquidityHeader = () => {
    triggeringRatio,
  });

+  console.log(market);
+
  return (
    <Header
      title={
@@ -1,2 +1 @@
 export * from './market-successor-banner';
-export * from './market-successor-proposal-banner';
@@ -1,155 +0,0 @@
-import { act, render, screen, waitFor } from '@testing-library/react';
-import type { SingleExecutionResult } from '@apollo/client';
-import type { MockedResponse } from '@apollo/react-testing';
-import { MockedProvider } from '@apollo/react-testing';
-import { MarketSuccessorProposalBanner } from './market-successor-proposal-banner';
-import type { SuccessorProposalsListQuery } from '@vegaprotocol/proposals';
-import { SuccessorProposalsListDocument } from '@vegaprotocol/proposals';
-
-const marketProposalMock: MockedResponse<SuccessorProposalsListQuery> = {
-  request: {
-    query: SuccessorProposalsListDocument,
-  },
-  result: {
-    data: {
-      proposalsConnection: {
-        edges: [
-          {
-            node: {
-              __typename: 'Proposal',
-              id: 'proposal-1',
-              terms: {
-                __typename: 'ProposalTerms',
-                change: {
-                  __typename: 'NewMarket',
-                  instrument: {
-                    name: 'New proposal of the market successor',
-                  },
-                  successorConfiguration: {
-                    parentMarketId: 'marketId',
-                  },
-                },
-              },
-            },
-          },
-        ],
-      },
-    },
-  },
-};
-
-describe('MarketSuccessorProposalBanner', () => {
-  it('should display single proposal', async () => {
-    render(
-      <MockedProvider mocks={[marketProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    await waitFor(() => {
-      expect(
-        screen.getByText('A successors to this market has been proposed')
-      ).toBeInTheDocument();
-    });
-    expect(
-      screen
-        .getByRole('link')
-        .getAttribute('href')
-        ?.endsWith('/proposals/proposal-1') ?? false
-    ).toBe(true);
-  });
-  it('should display plural proposals', async () => {
-    const dualProposalMock = {
-      ...marketProposalMock,
-      result: {
-        ...marketProposalMock.result,
-        data: {
-          proposalsConnection: {
-            edges: [
-              ...((
-                marketProposalMock?.result as SingleExecutionResult<SuccessorProposalsListQuery>
-              )?.data?.proposalsConnection?.edges ?? []),
-              {
-                node: {
-                  __typename: 'Proposal',
-                  id: 'proposal-2',
-                  terms: {
-                    __typename: 'ProposalTerms',
-                    change: {
-                      __typename: 'NewMarket',
-                      instrument: {
-                        name: 'New second proposal of the market successor',
-                      },
-                      successorConfiguration: {
-                        parentMarketId: 'marketId',
-                      },
-                    },
-                  },
-                },
-              },
-            ],
-          },
-        },
-      },
-    };
-
-    render(
-      <MockedProvider mocks={[dualProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    await waitFor(() => {
-      expect(
-        screen.getByText('Successors to this market have been proposed')
-      ).toBeInTheDocument();
-    });
-    expect(
-      screen
-        .getAllByRole('link')[0]
-        .getAttribute('href')
-        ?.endsWith('/proposals/proposal-1') ?? false
-    ).toBe(true);
-    expect(
-      screen
-        .getAllByRole('link')[1]
-        .getAttribute('href')
-        ?.endsWith('/proposals/proposal-2') ?? false
-    ).toBe(true);
-  });
-
-  it('banner should be hidden because no proposals', () => {
-    const { container } = render(
-      <MockedProvider>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it('banner should be hidden because no proposals for the market', () => {
-    const { container } = render(
-      <MockedProvider mocks={[marketProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="otherMarketId" />
-      </MockedProvider>
-    );
-    expect(container).toBeEmptyDOMElement();
-  });
-
-  it('banner should be hidden after user close click', async () => {
-    const { container } = render(
-      <MockedProvider mocks={[marketProposalMock]}>
-        <MarketSuccessorProposalBanner marketId="marketId" />
-      </MockedProvider>
-    );
-    await waitFor(() => {
-      expect(
-        screen.getByText('A successors to this market has been proposed')
-      ).toBeInTheDocument();
-    });
-    await act(() => {
-      screen.getByTestId('notification-banner-close').click();
-    });
-    await waitFor(() => {
-      expect(container).toBeEmptyDOMElement();
-    });
-  });
-});
@@ -1,71 +0,0 @@
-import { useState } from 'react';
-import type {
-  SuccessorProposalListFieldsFragment,
-  NewMarketSuccessorFieldsFragment,
-} from '@vegaprotocol/proposals';
-import { useSuccessorProposalsListQuery } from '@vegaprotocol/proposals';
-import {
-  ExternalLink,
-  Intent,
-  NotificationBanner,
-} from '@vegaprotocol/ui-toolkit';
-import { t } from '@vegaprotocol/i18n';
-import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';
-
-export const MarketSuccessorProposalBanner = ({
-  marketId,
-}: {
-  marketId?: string;
-}) => {
-  const { data: proposals } = useSuccessorProposalsListQuery({
-    skip: !marketId,
-  });
-  const successors =
-    proposals?.proposalsConnection?.edges
-      ?.map((item) => item?.node as SuccessorProposalListFieldsFragment)
-      .filter(
-        (item: SuccessorProposalListFieldsFragment) =>
-          (item.terms?.change as NewMarketSuccessorFieldsFragment)
-            ?.successorConfiguration?.parentMarketId === marketId
-      ) ?? [];
-  const [visible, setVisible] = useState(true);
-  const tokenLink = useLinks(DApp.Token);
-  if (visible && successors.length) {
-    return (
-      <NotificationBanner
-        intent={Intent.Primary}
-        onClose={() => {
-          setVisible(false);
-        }}
-      >
-        <div className="uppercase mb-1">
-          {successors.length === 1
-            ? t('A successors to this market has been proposed')
-            : t('Successors to this market have been proposed')}
-        </div>
-        <div>
-          {successors.length === 1
-            ? t('Check out the terms of the proposal and vote:')
-            : t('Check out the terms of the proposals and vote:')}{' '}
-          {successors.map((item, i) => {
-            const externalLink = tokenLink(
-              TOKEN_PROPOSAL.replace(':id', item.id || '')
-            );
-            return (
-              <>
-                <ExternalLink href={externalLink} key={i}>
-                  {
-                    (item.terms?.change as NewMarketSuccessorFieldsFragment)
-                      ?.instrument.name
-                  }
-                </ExternalLink>
-                {i < successors.length - 1 && ', '}
-              </>
-            );
-          })}
-        </div>
-      </NotificationBanner>
-    );
-  }
-  return null;
-};
@@ -4,12 +4,10 @@ import { useParams } from 'react-router-dom';
 import { MarketSelector } from '../../components/market-selector/market-selector';
 import { MarketHeaderStats } from '../../client-pages/market/market-header-stats';
 import { useMarket } from '@vegaprotocol/markets';
-import { useState } from 'react';

 export const MarketHeader = () => {
  const { marketId } = useParams();
  const { data } = useMarket(marketId);
-  const [open, setOpen] = useState(false);

  if (!data) return null;

@@ -17,8 +15,6 @@ export const MarketHeader = () => {
    <Header
      title={
        <Popover
-          open={open}
-          onChange={setOpen}
          trigger={
            <HeaderTitle>
              {data.tradableInstrument.instrument.code}
@@ -27,10 +23,7 @@ export const MarketHeader = () => {
          }
          alignOffset={-10}
        >
-          <MarketSelector
-            currentMarketId={marketId}
-            onSelect={() => setOpen(false)}
-          />
+          <MarketSelector currentMarketId={marketId} />
        </Popover>
      }
    >
@@ -98,7 +98,6 @@ describe('MarketSelectorItem', () => {
            market={market}
            currentMarketId={market.id}
            style={{}}
-            onSelect={jest.fn()}
          />
        </MockedProvider>
      </MemoryRouter>
@@ -17,12 +17,10 @@ export const MarketSelectorItem = ({
  market,
  style,
  currentMarketId,
-  onSelect,
 }: {
  market: MarketMaybeWithDataAndCandles;
  style: CSSProperties;
  currentMarketId?: string;
-  onSelect: (marketId: string) => void;
 }) => {
  return (
    <div style={style} role="row">
@@ -34,7 +32,6 @@ export const MarketSelectorItem = ({
          'bg-vega-clight-600 dark:bg-vega-cdark-600':
            market.id === currentMarketId,
        })}
-        onClick={() => onSelect(market.id)}
      >
        <MarketData market={market} />
      </Link>
@@ -83,7 +80,7 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
  return (
    <>
      <div className="w-2/5" role="gridcell">
-        <h3 className="text-ellipsis text-sm lg:text-base whitespace-nowrap overflow-hidden">
+        <h3 className="text-ellipsis whitespace-nowrap overflow-hidden">
          {market.tradableInstrument.instrument.code}
        </h3>
        {mode && (
@@ -93,7 +90,7 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
        )}
      </div>
      <div
-        className="w-1/5 text-xs lg:text-sm whitespace-nowrap text-ellipsis overflow-hidden"
+        className="w-1/5 text-sm whitespace-nowrap text-ellipsis overflow-hidden"
        title={instrument.product.settlementAsset.symbol}
        data-testid="market-selector-price"
        role="gridcell"
@@ -101,7 +98,7 @@ const MarketData = ({ market }: { market: MarketMaybeWithDataAndCandles }) => {
        {price} {instrument.product.settlementAsset.symbol}
      </div>
      <div
-        className="w-1/5 text-xs lg:text-sm text-right whitespace-nowrap text-ellipsis overflow-hidden"
+        className="w-1/5 text-sm text-right whitespace-nowrap text-ellipsis overflow-hidden"
        title={t('24h vol')}
        data-testid="market-selector-volume"
        role="gridcell"
@@ -137,7 +137,7 @@ describe('MarketSelector', () => {
  it('renders only active markets', () => {
    render(
      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
+        <MarketSelector currentMarketId="market-0" />
      </MemoryRouter>
    );
    expect(screen.getAllByTestId(/market-\d/)).toHaveLength(
@@ -148,7 +148,7 @@ describe('MarketSelector', () => {
  it('filters by product type', async () => {
    render(
      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
+        <MarketSelector currentMarketId="market-0" />
      </MemoryRouter>
    );

@@ -174,7 +174,7 @@ describe('MarketSelector', () => {
  it('filters by search term', async () => {
    render(
      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
+        <MarketSelector currentMarketId="market-0" />
      </MemoryRouter>
    );

@@ -202,7 +202,7 @@ describe('MarketSelector', () => {
  it('filters by asset', async () => {
    render(
      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
+        <MarketSelector currentMarketId="market-0" />
      </MemoryRouter>
    );

@@ -234,7 +234,7 @@ describe('MarketSelector', () => {
  it('sorts by gained', async () => {
    render(
      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
+        <MarketSelector currentMarketId="market-0" />
      </MemoryRouter>
    );

@@ -256,7 +256,7 @@ describe('MarketSelector', () => {
  it('sorts by lost', async () => {
    render(
      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
+        <MarketSelector currentMarketId="market-0" />
      </MemoryRouter>
    );

@@ -272,7 +272,7 @@ describe('MarketSelector', () => {
  it('sorts by new', async () => {
    render(
      <MemoryRouter>
-        <MarketSelector currentMarketId="market-0" onSelect={jest.fn()} />
+        <MarketSelector currentMarketId="market-0" />
      </MemoryRouter>
    );

@@ -35,7 +35,7 @@ export const MarketSelector = ({
  onSelect,
 }: {
  currentMarketId?: string;
-  onSelect: (marketId: string) => void;
+  onSelect?: (marketId: string) => void;
 }) => {
  const [filter, setFilter] = useState<Filter>({
    searchTerm: '',
@@ -48,7 +48,7 @@ export const MarketSelector = ({

  return (
    <div data-testid="market-selector">
-      <div className="pt-2 px-2 mb-2">
+      <div className="pt-2 px-2 mb-2 w-[320px] lg:w-[584px]">
        <ProductSelector
          product={filter.product}
          onSelect={(product) => {
@@ -147,17 +147,16 @@ const MarketList = ({
  loading: boolean;
  searchTerm: string;
  currentMarketId?: string;
-  onSelect: (marketId: string) => void;
+  onSelect?: (marketId: string) => void;
  noItems: string;
 }) => {
  const itemSize = 45;
  const listRef = useRef<HTMLDivElement | null>(null);
  const rect = listRef.current?.getBoundingClientRect();
  // allow virtualized list to grow until it runs out of space
-  const computedHeight = rect
+  const height = rect
    ? Math.min(data.length * itemSize, window.innerHeight - rect.y)
    : 400;
-  const height = Math.max(computedHeight, 45);

  if (error) {
    return <div>{error.message}</div>;
@@ -200,7 +199,7 @@ const MarketList = ({

 interface ListItemData {
  data: MarketMaybeWithDataAndCandles[];
-  onSelect: (marketId: string) => void;
+  onSelect?: (marketId: string) => void;
  currentMarketId?: string;
 }

@@ -217,7 +216,6 @@ const ListItem = ({
    market={data.data[index]}
    currentMarketId={data.currentMarketId}
    style={style}
-    onSelect={data.onSelect}
  />
 );

@@ -254,11 +252,7 @@ const List = ({

  if (!data.length) {
    return (
-      <div
-        style={{ height }}
-        className="flex items-center"
-        data-testid="no-items"
-      >
+      <div style={{ height }} data-testid="no-items">
        <div className="mx-4 my-2 text-sm">{noItems}</div>
      </div>
    );
@@ -1,2 +1 @@
 export * from './navbar';
-export * from './nav-header';
@@ -1,66 +0,0 @@
-import { VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
-import { MarketSelector } from '../market-selector';
-import { useMarket } from '@vegaprotocol/markets';
-import { t } from '@vegaprotocol/i18n';
-import { useParams } from 'react-router-dom';
-import * as PopoverPrimitive from '@radix-ui/react-popover';
-import { useState } from 'react';
-
-/**
- * This is only rendered for the mobile navigation
- */
-export const NavHeader = () => {
-  const { marketId } = useParams();
-  const { data } = useMarket(marketId);
-  const [open, setOpen] = useState(false);
-
-  if (!marketId) return null;
-
-  return (
-    <FullScreenPopover
-      open={open}
-      onOpenChange={(x) => {
-        setOpen(x);
-      }}
-      trigger={
-        <h1 className="flex gap-1 sm:gap-2 md:gap-4 items-center text-default text-lg whitespace-nowrap xl:pr-4 xl:border-r border-default">
-          {data ? data.tradableInstrument.instrument.code : t('Select market')}
-          <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={20} />
-        </h1>
-      }
-    >
-      <MarketSelector
-        currentMarketId={marketId}
-        onSelect={() => setOpen(false)}
-      />
-    </FullScreenPopover>
-  );
-};
-
-export interface PopoverProps extends PopoverPrimitive.PopoverProps {
-  trigger: React.ReactNode | string;
-}
-
-export const FullScreenPopover = ({
-  trigger,
-  children,
-  open,
-  onOpenChange,
-}: PopoverProps) => {
-  return (
-    <PopoverPrimitive.Root open={open} onOpenChange={onOpenChange}>
-      <PopoverPrimitive.Trigger data-testid="popover-trigger">
-        {trigger}
-      </PopoverPrimitive.Trigger>
-      <PopoverPrimitive.Portal>
-        <PopoverPrimitive.Content
-          data-testid="popover-content"
-          className="w-screen bg-vega-clight-800 dark:bg-vega-cdark-800 text-default border border-default"
-          sideOffset={5}
-        >
-          {children}
-        </PopoverPrimitive.Content>
-      </PopoverPrimitive.Portal>
-    </PopoverPrimitive.Root>
-  );
-};
@@ -1,158 +1,42 @@
-import { render, screen, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
+import { MockedProvider } from '@apollo/client/testing';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { Navbar } from './navbar';
-import { useGlobalStore } from '../../stores';
-
-jest.mock('@vegaprotocol/proposals', () => ({
-  ProtocolUpgradeCountdown: () => null,
-}));

 describe('Navbar', () => {
-  const pubKey = '000';
-  const pubKeys = [
-    {
-      publicKey: pubKey,
-      name: 'Pub key 0',
-    },
-    {
-      publicKey: '111',
-      name: 'Pub key 1',
-    },
-  ];
-  const marketId = 'abc';
-  const navbarContent = 'navbar-menu-content';
-
-  const renderComponent = (
-    initialEntries?: string[],
-    walletContext?: Partial<VegaWalletContextShape>
-  ) => {
-    const context = {
-      pubKey,
-      pubKeys,
-      selectPubKey: jest.fn(),
-      disconnect: jest.fn(),
-      ...walletContext,
-    } as VegaWalletContextShape;
-    return render(
-      <MemoryRouter initialEntries={initialEntries}>
-        <VegaWalletContext.Provider value={context}>
-          <Navbar />
-        </VegaWalletContext.Provider>
-      </MemoryRouter>
-    );
-  };
-
-  beforeAll(() => {
-    useGlobalStore.setState({ marketId });
-  });
-
+  const pubKey = 'pubKey';
  it('should be properly rendered', () => {
-    renderComponent();
-
-    const expectedLinks = [
-      ['/', ''],
-      ['/markets/all', 'Markets'],
-      [`/markets/${marketId}`, 'Trading'],
-      ['/portfolio', 'Portfolio'],
-    ];
-
-    const links = screen.getAllByRole('link');
-
-    links.forEach((link, i) => {
-      const [href, text] = expectedLinks[i];
-      expect(link).toHaveAttribute('href', href);
-      expect(link).toHaveTextContent(text);
-    });
+    render(
+      <MockedProvider>
+        <MemoryRouter>
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Navbar theme="dark" />
+          </VegaWalletContext.Provider>
+        </MemoryRouter>
+      </MockedProvider>
+    );
+    expect(screen.getByTestId('Markets')).toBeInTheDocument();
+    expect(screen.getByTestId('Trading')).toBeInTheDocument();
+    expect(screen.getByTestId('Portfolio')).toBeInTheDocument();
  });

  it('Markets page route should not match empty market page', () => {
-    renderComponent(['/markets/all']);
-    expect(screen.getByRole('link', { name: 'Markets' })).toHaveClass('active');
-    expect(screen.getByRole('link', { name: 'Trading' })).not.toHaveClass(
-      'active'
+    render(
+      <MockedProvider>
+        <MemoryRouter initialEntries={['/markets/all']}>
+          <VegaWalletContext.Provider
+            value={{ pubKey } as VegaWalletContextShape}
+          >
+            <Navbar theme="dark" />
+          </VegaWalletContext.Provider>
+        </MemoryRouter>
+      </MockedProvider>
    );
-  });
-
-  it('can open menu and navigate on small screens', async () => {
-    renderComponent();
-    await userEvent.click(screen.getByRole('button', { name: 'Menu' }));
-
-    const menuEl = screen.getByTestId(navbarContent);
-    expect(menuEl).toBeInTheDocument();
-    const menu = within(menuEl);
-
-    const expectedLinks = [
-      ['/markets/all', 'Markets'],
-      [`/markets/${marketId}`, 'Trading'],
-      ['/portfolio', 'Portfolio'],
-    ];
-    const links = menu.getAllByRole('link');
-    links.forEach((link, i) => {
-      const [href, text] = expectedLinks[i];
-      expect(link).toHaveAttribute('href', href);
-      expect(link).toHaveTextContent(text);
-    });
-
-    await userEvent.click(screen.getByRole('button', { name: 'Close menu' }));
-    expect(screen.queryByTestId(navbarContent)).not.toBeInTheDocument();
-  });
-
-  it('can close menu by clicking overlay', async () => {
-    renderComponent();
-    await userEvent.click(screen.getByRole('button', { name: 'Menu' }));
-    expect(screen.getByTestId(navbarContent)).toBeInTheDocument();
-    await userEvent.click(screen.getByTestId('navbar-menu-overlay'));
-    expect(screen.queryByTestId(navbarContent)).not.toBeInTheDocument();
-  });
-
-  it('can open wallet menu on small screens and change pubkey', async () => {
-    const mockSelectPubKey = jest.fn();
-    renderComponent(undefined, { selectPubKey: mockSelectPubKey });
-    await userEvent.click(screen.getByRole('button', { name: 'Wallet' }));
-
-    const menuEl = screen.getByTestId(navbarContent);
-    expect(menuEl).toBeInTheDocument();
-    const menu = within(menuEl);
-
-    expect(menu.getAllByTestId(/key-\d+-mobile/)).toHaveLength(pubKeys.length);
-
-    const activeKey = within(menu.getByTestId('key-000-mobile'));
-    expect(activeKey.getByText(pubKeys[0].name)).toBeInTheDocument();
-    expect(activeKey.getByTestId('icon-tick')).toBeInTheDocument();
-
-    const inactiveKey = within(menu.getByTestId('key-111-mobile'));
-    await userEvent.click(inactiveKey.getByText(pubKeys[1].name));
-    expect(mockSelectPubKey).toHaveBeenCalledWith(pubKeys[1].publicKey);
-  });
-
-  it('can transfer and close menu', async () => {
-    renderComponent();
-    await userEvent.click(screen.getByRole('button', { name: 'Wallet' }));
-
-    const menuEl = screen.getByTestId(navbarContent);
-    expect(menuEl).toBeInTheDocument();
-    const menu = within(menuEl);
-
-    await userEvent.click(menu.getByText('Transfer'));
-
-    expect(screen.queryByTestId(navbarContent)).not.toBeInTheDocument();
-  });
-
-  it('can disconnect and close menu', async () => {
-    const mockDisconnect = jest.fn();
-    renderComponent(undefined, { disconnect: mockDisconnect });
-    await userEvent.click(screen.getByRole('button', { name: 'Wallet' }));
-
-    const menuEl = screen.getByTestId(navbarContent);
-    expect(menuEl).toBeInTheDocument();
-    const menu = within(menuEl);
-
-    await userEvent.click(menu.getByText('Disconnect'));
-
-    expect(mockDisconnect).toHaveBeenCalled();
-    expect(screen.queryByTestId(navbarContent)).not.toBeInTheDocument();
+    expect(screen.getByTestId('Markets')).toHaveClass('active');
+    expect(screen.getByTestId('Trading')).not.toHaveClass('active');
  });
 });
@@ -1,400 +1,140 @@
-import type { ButtonHTMLAttributes, LiHTMLAttributes, ReactNode } from 'react';
-import { useState } from 'react';
-import { useEnvironment, DocsLinks, Networks } from '@vegaprotocol/environment';
+import type { ComponentProps, ReactNode } from 'react';
+import {
+  DApp,
+  NetworkSwitcher,
+  TOKEN_GOVERNANCE,
+  useEnvironment,
+  useLinks,
+  DocsLinks,
+} from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { useGlobalStore } from '../../stores';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
-import { VegaIconNames, VegaIcon, VLogo } from '@vegaprotocol/ui-toolkit';
-import * as N from '@radix-ui/react-navigation-menu';
-import * as D from '@radix-ui/react-dialog';
-import { NavLink } from 'react-router-dom';
+import {
+  Navigation,
+  NavigationList,
+  NavigationItem,
+  NavigationLink,
+  ExternalLink,
+  NavigationBreakpoint,
+  NavigationTrigger,
+  NavigationContent,
+  VegaIconNames,
+  VegaIcon,
+} from '@vegaprotocol/ui-toolkit';

 import { Links, Routes } from '../../pages/client-router';
-import classNames from 'classnames';
-import { VegaWalletMenu } from '../vega-wallet';
-import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
-import { WalletIcon } from '../icons/wallet';
-import { ProtocolUpgradeCountdown } from '@vegaprotocol/proposals';
-
-type MenuState = 'wallet' | 'nav' | null;
-type Theme = 'system' | 'yellow';
+import {
+  ProtocolUpgradeCountdown,
+  ProtocolUpgradeCountdownMode,
+} from '@vegaprotocol/proposals';

 export const Navbar = ({
-  children,
  theme = 'system',
 }: {
-  children?: ReactNode;
-  theme?: Theme;
+  theme: ComponentProps<typeof Navigation>['theme'];
 }) => {
-  // menu state for small screens
-  const [menu, setMenu] = useState<MenuState>(null);
-
-  const { pubKey } = useVegaWallet();
-
-  const openVegaWalletDialog = useVegaWalletDialogStore(
-    (store) => store.openVegaWalletDialog
-  );
-
-  const isConnected = pubKey !== null;
-
-  const navTextClasses = 'text-vega-clight-200 dark:text-vega-cdark-200';
-  const rootClasses = classNames(
-    navTextClasses,
-    'flex gap-3 h-10 pr-1',
-    'border-b border-default',
-    'bg-vega-clight-800 dark:bg-vega-cdark-800'
-  );
-  return (
-    <N.Root className={rootClasses}>
-      <NavLink
-        to="/"
-        className={classNames('flex items-center px-3', {
-          'bg-vega-yellow text-vega-clight-50': theme === 'yellow',
-          'text-default': theme === 'system',
-        })}
-      >
-        <VLogo className="w-4" />
-      </NavLink>
-      {/* Left section */}
-      <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="ml-auto flex justify-end items-center gap-2">
-        <ProtocolUpgradeCountdown />
-        <NavbarMobileButton
-          onClick={() => {
-            if (isConnected) {
-              setMenu((x) => (x === 'wallet' ? null : 'wallet'));
-            } else {
-              openVegaWalletDialog();
-            }
-          }}
-          data-testid="navbar-mobile-wallet"
-        >
-          <span className="sr-only">{t('Wallet')}</span>
-          <WalletIcon className="w-6" />
-        </NavbarMobileButton>
-        <NavbarMobileButton
-          onClick={() => {
-            setMenu((x) => (x === 'nav' ? null : 'nav'));
-          }}
-          data-testid="navbar-mobile-burger"
-        >
-          <span className="sr-only">{t('Menu')}</span>
-          <BurgerIcon />
-        </NavbarMobileButton>
-        <div className="hidden lg:block">
-          <VegaWalletConnectButton />
-        </div>
-      </div>
-      {menu !== null && (
-        <D.Root
-          open={menu !== null}
-          onOpenChange={(open) => setMenu((x) => (open ? x : null))}
-        >
-          <D.Overlay
-            className="lg:hidden fixed inset-0 dark:bg-black/80 bg-black/50 z-20"
-            data-testid="navbar-menu-overlay"
-          />
-          <D.Content
-            className={classNames(
-              'lg:hidden',
-              'fixed top-0 right-0 z-20 w-3/4 h-screen border-l border-default bg-vega-clight-700 dark:bg-vega-cdark-700',
-              navTextClasses
-            )}
-            data-testid="navbar-menu-content"
-          >
-            <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} />
-              </NavbarMobileButton>
-            </div>
-            {menu === 'nav' && <NavbarMenu onClick={() => setMenu(null)} />}
-            {menu === 'wallet' && <VegaWalletMenu setMenu={setMenu} />}
-          </D.Content>
-        </D.Root>
-      )}
-    </N.Root>
-  );
-};
-
-/**
- * List of links or dropdown triggers to show in the main section
- * of the navigation
- */
-const NavbarMenu = ({ onClick }: { onClick: () => void }) => {
-  const { VEGA_ENV, VEGA_NETWORKS, GITHUB_FEEDBACK_URL } = useEnvironment();
+  const { GITHUB_FEEDBACK_URL } = useEnvironment();
+  const tokenLink = useLinks(DApp.Token);
  const marketId = useGlobalStore((store) => store.marketId);

-  // If we have a stored marketId make Trade link go to that market
-  // otherwise always go to /markets/all
  const tradingPath = marketId
    ? Links[Routes.MARKET](marketId)
-    : Links[Routes.MARKET]('');
+    : Links[Routes.MARKET]();

  return (
-    <div className="lg:flex lg:h-full gap-3">
-      <NavbarList>
-        <NavbarItem>
-          <NavbarTrigger data-testid="navbar-network-switcher-trigger">
-            {envNameMapping[VEGA_ENV]}
-          </NavbarTrigger>
-          <NavbarContent data-testid="navbar-content-network-switcher">
-            <ul className="lg:p-4">
-              {[Networks.MAINNET, Networks.TESTNET].map((n) => {
-                const url = VEGA_NETWORKS[n];
-                if (!url) return;
-                return (
-                  <NavbarSubItem key={n}>
-                    <NavbarLink to={url}>{envNameMapping[n]}</NavbarLink>
-                  </NavbarSubItem>
-                );
-              })}
-            </ul>
-          </NavbarContent>
-        </NavbarItem>
-      </NavbarList>
-      <NavbarListDivider />
-      <NavbarList>
-        <NavbarItem>
-          <NavbarLink to={Links[Routes.MARKETS]()} onClick={onClick}>
-            {t('Markets')}
-          </NavbarLink>
-        </NavbarItem>
-        <NavbarItem>
-          <NavbarLink to={tradingPath} onClick={onClick}>
-            {t('Trading')}
-          </NavbarLink>
-        </NavbarItem>
-        <NavbarItem>
-          <NavbarLink to={Links[Routes.PORTFOLIO]()} onClick={onClick}>
-            {t('Portfolio')}
-          </NavbarLink>
-        </NavbarItem>
-        <NavbarItem>
-          <NavbarTrigger>{t('Resources')}</NavbarTrigger>
-          <NavbarContent data-testid="navbar-content-resources">
-            <ul className="lg:p-4">
-              {DocsLinks?.NEW_TO_VEGA && (
-                <NavbarSubItem>
-                  <NavbarLinkExternal to={DocsLinks?.NEW_TO_VEGA}>
-                    {t('Docs')}
-                  </NavbarLinkExternal>
-                </NavbarSubItem>
-              )}
-              {GITHUB_FEEDBACK_URL && (
-                <NavbarSubItem>
-                  <NavbarLinkExternal to={GITHUB_FEEDBACK_URL}>
-                    {t('Give Feedback')}
-                  </NavbarLinkExternal>
-                </NavbarSubItem>
-              )}
-              <NavbarSubItem>
-                <NavbarLink to={Links[Routes.DISCLAIMER]()} onClick={onClick}>
-                  {t('Disclaimer')}
-                </NavbarLink>
-              </NavbarSubItem>
-            </ul>
-          </NavbarContent>
-        </NavbarItem>
-      </NavbarList>
-    </div>
-  );
-};
-
-/**
- * Wrapper for radix-ux Trigger for consistent styles
- */
-const NavbarTrigger = ({
-  children,
-  ...props
-}: N.NavigationMenuTriggerProps) => {
-  return (
-    <N.Trigger
-      {...props}
-      onPointerMove={preventHover}
-      onPointerLeave={preventHover}
-      className={classNames(
-        'w-full lg:w-auto lg:h-full',
-        'flex items-center justify-between lg:justify-center gap-2 px-6 py-2 lg:p-0',
-        'text-lg lg:text-sm',
-        'hover:text-vega-clight-100 dark:hover:text-vega-cdark-100'
-      )}
+    <Navigation
+      appName="console"
+      theme={theme}
+      actions={
+        <>
+          <ProtocolUpgradeCountdown
+            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
+          />
+          <VegaWalletConnectButton />
+        </>
+      }
+      breakpoints={[521, 1122]}
    >
-      {children}
-      <VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={14} />
-    </N.Trigger>
+      <NavigationList
+        className="[.drawer-content_&]:border-b [.drawer-content_&]:border-b-vega-light-200 dark:[.drawer-content_&]:border-b-vega-dark-200 [.drawer-content_&]:pb-8 [.drawer-content_&]:mb-2"
+        hide={[NavigationBreakpoint.Small]}
+      >
+        <NavigationItem className="[.drawer-content_&]:w-full">
+          <NetworkSwitcher className="[.drawer-content_&]:w-full" />
+        </NavigationItem>
+      </NavigationList>
+      <NavigationList
+        hide={[NavigationBreakpoint.Narrow, NavigationBreakpoint.Small]}
+      >
+        <NavigationItem>
+          <NavigationLink data-testid="Markets" to={Links[Routes.MARKETS]()}>
+            {t('Markets')}
+          </NavigationLink>
+        </NavigationItem>
+        <NavigationItem>
+          <NavigationLink data-testid="Trading" to={tradingPath} end>
+            {t('Trading')}
+          </NavigationLink>
+        </NavigationItem>
+        <NavigationItem>
+          <NavigationLink
+            data-testid="Portfolio"
+            to={Links[Routes.PORTFOLIO]()}
+          >
+            {t('Portfolio')}
+          </NavigationLink>
+        </NavigationItem>
+        <NavigationItem>
+          <NavExternalLink href={tokenLink(TOKEN_GOVERNANCE)}>
+            {t('Governance')}
+          </NavExternalLink>
+        </NavigationItem>
+        {DocsLinks?.NEW_TO_VEGA && GITHUB_FEEDBACK_URL && (
+          <NavigationItem>
+            <NavigationTrigger>{t('Resources')}</NavigationTrigger>
+            <NavigationContent>
+              <NavigationList>
+                <NavigationItem>
+                  <NavExternalLink href={DocsLinks.NEW_TO_VEGA}>
+                    {t('Docs')}
+                  </NavExternalLink>
+                </NavigationItem>
+                <NavigationItem>
+                  <NavExternalLink href={GITHUB_FEEDBACK_URL}>
+                    {t('Give Feedback')}
+                  </NavExternalLink>
+                </NavigationItem>
+                <NavigationItem>
+                  <NavigationLink
+                    data-testid="Disclaimer"
+                    to={Links[Routes.DISCLAIMER]()}
+                  >
+                    {t('Disclaimer')}
+                  </NavigationLink>
+                </NavigationItem>
+              </NavigationList>
+            </NavigationContent>
+          </NavigationItem>
+        )}
+      </NavigationList>
+    </Navigation>
  );
 };

-/**
- * Wrapper for react-router-dom NavLink for consistent styles
- */
-const NavbarLink = ({
+const NavExternalLink = ({
  children,
-  to,
-  onClick,
+  href,
 }: {
  children: ReactNode;
-  to: string;
-  onClick?: () => void;
+  href: string;
 }) => {
  return (
-    <N.Link asChild={true}>
-      <NavLink
-        to={to}
-        className={classNames(
-          'block lg:flex lg:h-full flex-col justify-center',
-          'px-6 py-2 lg:p-0 text-lg lg:text-sm',
-          'hover:text-vega-clight-100 dark:hover:text-vega-cdark-100'
-        )}
-        onClick={onClick}
-      >
-        {({ isActive }) => {
-          const borderClasses = {
-            'border-b-2': true,
-            'border-transparent': !isActive,
-            'border-vega-yellow lg:group-[.navbar-content]:border-transparent':
-              isActive,
-          };
-          return (
-            <>
-              <span
-                className={classNames('lg:border-0', borderClasses, {
-                  'text-vega-clight-50 dark:text-vega-cdark-50': isActive,
-                })}
-              >
-                {children}
-              </span>
-              <span
-                className={classNames(
-                  'hidden lg:block absolute left-0 bottom-0 w-full h-0',
-                  borderClasses
-                )}
-              />
-            </>
-          );
-        }}
-      </NavLink>
-    </N.Link>
-  );
-};
-
-const NavbarItem = (props: N.NavigationMenuItemProps) => {
-  return <N.Item {...props} className="relative" />;
-};
-
-const NavbarSubItem = (props: LiHTMLAttributes<HTMLElement>) => {
-  return <li {...props} className="lg:mb-4 lg:last:mb-0" />;
-};
-
-const NavbarList = (props: N.NavigationMenuListProps) => {
-  return <N.List {...props} className="lg:flex lg:h-full gap-6" />;
-};
-
-/**
- * Content that gets rendered when a sub section of the navbar is shown
- */
-const NavbarContent = (props: N.NavigationMenuContentProps) => {
-  return (
-    <N.Content
-      {...props}
-      className={classNames(
-        'group navbar-content',
-        'lg:absolute lg:mt-2 pl-2 lg:pl-0 z-20 lg:min-w-[290px]',
-        'lg:bg-vega-clight-700 lg:dark:bg-vega-cdark-700',
-        'lg:border border-vega-clight-500 dark:border-vega-cdark-500 lg:rounded'
-      )}
-      onPointerEnter={preventHover}
-      onPointerLeave={preventHover}
-    />
-  );
-};
-
-/**
- * NavbarLink with OPEN_EXTERNAL icon
- */
-const NavbarLinkExternal = ({
-  children,
-  to,
-  onClick,
-}: {
-  children: ReactNode;
-  to: string;
-  onClick?: () => void;
-}) => {
-  return (
-    <N.Link asChild={true}>
-      <NavLink
-        to={to}
-        className={classNames(
-          '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'
-        )}
-        onClick={onClick}
-        target="_blank"
-      >
+    <ExternalLink href={href}>
+      <span className="flex items-center gap-2">
        <span>{children}</span>
        <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
-      </NavLink>
-    </N.Link>
+      </span>
+    </ExternalLink>
  );
 };
-
-const BurgerIcon = () => (
-  <svg
-    width="20"
-    height="20"
-    viewBox="0 0 16 16"
-    className="w-full stroke-current"
-  >
-    <line x1={0.5} x2={15.5} y1={3.5} y2={3.5} />
-    <line x1={0.5} x2={15.5} y1={11.5} y2={11.5} />
-  </svg>
-);
-
-const NavbarListDivider = () => {
-  return (
-    <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>
-  );
-};
-
-/**
- * Button component to avoid repeating styles for buttons shown on small screens
- */
-const NavbarMobileButton = (props: ButtonHTMLAttributes<HTMLButtonElement>) => {
-  return (
-    <button
-      {...props}
-      className={classNames(
-        'w-8 h-8 lg:hidden flex items-center p-1 rounded ',
-        'hover:bg-vega-clight-500 dark:hover:bg-vega-cdark-500',
-        'hover:text-vega-clight-50 dark:hover:text-vega-cdark-50'
-      )}
-    />
-  );
-};
-
-const envNameMapping: Record<Networks, string> = {
-  [Networks.VALIDATOR_TESTNET]: t('VALIDATOR_TESTNET'),
-  [Networks.CUSTOM]: t('Custom'),
-  [Networks.DEVNET]: t('Devnet'),
-  [Networks.STAGNET1]: t('Stagnet'),
-  [Networks.TESTNET]: t('Fairground testnet'),
-  [Networks.MAINNET_MIRROR]: t('Mirror'),
-  [Networks.MAINNET]: t('Mainnet'),
-};
-
-// https://github.com/radix-ui/primitives/issues/1630
-// eslint-disable-next-line
-const preventHover = (e: any) => {
-  e.preventDefault();
-};
@@ -51,10 +51,9 @@ type SidebarView =
    };

 export const Sidebar = () => {
-  const navClasses = 'flex lg:flex-col items-center gap-2 lg:gap-4 p-1';
  return (
-    <div className="flex lg:flex-col gap-2 h-full p-1" data-testid="sidebar">
-      <nav className={navClasses}>
+    <div className="flex flex-col gap-2 h-full py-1" data-testid="sidebar">
+      <nav className="flex flex-col items-center gap-4 p-1">
        {/* sidebar options that always show */}
        <SidebarButton
          view={ViewType.Deposit}
@@ -103,7 +102,7 @@ export const Sidebar = () => {
          />
        </Routes>
      </nav>
-      <nav className={classNames(navClasses, 'ml-auto lg:mt-auto lg:ml-0')}>
+      <nav className="mt-auto flex flex-col items-center gap-4 p-1">
        <SidebarButton
          view={ViewType.Settings}
          icon={VegaIconNames.COG}
@@ -162,7 +161,7 @@ const SidebarButton = ({
 const SidebarDivider = () => {
  return (
    <div
-      className="bg-vega-clight-600 dark:bg-vega-cdark-600 w-px h-4 lg:w-4 lg:h-px"
+      className="bg-vega-clight-600 dark:bg-vega-cdark-600 w-4 h-px"
      role="separator"
    />
  );
@@ -28,7 +28,7 @@ describe('VegaWalletConnectButton', () => {
    render(generateJsx({ pubKey: null } as VegaWalletContextShape));

    const button = screen.getByTestId('connect-vega-wallet');
-    expect(button).toHaveTextContent('Connect');
+    expect(button).toHaveTextContent('Connect Vega wallet');
    fireEvent.click(button);
    expect(mockUpdateDialogOpen).toHaveBeenCalled();
  });
@@ -1,26 +1,148 @@
-import { useMemo, useState } from 'react';
+import { useCallback, useMemo, useState } from 'react';
 import CopyToClipboard from 'react-copy-to-clipboard';
+import classNames from 'classnames';
 import { truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
+  Button,
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuItemIndicator,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuTrigger,
+  Drawer,
+  DropdownMenuSeparator,
  VegaIcon,
  VegaIconNames,
-  TradingButton as Button,
-  Intent,
-  TradingDropdown,
-  TradingDropdownTrigger,
-  TradingDropdownContent,
-  TradingDropdownRadioGroup,
-  TradingDropdownSeparator,
-  TradingDropdownItem,
-  TradingDropdownRadioItem,
-  TradingDropdownItemIndicator,
 } from '@vegaprotocol/ui-toolkit';
 import type { PubKey } from '@vegaprotocol/wallet';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import { WalletIcon } from '../icons/wallet';
 import { useCopyTimeout } from '@vegaprotocol/react-helpers';
 import { ViewType, useSidebar } from '../sidebar';
-import classNames from 'classnames';
+
+const MobileWalletButton = ({
+  isConnected,
+  activeKey,
+}: {
+  isConnected?: boolean;
+  activeKey?: PubKey;
+}) => {
+  const { pubKeys, selectPubKey, disconnect, fetchPubKeys } = useVegaWallet();
+  const openVegaWalletDialog = useVegaWalletDialogStore(
+    (store) => store.openVegaWalletDialog
+  );
+  const setView = useSidebar((store) => store.setView);
+  const { VEGA_ENV } = useEnvironment();
+  const isYellow = VEGA_ENV === Networks.TESTNET;
+  const [drawerOpen, setDrawerOpen] = useState(false);
+  const mobileDisconnect = useCallback(() => {
+    setDrawerOpen(false);
+    disconnect();
+  }, [disconnect]);
+  const openDrawer = useCallback(() => {
+    if (!isConnected) {
+      openVegaWalletDialog();
+      setDrawerOpen(false);
+    } else {
+      if (fetchPubKeys) {
+        fetchPubKeys();
+      }
+      setDrawerOpen(!drawerOpen);
+    }
+  }, [drawerOpen, fetchPubKeys, isConnected, openVegaWalletDialog]);
+
+  const iconClass = drawerOpen
+    ? 'hidden'
+    : isYellow
+    ? 'fill-black'
+    : 'fill-white';
+  const [container, setContainer] = useState<HTMLElement | null>(null);
+
+  const walletButton = (
+    <button
+      className="my-2 transition-all flex flex-col justify-around gap-3 p-2 relative h-[34px]"
+      onClick={openDrawer}
+      data-testid="connect-vega-wallet-mobile"
+    >
+      <WalletIcon className={iconClass} />
+    </button>
+  );
+  const onSelectItem = useCallback(
+    (pubkey: string) => {
+      setDrawerOpen(false);
+      selectPubKey(pubkey);
+    },
+    [selectPubKey]
+  );
+  return (
+    <div className="lg:hidden overflow-hidden flex" ref={setContainer}>
+      <Drawer
+        dataTestId="wallets-drawer"
+        open={drawerOpen}
+        onChange={setDrawerOpen}
+        container={container}
+        trigger={walletButton}
+      >
+        <div className="border-l border-default p-2 gap-4 flex flex-col w-full h-full bg-white dark:bg-black dark:text-white justify-between">
+          <div className="flex h-5 justify-end">
+            <button
+              className="transition-all flex flex-col justify-around gap-3 p-2 relative h-[34px]"
+              onClick={() => setDrawerOpen(false)}
+              data-testid="connect-vega-wallet-mobile-close"
+            >
+              <>
+                <div
+                  className={classNames(
+                    'w-[26px] h-[2px] bg-black dark:bg-white transition-all translate-y-[7.5px] rotate-45',
+                    {
+                      hidden: !drawerOpen,
+                    }
+                  )}
+                />
+                <div
+                  className={classNames(
+                    'w-[26px] h-[2px] bg-black dark:bg-white transition-all -translate-y-[7.5px] -rotate-45',
+                    {
+                      hidden: !drawerOpen,
+                    }
+                  )}
+                />
+              </>
+            </button>
+          </div>
+          <div className="grow my-4" role="list">
+            {(pubKeys || []).map((pk) => (
+              <KeypairListItem
+                key={pk.publicKey}
+                pk={pk}
+                isActive={activeKey?.publicKey === pk.publicKey}
+                onSelectItem={onSelectItem}
+              />
+            ))}
+          </div>
+          <div className="flex flex-col gap-2 m-4">
+            <Button
+              onClick={() => {
+                setDrawerOpen(false);
+                setView({ type: ViewType.Transfer });
+              }}
+              fill
+            >
+              {t('Transfer')}
+            </Button>
+            <Button onClick={mobileDisconnect} fill>
+              {t('Disconnect')}
+            </Button>
+          </div>
+        </div>
+      </Drawer>
+    </div>
+  );
+};

 export const VegaWalletConnectButton = () => {
  const [dropdownOpen, setDropdownOpen] = useState(false);
@@ -44,101 +166,96 @@ export const VegaWalletConnectButton = () => {

  if (isConnected && pubKeys) {
    return (
-      <TradingDropdown
-        open={dropdownOpen}
-        trigger={
-          <TradingDropdownTrigger
-            data-testid="manage-vega-wallet"
-            onClick={() => {
-              if (fetchPubKeys) {
-                fetchPubKeys();
-              }
-              setDropdownOpen(!dropdownOpen);
-            }}
-          >
-            <Button
-              size="small"
-              icon={<VegaIcon name={VegaIconNames.CHEVRON_DOWN} size={14} />}
-            >
-              {activeKey && <span className="uppercase">{activeKey.name}</span>}
-              {' | '}
-              {truncateByChars(pubKey)}
-            </Button>
-          </TradingDropdownTrigger>
-        }
-      >
-        <TradingDropdownContent
-          onInteractOutside={() => setDropdownOpen(false)}
-          sideOffset={12}
-          side="bottom"
-          align="end"
-          onEscapeKeyDown={() => setDropdownOpen(false)}
-        >
-          <div className="min-w-[340px]" data-testid="keypair-list">
-            <TradingDropdownRadioGroup
-              value={pubKey}
-              onValueChange={(value) => {
-                selectPubKey(value);
-              }}
-            >
-              {pubKeys.map((pk) => (
-                <KeypairItem
-                  key={pk.publicKey}
-                  pk={pk}
-                  active={pk.publicKey === pubKey}
-                />
-              ))}
-            </TradingDropdownRadioGroup>
-            <TradingDropdownSeparator />
-            {!isReadOnly && (
-              <TradingDropdownItem
-                data-testid="wallet-transfer"
+      <>
+        <div className="hidden lg:block">
+          <DropdownMenu
+            open={dropdownOpen}
+            trigger={
+              <DropdownMenuTrigger
+                data-testid="manage-vega-wallet"
                onClick={() => {
-                  setView({ type: ViewType.Transfer });
-                  setDropdownOpen(false);
+                  if (fetchPubKeys) {
+                    fetchPubKeys();
+                  }
+                  setDropdownOpen(!dropdownOpen);
                }}
              >
-                {t('Transfer')}
-              </TradingDropdownItem>
-            )}
-            <TradingDropdownItem data-testid="disconnect" onClick={disconnect}>
-              {t('Disconnect')}
-            </TradingDropdownItem>
-          </div>
-        </TradingDropdownContent>
-      </TradingDropdown>
+                {activeKey && (
+                  <span className="uppercase">{activeKey.name}</span>
+                )}
+                {': '}
+                {truncateByChars(pubKey)}
+              </DropdownMenuTrigger>
+            }
+          >
+            <DropdownMenuContent
+              onInteractOutside={() => setDropdownOpen(false)}
+              sideOffset={17}
+              side="bottom"
+              align="end"
+              onEscapeKeyDown={() => setDropdownOpen(false)}
+            >
+              <div className="min-w-[340px]" data-testid="keypair-list">
+                <DropdownMenuRadioGroup
+                  value={pubKey}
+                  onValueChange={(value) => {
+                    selectPubKey(value);
+                  }}
+                >
+                  {pubKeys.map((pk) => (
+                    <KeypairItem key={pk.publicKey} pk={pk} />
+                  ))}
+                </DropdownMenuRadioGroup>
+                <DropdownMenuSeparator />
+                {!isReadOnly && (
+                  <DropdownMenuItem
+                    data-testid="wallet-transfer"
+                    onClick={() => {
+                      setView({ type: ViewType.Transfer });
+                      setDropdownOpen(false);
+                    }}
+                  >
+                    {t('Transfer')}
+                  </DropdownMenuItem>
+                )}
+                <DropdownMenuItem data-testid="disconnect" onClick={disconnect}>
+                  {t('Disconnect')}
+                </DropdownMenuItem>
+              </div>
+            </DropdownMenuContent>
+          </DropdownMenu>
+        </div>
+        <MobileWalletButton isConnected activeKey={activeKey} />
+      </>
    );
  }

  return (
-    <Button
-      data-testid="connect-vega-wallet"
-      onClick={openVegaWalletDialog}
-      size="small"
-      intent={Intent.None}
-      icon={<VegaIcon name={VegaIconNames.ARROW_RIGHT} size={14} />}
-    >
-      <span className="whitespace-nowrap uppercase">{t('Connect')}</span>
-    </Button>
+    <>
+      <Button
+        data-testid="connect-vega-wallet"
+        onClick={openVegaWalletDialog}
+        size="sm"
+        className="hidden lg:block"
+      >
+        <span className="whitespace-nowrap">{t('Connect Vega wallet')}</span>
+      </Button>
+      <MobileWalletButton />
+    </>
  );
 };

-const KeypairItem = ({ pk, active }: { pk: PubKey; active: boolean }) => {
+const KeypairItem = ({ pk }: { pk: PubKey }) => {
  const [copied, setCopied] = useCopyTimeout();

  return (
-    <TradingDropdownRadioItem value={pk.publicKey}>
-      <div
-        className={classNames('flex-1 mr-2', {
-          'text-default': active,
-          'text-muted': !active,
-        })}
-        data-testid={`key-${pk.publicKey}`}
-      >
-        <span className={classNames('mr-2 uppercase')}>
-          {pk.name}
-          {' | '}
-          {truncateByChars(pk.publicKey)}
+    <DropdownMenuRadioItem value={pk.publicKey}>
+      <div className="flex-1 mr-2" data-testid={`key-${pk.publicKey}`}>
+        <span className="mr-2">
+          <span>
+            <span className="uppercase">{pk.name}</span>:{' '}
+            {truncateByChars(pk.publicKey)}
+          </span>
        </span>
        <span className="inline-flex items-center gap-1">
          <CopyToClipboard text={pk.publicKey} onCopy={() => setCopied(true)}>
@@ -153,7 +270,46 @@ const KeypairItem = ({ pk, active }: { pk: PubKey; active: boolean }) => {
          {copied && <span className="text-xs">{t('Copied')}</span>}
        </span>
      </div>
-      <TradingDropdownItemIndicator />
-    </TradingDropdownRadioItem>
+      <DropdownMenuItemIndicator />
+    </DropdownMenuRadioItem>
+  );
+};
+
+const KeypairListItem = ({
+  pk,
+  isActive,
+  onSelectItem,
+}: {
+  pk: PubKey;
+  isActive: boolean;
+  onSelectItem: (pk: string) => void;
+}) => {
+  const [copied, setCopied] = useCopyTimeout();
+
+  return (
+    <div
+      className="flex flex-col w-full ml-4 mr-2 mb-4"
+      data-testid={`key-${pk.publicKey}-mobile`}
+    >
+      <span className="flex gap-2 items-center mr-2">
+        <button onClick={() => onSelectItem(pk.publicKey)}>
+          <span className="uppercase">{pk.name}</span>
+        </button>
+        {isActive && <VegaIcon name={VegaIconNames.TICK} />}
+      </span>
+      <span className="flex gap-2 items-center">
+        {truncateByChars(pk.publicKey)}{' '}
+        <CopyToClipboard text={pk.publicKey} onCopy={() => setCopied(true)}>
+          <button
+            data-testid="copy-vega-public-key"
+            onClick={(e) => e.stopPropagation()}
+          >
+            <span className="sr-only">{t('Copy')}</span>
+            <VegaIcon name={VegaIconNames.COPY} />
+          </button>
+        </CopyToClipboard>
+        {copied && <span className="text-xs">{t('Copied')}</span>}
+      </span>
+    </div>
  );
 };
@@ -1 +0,0 @@
-export { VegaWalletMenu } from './vega-wallet-menu';
@@ -1,106 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { useCopyTimeout } from '@vegaprotocol/react-helpers';
-import {
-  TradingButton as Button,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import { truncateByChars } from '@vegaprotocol/utils';
-import { useVegaWallet, type PubKey } from '@vegaprotocol/wallet';
-import { useCallback, useMemo } from 'react';
-import CopyToClipboard from 'react-copy-to-clipboard';
-import { ViewType, useSidebar } from '../sidebar';
-
-export const VegaWalletMenu = ({
-  setMenu,
-}: {
-  setMenu: (open: 'nav' | 'wallet' | null) => void;
-}) => {
-  const { pubKey, pubKeys, selectPubKey, disconnect } = useVegaWallet();
-  const setView = useSidebar((store) => store.setView);
-
-  const activeKey = useMemo(() => {
-    return pubKeys?.find((pk) => pk.publicKey === pubKey);
-  }, [pubKey, pubKeys]);
-
-  const onSelectItem = useCallback(
-    (pubkey: string) => {
-      selectPubKey(pubkey);
-    },
-    [selectPubKey]
-  );
-
-  return (
-    <div>
-      <div className="grow my-4" role="list">
-        {(pubKeys || []).map((pk) => (
-          <KeypairListItem
-            key={pk.publicKey}
-            pk={pk}
-            isActive={activeKey?.publicKey === pk.publicKey}
-            onSelectItem={onSelectItem}
-          />
-        ))}
-      </div>
-
-      <div className="flex flex-col gap-2 m-4">
-        <Button
-          onClick={() => {
-            setView({ type: ViewType.Transfer });
-            setMenu(null);
-          }}
-        >
-          {t('Transfer')}
-        </Button>
-        <Button
-          onClick={async () => {
-            await disconnect();
-            setMenu(null);
-          }}
-        >
-          {t('Disconnect')}
-        </Button>
-      </div>
-    </div>
-  );
-};
-
-const KeypairListItem = ({
-  pk,
-  isActive,
-  onSelectItem,
-}: {
-  pk: PubKey;
-  isActive: boolean;
-  onSelectItem: (pk: string) => void;
-}) => {
-  const [copied, setCopied] = useCopyTimeout();
-
-  return (
-    <div
-      className="flex flex-col w-full ml-4 mr-2 mb-4"
-      data-testid={`key-${pk.publicKey}-mobile`}
-    >
-      <span className="flex gap-2 items-center mr-2">
-        <button type="button" onClick={() => onSelectItem(pk.publicKey)}>
-          <span className="uppercase">{pk.name}</span>
-        </button>
-        {isActive && <VegaIcon name={VegaIconNames.TICK} />}
-      </span>
-      <span className="flex gap-2 items-center">
-        {truncateByChars(pk.publicKey)}{' '}
-        <CopyToClipboard text={pk.publicKey} onCopy={() => setCopied(true)}>
-          <button
-            type="button"
-            data-testid="copy-vega-public-key"
-            onClick={(e) => e.stopPropagation()}
-          >
-            <span className="sr-only">{t('Copy')}</span>
-            <VegaIcon name={VegaIconNames.COPY} />
-          </button>
-        </CopyToClipboard>
-        {copied && <span className="text-xs">{t('Copied')}</span>}
-      </span>
-    </div>
-  );
-};
@@ -16,7 +16,6 @@ import {
 } from '@vegaprotocol/web3';
 import {
  envTriggerMapping,
-  Networks,
  NodeSwitcherDialog,
  useEnvironment,
  useInitializeEnv,
@@ -26,13 +25,7 @@ import './styles.css';
 import { usePageTitleStore } from '../stores';
 import DialogsContainer from './dialogs-container';
 import ToastsManager from './toasts-manager';
-import {
-  HashRouter,
-  useLocation,
-  Route,
-  Routes,
-  useSearchParams,
-} from 'react-router-dom';
+import { HashRouter, useLocation, useSearchParams } from 'react-router-dom';
 import { Connectors } from '../lib/vega-connectors';
 import { AppLoader, DynamicLoader } from '../components/app-loader';
 import { useDataProvider } from '@vegaprotocol/data-provider';
@@ -46,8 +39,6 @@ import {
  ProtocolUpgradeProposalNotification,
 } from '@vegaprotocol/proposals';
 import { ViewingBanner } from '../components/viewing-banner';
-import { NavHeader } from '../components/navbar/nav-header';
-import { Routes as AppRoutes } from './client-router';

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

@@ -83,7 +74,6 @@ const InitializeHandlers = () => {

 function AppBody({ Component }: AppProps) {
  const location = useLocation();
-  const { VEGA_ENV } = useEnvironment();
  const gridClasses = classNames(
    'h-full relative z-0 grid',
    'grid-rows-[repeat(3,min-content),minmax(0,1fr)]'
@@ -97,16 +87,7 @@ function AppBody({ Component }: AppProps) {
      <Title />
      <div className={gridClasses}>
        <AnnouncementBanner />
-        <Navbar theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'system'}>
-          <Routes>
-            <Route
-              path={AppRoutes.MARKETS}
-              // render nothing for markets/all, otherwise markets/:marketId will match with markets/all
-              element={null}
-            />
-            <Route path={AppRoutes.MARKET} element={<NavHeader />} />
-          </Routes>
-        </Navbar>
+        <Navbar theme="system" />
        <div data-testid="banners">
          <ProtocolUpgradeProposalNotification
            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
@@ -1,4 +1,4 @@
 {
  "name": "@vegaprotocol/announcements",
-  "version": "0.0.2"
+  "version": "0.0.1"
 }
@@ -110,22 +110,25 @@ export class VegaDataSource implements DataSource {
        this._decimalPlaces = data.market.decimalPlaces;
        this._positionDecimalPlaces = data.market.positionDecimalPlaces;

-        let priceMonitoringBounds: PriceMonitoringBounds[] | undefined;
+        let priceMonitoringBounds: PriceMonitoringBounds | undefined;

-        if (data.market.data.priceMonitoringBounds) {
-          priceMonitoringBounds = data.market.data.priceMonitoringBounds.map(
-            (bounds) => ({
-              maxValidPrice: Number(
-                addDecimal(bounds.maxValidPrice, this._decimalPlaces)
-              ),
-              minValidPrice: Number(
-                addDecimal(bounds.minValidPrice, this._decimalPlaces)
-              ),
-              referencePrice: Number(
-                addDecimal(bounds.referencePrice, this._decimalPlaces)
-              ),
-            })
-          );
+        if (
+          data.market.data.priceMonitoringBounds &&
+          data.market.data.priceMonitoringBounds.length > 0
+        ) {
+          const bounds = data.market.data.priceMonitoringBounds[0];
+
+          priceMonitoringBounds = {
+            maxValidPrice: Number(
+              addDecimal(bounds.maxValidPrice, this._decimalPlaces)
+            ),
+            minValidPrice: Number(
+              addDecimal(bounds.minValidPrice, this._decimalPlaces)
+            ),
+            referencePrice: Number(
+              addDecimal(bounds.referencePrice, this._decimalPlaces)
+            ),
+          };
        }

        return {
@@ -1,6 +1,5 @@
 export function createLog(name: string) {
  return (message: string) => {
-    // eslint-disable-next-line no-console
    console.log(`[${name}]: ${message}`);
  };
 }
@@ -160,7 +160,7 @@ export function waitForProposal(id: string): Promise<{ id: string }> {
          resolve(res.proposal);
        }
      } catch (err) {
-        console.error(err);
+        console.log(err);
      }

      tick++;
@@ -29,9 +29,6 @@ export function addGetNodes() {
              location
              name
              pendingStake
-              rankingScore {
-                performanceScore
-              }
              pubkey
              stakedByDelegates
              stakedByOperator
@@ -15,7 +15,6 @@ export const addImportNodeWallets = () => {
      .its('stdout')
      .then((result) => {
        const obj = JSON.parse(result);
-        // eslint-disable-next-line no-console
        console.log(obj);
        cy.writeFile(
          './src/fixtures/wallet/node0RecoveryPhrase',
@@ -30,7 +30,6 @@ export const addValidatorsSelfDelegate = () => {
          .its('stdout')
          .then((result) => {
            const obj = JSON.parse(result);
-            // eslint-disable-next-line no-console
            console.log(obj);
            cy.writeFile(
              './src/fixtures/wallet/node0RecoveryPhrase',
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
maciek	6d33c684fb	Merge remote-tracking branch 'origin/develop' into fix/4046-wrong-margin-requirement-in-order	2023-07-25 16:04:18 +02:00
maciek	17a5dcc57a	fix: deal ticket margin estimation - add unit test	2023-07-25 16:04:00 +02:00
maciek	16d4dde103	Merge remote-tracking branch 'origin/develop' into fix/4046-wrong-margin-requirement-in-order	2023-07-25 11:13:40 +02:00
maciek	093c800064	fix: deal ticket margin estimation - filter active orders by marketId	2023-07-25 11:13:20 +02:00
				`@@ -1 +0,0 @@`
				`export { VegaWalletMenu } from './vega-wallet-menu';`