test: update live e2e tests

2023-03-29 14:52:12 +02:00
475 changed files with 8772 additions and 58088 deletions
@@ -1,14 +1,15 @@
 ---
 name: Release
-about: A template to outline the steps needed to for a successful release of our frontend apps
+about:
+  A template to outline the steps needed to for a successful release of our frontend apps
 title: 'Release [add dapp version]-core-[add core version]'
-labels:
+labels: 
 assignees: ''
 ---

 ### Tasks

- [ ] Review [link to core release](xxx)
+- [ ] Review [link to core release](xxx) 
 - [ ] Tag frontend-monorepo
 - [ ] Create release and generate release notes
 - [ ] Run `@smoke` tests
@@ -13,7 +13,7 @@ env:

 jobs:
  add_issue:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
      - name: 'Add issue to project board'
        run: |
@@ -1,190 +0,0 @@
-name: CI/CD
-
-on:
-  push:
-    branches:
-      - release/*
-      - develop
-  pull_request:
-    types:
-      - opened
-      - ready_for_review
-      - reopened
-      - edited
-      - synchronize
-jobs:
-  node-modules:
-    runs-on: ubuntu-22.04
-    name: 'Cache yarn modules'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - 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-
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        if: steps.cache.outputs.cache-hit != 'true'
-        with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
-
-      - name: yarn install
-        if: steps.cache.outputs.cache-hit != 'true'
-        run: yarn install --pure-lockfile
-
-  lint-pr-title:
-    needs: node-modules
-    if: ${{ github.event_name == 'pull_request' }}
-    name: Verify PR title
-    uses: ./.github/workflows/lint-pr.yml
-    secrets: inherit
-
-  lint-test-build:
-    timeout-minutes: 35
-    needs: node-modules
-    runs-on: ubuntu-22.04
-    name: '(CI) lint + unit test + build'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - 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
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: develop
-
-      - name: Check formatting
-        run: yarn nx format:check
-
-      - name: Lint affected
-        run: yarn nx affected:lint --max-warnings=0
-
-      - name: Build affected spec
-        run: yarn nx affected --target=build-spec
-
-      - name: Test affected
-        run: yarn nx affected:test
-
-      - name: Build affected
-        run: yarn nx affected:build || (yarn install && yarn nx affected:build)
-
-      # See affected apps
-      - name: See affected apps
-        run: |
-          echo ">>>> debug"
-          echo "NX Version: $nx_version"
-          echo "NX_BASE: ${{ env.NX_BASE }}"
-          echo "NX_HEAD: ${{ env.NX_HEAD }}"
-          echo ">>>> eof debug"
-
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-          echo -n "Affected projects: $affected"
-
-          projects_e2e=""
-          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
-          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
-          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
-          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
-          projects_e2e=${projects_e2e%?}
-          projects_e2e=[${projects_e2e// /,}]
-          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
-          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
-
-    outputs:
-      projects: ${{ env.PROJECTS }}
-      projects-e2e: ${{ env.PROJECTS_E2E }}
-
-  cypress:
-    needs: lint-test-build
-    name: '(CI) cypress'
-    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
-    uses: ./.github/workflows/cypress-run.yml
-    secrets: inherit
-    with:
-      projects: ${{ needs.lint-test-build.outputs.projects-e2e }}
-      tags: '@smoke @regression'
-
-  publish-dist:
-    needs: lint-test-build
-    name: '(CD) publish dist'
-    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
-    uses: ./.github/workflows/publish-dist.yml
-    secrets: inherit
-    with:
-      projects: ${{ needs.lint-test-build.outputs.projects }}
-
-  dist-check:
-    runs-on: ubuntu-latest
-    needs: publish-dist
-    if: ${{ github.event_name == 'pull_request' }}
-    name: '(CD) comment preview links'
-    steps:
-      - name: Find Comment
-        uses: peter-evans/find-comment@v2
-        id: fc
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body-includes: Previews
-
-      - name: Inject slug/short variables
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: rlespinasse/github-slug-action@v4
-        with:
-          prefix: CI_
-
-      - name: Create comment
-        if: ${{ steps.fc.outputs.comment-id == 0 }}
-        uses: peter-evans/create-or-update-comment@v3
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          body: |
-            Previews
-            - explorer https://explorer.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - trading https://trading.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-            - governance https://governance.${{ env.CI_GITHUB_REF_NAME }}.vega.rocks
-
-  cypress-check:
-    name: '(CI) cypress - check'
-    runs-on: ubuntu-latest
-    needs: cypress
-    steps:
-      - run: echo Done!
-
-  # Report single result at the end, to avoid mess with required checks in PR
-  cypress-result:
-    if: ${{ always() }}
-    needs: cypress
-    runs-on: ubuntu-22.04
-    steps:
-      - run: |
-          result="${{ needs.cypress.result }}"
-          if [[ $result == "success" || $result == "skipped" ]]; then
-            exit 0
-          else
-            exit 1
-          fi
@@ -13,7 +13,7 @@ on:
 jobs:
  cypress-run:
    name: Run Cypress Trading tests -- live environment
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    steps:
      - name: Checkout
        uses: actions/checkout@v2
@@ -1,4 +1,4 @@
-name: (CI) Cypress Run
+name: Cypress Run
 on:
  workflow_call:
    inputs:
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 40
+    timeout-minutes: 30
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -93,9 +93,3 @@ jobs:
        with:
          name: logs-${{ matrix.project }}
          path: /home/runner/.vegacapsule/testnet/logs
-
-      - uses: actions/upload-artifact@v3
-        if: ${{ failure() }}
-        with:
-          name: test-report-${{ matrix.project }}
-          path: frontend-monorepo/apps/trading-e2e/cypress/reports
@@ -8,25 +8,22 @@ on:
 jobs:
  master:
    name: Generate Queries
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest

    steps:
      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup node
-        uses: actions/setup-node@v3
+        uses: actions/checkout@v2
        with:
-          node-version-file: '.nvmrc'
-          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
-          cache: yarn
-
+          fetch-depth: 0
+      - name: Use Node.js 16
+        id: Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.15.1
      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-
+        run: yarn install
      - name: Generate queries
        run: node ./scripts/get-queries.js
-
      - uses: actions/upload-artifact@v2
        with:
          name: queries
@@ -1,29 +0,0 @@
---
-name: Verify PR title
-
-on:
-  workflow_call:
-
-jobs:
-  lint_pr:
-    timeout-minutes: 10
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - 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
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
-      - name: Check PR title
-        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -0,0 +1,23 @@
+---
+name: Verify PR title
+
+on:
+  pull_request:
+    types: [opened, ready_for_review, reopened, edited, synchronize]
+jobs:
+  lint_pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Use Node.js 16
+        id: Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.15.1
+      - name: Install root dependencies
+        run: yarn install
+      - name: Check PR title
+        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -0,0 +1,93 @@
+name: PR Validations
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+jobs:
+  pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout frontend mono repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Check node version
+        id: node-version
+        run: |
+          npmVersion=$(cat .nvmrc | head -n 1)
+          echo ::set-output name=npmVersion::${npmVersion}
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ steps.node-version.outputs.npmVersion }}
+
+      # Check SHAs
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
+        with:
+          main-branch-name: ${{ github.base_ref || github.ref_name }}
+          set-environment-variables-for-job: true
+
+      # See affected apps
+      - name: See affected apps
+        run: |
+          nx_version=$(cat package.json | grep '"nx"' | cut -d ':' -f 2 | tr -d '",[:space:]')
+          rm package.json yarn.lock
+          yarn add nx@$nx_version
+          affected=$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)
+          echo -n "Affected projects: $affected"
+          projects_e2e=""
+          if [[ $affected == *"governance"* ]]; then projects_e2e+='"governance-e2e" '; fi
+          if [[ $affected == *"trading"* ]]; then projects_e2e+='"trading-e2e" '; fi
+          if [[ $affected == *"explorer"* ]]; then projects_e2e+='"explorer-e2e" '; fi
+          if [[ -z "$projects_e2e" ]]; then projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '; fi
+          projects_e2e=${projects_e2e%?}
+          projects_e2e=[${projects_e2e// /,}]
+          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
+          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
+
+    outputs:
+      projects: ${{ env.PROJECTS }}
+      projects-e2e: ${{ env.PROJECTS_E2E }}
+
+  run-cypress:
+    needs: pr
+    if: ${{ needs.pr.outputs.projects != '[]' }}
+    uses: ./.github/workflows/cypress-run.yml
+    secrets: inherit
+    with:
+      projects: ${{ needs.pr.outputs.projects-e2e }}
+      tags: '@smoke @regression'
+
+  run-docker-build:
+    needs: pr
+    if: ${{ needs.pr.outputs.projects != '[]' }}
+    uses: ./.github/workflows/publish-docker-containers.yml
+    secrets: inherit
+    with:
+      projects: ${{ needs.pr.outputs.projects }}
+
+  # Report single result at the end, to avoid mess with required checks in PR
+  result:
+    if: ${{ always() }}
+    needs: run-cypress
+    runs-on: ubuntu-latest
+    name: Cypress result
+    steps:
+      - run: |
+          result="${{ needs.run-cypress.result }}"
+          if [[ $result == "success" || $result == "skipped" ]]; then
+            exit 0
+          else
+            exit 1
+          fi
@@ -7,7 +7,7 @@ on:
 jobs:
  master:
    name: Generate Queries
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest

    steps:
      - name: Checkout
@@ -1,171 +0,0 @@
-name: (CD) Publish docker + s3
-
-on:
-  workflow_call:
-    inputs:
-      projects:
-        required: true
-        type: string
-
-jobs:
-  publish-dist:
-    strategy:
-      fail-fast: false
-      matrix:
-        app: ${{ fromJSON(inputs.projects) }}
-    name: ${{ matrix.app }}
-    runs-on: ubuntu-22.04
-    timeout-minutes: 25
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        id: quemu
-        uses: docker/setup-qemu-action@v2
-
-      - name: Available platforms
-        run: echo ${{ steps.qemu.outputs.platforms }}
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - 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
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
-      # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Define variables
-        run: |
-          envName=''
-          dockerfile="dist.Dockerfile"
-          if [[ "${{ github.event_name }}" = "push" ]]; then
-            domain="vega.rocks"
-            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
-                domain="vega.community"
-                if [[ "${{ matrix.app }}" = "trading" ]]; then
-                  dockerfile="ipfs.Dockerfile"
-                fi
-              fi
-            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet3"
-            fi
-            bucketName="${{ matrix.app }}.${envName}.${domain}"
-            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
-          fi
-          nodeVersion=$(cat .nvmrc | head -n 1)
-          echo ENV_NAME=${envName} >> $GITHUB_ENV
-          echo NODE_VERSION=${nodeVersion} >> $GITHUB_ENV
-          echo DOCKERFILE=docker/${dockerfile} >> $GITHUB_ENV
-
-      - name: Build local dist
-        if: ${{ env.DOCKERFILE != 'docker/ipfs.Dockerfile' }}
-        run: |
-          flags=""
-          if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            if [[ "${{ env.ENV_NAME }}" != "ops-vega" ]]; then
-              flags="--env=${{ env.ENV_NAME }}"
-            fi
-          fi
-
-          if [ "${{ matrix.app }}" = "trading" ]; then
-            yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
-            DIST_LOCATION=dist/apps/trading/exported
-          else
-            yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
-            DIST_LOCATION=dist/apps/${{ matrix.app }}
-          fi
-          mv $DIST_LOCATION dist-result
-          tree dist-result
-
-      - name: Build and export to local Docker
-        id: docker_build
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          file: ${{ env.DOCKERFILE }}
-          load: true
-          build-args: |
-            APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
-            ENV_NAME=${{ env.ENV_NAME }}
-          tags: |
-            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
-
-      - name: Image digest
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
-        run: echo ${{ steps.docker_build.outputs.digest }}
-
-      - name: Sanity check docker image
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
-        run: |
-          echo "Check ipfs-hash"
-          if [[ "${{ env.DOCKERFILE }}" = "docker/ipfs.Dockerfile" ]];  then
-            docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          fi
-
-          echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree .'
-
-      - name: Copy dist to local filesystem
-        if: ${{ env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' }}
-        run: |
-          docker create --name=dist ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
-          docker cp dist:/usr/share/nginx/html dist
-
-          echo "check local dist files"
-          tree dist/html
-          mv dist/html dist-result
-
-      - name: Publish dist as docker image
-        uses: docker/build-push-action@v3
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          context: .
-          file: ${{ env.DOCKERFILE }}
-          push: true
-          build-args: |
-            APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
-            ENV_NAME=${{ env.ENV_NAME }}
-          tags: |
-            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
-
-      # bucket creation in github.com/vegaprotocol/terraform//frontend
-      - name: Publish dist to s3
-        uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' }}
-        with:
-          args: --acl private --follow-symlinks --delete
-        env:
-          AWS_S3_BUCKET: ${{ env.BUCKET_NAME }}
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: 'eu-west-1'
-          SOURCE_DIR: 'dist-result'
-
-      - name: Add preview label
-        uses: actions-ecosystem/action-add-labels@v1
-        if: ${{ github.event_name == 'pull_request' }}
-        with:
-          labels: ${{ matrix.app }}-preview
-          number: ${{ github.event.number }}
@@ -0,0 +1,94 @@
+name: Docker build
+
+on:
+  workflow_call:
+    inputs:
+      projects:
+        required: true
+        type: string
+
+jobs:
+  master:
+    strategy:
+      fail-fast: false
+      matrix:
+        app: ${{ fromJSON(inputs.projects) }}
+    name: ${{ matrix.app }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v3
+
+      - name: Set up QEMU
+        id: quemu
+        uses: docker/setup-qemu-action@v2
+
+      - name: Available platforms
+        run: echo ${{ steps.qemu.outputs.platforms }}
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      # https://docs.github.com/en/actions/learn-github-actions/contexts
+      # https://github.com/actions/checkout#Checkout-pull-request-HEAD-commit-instead-of-merge-commit
+      - name: Determine Docker Image tag
+        id: tags
+        run: |
+          npmVersion=$(cat .nvmrc | head -n 1)
+          versionTag=${{ startsWith(github.ref, 'refs/tags/') && github.ref_name || github.event.pull_request.head.sha }}
+          echo ::set-output name=npmVersion::${npmVersion}
+          echo ::set-output name=version::${versionTag}
+
+      - name: Print config
+        run: |
+          git rev-parse --verify HEAD
+          git status
+          echo "steps.tags.outputs.version=${{ steps.tags.outputs.version }}"
+
+      - name: Build and export to local Docker
+        uses: docker/build-push-action@v3
+        with:
+          load: true
+          build-args: |
+            APP=${{ matrix.app }}
+            NODE_VERSION=${{ steps.tags.outputs.npmVersion }}
+          tags: |
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
+
+      - name: Sanity check docker image
+        run: |
+          echo "Check .env file"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat .env
+          echo "Check ipfs-hash"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat ipfs-hash
+          echo "List html directory"
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local ls -lah
+
+      - name: Log in to the Container registry
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v3
+        with:
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            NODE_VERSION=${{ steps.tags.outputs.npmVersion }}
+          tags: |
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:latest
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ steps.tags.outputs.version }}
+
+      - name: Add preview label
+        uses: actions-ecosystem/action-add-labels@v1
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          labels: ${{ matrix.app }}-preview
+          number: ${{ github.event.number }}
+
+      - name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
@@ -8,7 +8,6 @@ on:
        required: true
        type: choice
        options:
-          - announcements
          - ui-toolkit
          - react-helpers
          - tailwindcss-config
@@ -19,27 +18,29 @@ on:
 jobs:
  publish:
    name: Build & Publish - Tag
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    permissions:
      contents: 'read'
      actions: 'read'
    steps:
      - name: Checkout
        uses: actions/checkout@v3
-
-      - name: Setup node
+        with:
+          fetch-depth: 0
+      - name: User Node.js 16
+        id: 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
-
+          node-version: 16.15.1
+      - name: Restore node_modules from cache
+        uses: actions/cache@v3
+        with:
+          path: '**/node_modules'
+          key: node_modules-${{ hashFiles('**/yarn.lock') }}
      - name: Install root dependencies
        run: yarn install --frozen-lockfile
-
      - name: Build project
        run: yarn nx build ${{inputs.project}}
-
      - name: Publish project to @vegaprotocol
        uses: JS-DevTools/npm-publish@v1
        with:
@@ -0,0 +1,46 @@
+name: Unit tests & build
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+  pull_request:
+jobs:
+  pr:
+    name: Test and lint - PR
+    runs-on: ubuntu-latest
+    permissions:
+      contents: 'read'
+      actions: 'read'
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
+        with:
+          main-branch-name: ${{ github.base_ref }}
+      - name: Use Node.js 16
+        id: Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.15.1
+      - name: Restore node_modules from cache
+        uses: actions/cache@v3
+        with:
+          path: '**/node_modules'
+          key: node_modules-${{ hashFiles('**/yarn.lock') }}
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile
+      - name: Check formatting
+        run: yarn nx format:check
+      - name: Lint affected
+        run: yarn nx affected:lint --max-warnings=0
+      - name: Test affected
+        run: yarn nx affected:test
+      - name: Build affected
+        run: yarn nx affected:build
+      - name: Build affected spec
+        run: yarn nx affected --target=build-spec
@@ -46,6 +46,3 @@ cypress.env.json

 # Next.js
 .next
-
-#cypress
-/apps/trading-e2e/cypress/reports/
@@ -4,7 +4,6 @@ FROM --platform=amd64 node:${NODE_VERSION}-alpine3.16 as build
 WORKDIR /app
 # Argument to allow building of different apps
 ARG APP
-ARG ENV_NAME=""
 RUN apk add --update --no-cache \
  python3 \
  make \
@@ -13,17 +12,22 @@ RUN apk add --update --no-cache \
 COPY . ./
 RUN yarn --network-timeout 100000 --pure-lockfile
 # work around for different build process in trading
-RUN sh docker/docker-build.sh
+RUN sh ./docker-build.sh

 # Server environment
 # if this fails you need to docker pull nginx:1.23-alpine and pin new SHA
 # this is to ensure that we run always same version of alpine to make sure ipfs is indempotent
 FROM --platform=amd64 nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+ARG APP
 # configuration of system
+RUN apk add --no-cache bash go-ipfs
 EXPOSE 80
+COPY entrypoint.sh /entrypoint.sh
+CMD ["/entrypoint.sh"]
+
 # Copy dist
 WORKDIR /usr/share/nginx/html
-COPY docker/nginx.conf /etc/nginx/conf.d/default.conf
-RUN rm -rf /usr/share/nginx/html/*
-COPY --from=build /app/dist/apps/${APP}/* /usr/share/nginx/html
-RUN apk add --no-cache go-ipfs; ipfs init && echo "$(ipfs add -rQ .)" > /ipfs-hash; apk del go-ipfs
+COPY nginx/nginx.conf /etc/nginx/conf.d/default.conf
+COPY --from=build /app/dist/apps/${APP} /usr/share/nginx/html
+COPY ./apps/${APP}/.env .env
+RUN ipfs init && echo "$(ipfs add -rQ .)" > ipfs-hash
@@ -21,7 +21,6 @@ module.exports = defineConfig({
    chromeWebSecurity: false,
    viewportWidth: 1440,
    viewportHeight: 900,
-    testIsolation: false,
  },
  env: {
    environment: 'CUSTOM',
@@ -1,7 +1,7 @@
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_NETWORKS='{"SANDBOX":"https://sandbox.explorer.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
@@ -3,7 +3,6 @@ NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -8,4 +8,3 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -6,4 +6,3 @@ NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -0,0 +1,19 @@
+# App configuration variables
+NX_TENDERMINT_URL=https://tm.be.mainnet-mirror.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.xyz/websocket
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_ENV=MIRROR
+NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.xyz/rest/
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_GOVERNANCE_URL=https://mainnet-mirror.token.vega.xyz
+
+# App flags
+NX_EXPLORER_ASSETS=1
+NX_EXPLORER_GENESIS=1
+NX_EXPLORER_GOVERNANCE=1
+NX_EXPLORER_NETWORK_PARAMETERS=1
+NX_EXPLORER_PARTIES=1
+NX_EXPLORER_VALIDATORS=1
+NX_EXPLORER_MARKETS=0
+NX_EXPLORER_ORACLES=0
+NX_EXPLORER_TXS_LIST=1
@@ -0,0 +1,11 @@
+# App configuration variables
+NX_VEGA_ENV=SANDBOX
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_TENDERMINT_URL=https://tm.sandbox.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.sandbox.vega.xyz/websocket
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_GOVERNANCE_URL=https://sandbox.token.vega.xyz
@@ -11,4 +11,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -5,4 +5,3 @@ NX_VEGA_ENV=STAGNET3
 NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
 NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
 NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -8,4 +8,3 @@ NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -5,9 +5,8 @@ NX_VEGA_URL=https://api-validators-testnet.vega.rocks/graphql
 NX_VEGA_REST=https://api-validators-testnet.vega.rocks/
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

 NX_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
 NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
-NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
+NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -4,4 +4,3 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
@@ -10,7 +10,7 @@ export const Footer = () => {
  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
  const { screenSize } = useScreenDimensions();
  const showFullFeedbackLabel = useMemo(
-    () => ['md', 'lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
+    () => ['lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
    [screenSize]
  );

@@ -60,11 +60,9 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
        <>
          <MarketInfoTable
            noBorder={false}
-            data={{
-              maxValidPrice: trigger.maxValidPrice,
-              minValidPrice: trigger.minValidPrice,
-            }}
+            data={trigger}
            decimalPlaces={market.decimalPlaces}
+            omits={['referencePrice', '__typename']}
          />
          <MarketInfoTable
            noBorder={false}
@@ -3,14 +3,16 @@ import {
  useAssetDetailsDialogStore,
 } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
-import { useEnvironment } from '@vegaprotocol/environment';
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
 import {
+  AnnouncementBanner,
  BackgroundVideo,
  BreadcrumbsContainer,
  ButtonLink,
+  ExternalLink,
+  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
+import { useState } from 'react';
 import {
  isRouteErrorResponse,
  Link,
@@ -35,39 +37,58 @@ const DialogsContainer = () => {
  );
 };

+const MainnetSimAd = () => {
+  const [shouldDisplayBanner, setShouldDisplayBanner] = useState<boolean>(true);
+
+  // Return an empty div so that the grid layout in _app.page.ts
+  // renders correctly
+  if (!shouldDisplayBanner) {
+    return <div />;
+  }
+
+  return (
+    <AnnouncementBanner>
+      <div className="grid grid-cols-[auto_1fr] gap-4 font-alpha calt uppercase text-center text-lg text-white">
+        <button
+          className="flex items-center"
+          onClick={() => setShouldDisplayBanner(false)}
+        >
+          <Icon name="cross" className="w-6 h-6" ariaLabel="dismiss" />
+        </button>
+        <div>
+          <span className="pr-4">Mainnet sim 3 is live!</span>
+          <ExternalLink href="https://fairground.wtf/">Learn more</ExternalLink>
+        </div>
+      </div>
+    </AnnouncementBanner>
+  );
+};
+
 export const Layout = () => {
  const isHome = Boolean(useMatch(Routes.HOME));
-  const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
-  const fixedWidthClasses = 'w-full max-w-[1500px] mx-auto';
-
  return (
    <>
      <div
        className={classNames(
-          'min-h-screen',
+          'max-w-[1500px] min-h-[100vh]',
          'mx-auto my-0',
          'grid grid-rows-[auto_1fr_auto] grid-cols-1',
-          'border-vega-light-200 dark:border-vega-dark-200',
+          'border-vega-light-200 dark:border-vega-dark-200 lg:border-l lg:border-r',
          'antialiased text-black dark:text-white',
          'overflow-hidden relative'
        )}
      >
        <div>
-          {ANNOUNCEMENTS_CONFIG_URL && (
-            <AnnouncementBanner
-              app="explorer"
-              configUrl={ANNOUNCEMENTS_CONFIG_URL}
-            />
-          )}
+          <MainnetSimAd />
          <Header />
        </div>
-        <div className={fixedWidthClasses}>
+        <div>
          <main className="p-4">
            {!isHome && <BreadcrumbsContainer className="mb-4" />}
            <Outlet />
          </main>
        </div>
-        <div className={fixedWidthClasses}>
+        <div>
          <Footer />
        </div>
      </div>
@@ -10,13 +10,9 @@ NX_ETHEREUM_CHAIN_ID=1440
 NX_ETH_URL_CONNECT=1
 NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
 NX_LOCAL_PROVIDER_URL=http://localhost:8545/
-NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -25,7 +25,6 @@ module.exports = defineConfig({
    viewportWidth: 1440,
    viewportHeight: 900,
    numTestsKeptInMemory: 5,
-    testIsolation: false,
  },
  env: {
    ethProviderUrl: 'http://localhost:8545/',
@@ -1,38 +0,0 @@
-export const upgradeProposalsData = {
-  lastBlockHeight: '2014133',
-  protocolUpgradeProposals: {
-    edges: [
-      {
-        node: {
-          upgradeBlockHeight: '2015942',
-          vegaReleaseTag: 'v1',
-          approvers: [
-            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
-            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
-            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
-            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
-          ],
-          status: 'PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED',
-          __typename: 'ProtocolUpgradeProposal',
-        },
-        __typename: 'ProtocolUpgradeProposalEdge',
-      },
-      {
-        node: {
-          upgradeBlockHeight: '1955065',
-          vegaReleaseTag: 'v0.71.0+dev-12156-bca1d57e',
-          approvers: [
-            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
-            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
-            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
-            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
-          ],
-          status: 'PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED',
-          __typename: 'ProtocolUpgradeProposal',
-        },
-        __typename: 'ProtocolUpgradeProposalEdge',
-      },
-    ],
-    __typename: 'ProtocolUpgradeProposalConnection',
-  },
-};
@@ -1,117 +0,0 @@
-export const nodeData = {
-  epoch: {
-    id: '204731',
-    timestamps: {
-      start: '2023-04-14T09:30:09.452005Z',
-      end: null,
-      expiry: '2023-04-14T09:31:09.452005Z',
-      __typename: 'EpochTimestamps',
-    },
-    __typename: 'Epoch',
-  },
-  nodesConnection: {
-    edges: [
-      {
-        node: {
-          avatarUrl:
-            'https://www.gravatar.com/avatar/y2hwc4xjds7zvlam3y4in94q2rcdimsn?d=identicon',
-          id: 'f337b5cc50c49a928e49129a2eca62277a81b4b7336b6e4131f8f0431e8db029',
-          name: 'lovely-fisherman',
-          pubkey:
-            '02a6531716b7a6d82779b7793c3ad2fcb47290ea2ff0912c56f61219bd9675ff',
-          stakedByOperator: '3000000000000000000000',
-          stakedByDelegates: '0',
-          stakedTotal: '3000000000000000000000',
-          pendingStake: '0',
-          rankingScore: {
-            rankingScore: '0.4999166805532412',
-            stakeScore: '0.2499583402766206',
-            performanceScore: '1',
-            votingPower: '2499',
-            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-            __typename: 'RankingScore',
-          },
-          __typename: 'Node',
-        },
-        __typename: 'NodeEdge',
-      },
-      {
-        node: {
-          avatarUrl:
-            'https://www.gravatar.com/avatar/g1tw70qnoo0tf8ror30jefwhae92zy16?d=identicon',
-          id: 'cdadcf885556e372b6b39679d6ad46854d1d9c1e982da7ff2929544df01f9088',
-          name: 'magnificent-door',
-          pubkey:
-            '121934387281812a2d5e6913e5d57c0f85a8f169e2752347ee2e23b52d46623c',
-          stakedByOperator: '3000000000000000000000',
-          stakedByDelegates: '0',
-          stakedTotal: '3000000000000000000000',
-          pendingStake: '0',
-          rankingScore: {
-            rankingScore: '0.4999166805532412',
-            stakeScore: '0.2499583402766206',
-            performanceScore: '1',
-            votingPower: '2499',
-            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-            __typename: 'RankingScore',
-          },
-          __typename: 'Node',
-        },
-        __typename: 'NodeEdge',
-      },
-      {
-        node: {
-          avatarUrl:
-            'https://www.gravatar.com/avatar/s2e7hp7soq5zdhxeap7p21onetsjiy6w?d=identicon',
-          id: '9a13de2548fef30d928e71e76004c98ec7ad9d8fc3ddcd16ddee210b28ea4cfc',
-          name: 'helpful-tree',
-          pubkey:
-            'bd6339d2428c79ac3bc9011771236d17bac92bcb1806423388d52fb440043aef',
-          stakedByOperator: '3000000000000000000000',
-          stakedByDelegates: '2000000000000000000',
-          stakedTotal: '3002000000000000000000',
-          pendingStake: '0',
-          rankingScore: {
-            rankingScore: '0.5002499583402766',
-            stakeScore: '0.2501249791701383',
-            performanceScore: '1',
-            votingPower: '2501',
-            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-            __typename: 'RankingScore',
-          },
-          __typename: 'Node',
-        },
-        __typename: 'NodeEdge',
-      },
-      {
-        node: {
-          avatarUrl:
-            'https://www.gravatar.com/avatar/3gop683kg2cvd8rpv286hzagqt3yjsdq?d=identicon',
-          id: '93ac271ab95038333587e47d11461e6edc0126e6e77156281c545f4c5650a6d0',
-          name: 'easy-cookie',
-          pubkey:
-            '65c80e2f5f84e2109eec30810f137ba04cbbecaba8f27706c146cc6c6f90db29',
-          stakedByOperator: '3000000000000000000000',
-          stakedByDelegates: '0',
-          stakedTotal: '3000000000000000000000',
-          pendingStake: '0',
-          rankingScore: {
-            rankingScore: '0.4999166805532412',
-            stakeScore: '0.2499583402766206',
-            performanceScore: '1',
-            votingPower: '2499',
-            status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-            __typename: 'RankingScore',
-          },
-          __typename: 'Node',
-        },
-        __typename: 'NodeEdge',
-      },
-    ],
-    __typename: 'NodesConnection',
-  },
-  nodeData: {
-    stakedTotal: '12002000000000000000000',
-    __typename: 'NodeData',
-  },
-};
@@ -1,325 +0,0 @@
-export const proposalsData = {
-  proposalsConnection: {
-    edges: [
-      {
-        node: {
-          id: 'e8ba9d268e12514644fd1fc7ff289292f4ce6489cc32cc73133aea52c04aef89',
-          rationale: {
-            title: 'Add asset Wrapped Ether',
-            description: 'Proposal to add asset WETH to Vega network',
-            __typename: 'ProposalRationale',
-          },
-          reference: '',
-          state: 'STATE_OPEN',
-          datetime: '2026-12-01T11:41:28.654288Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2026-12-01T11:45:33Z',
-            enactmentDatetime: '2026-12-01T11:45:43Z',
-            change: {
-              name: 'Wrapped Ether',
-              symbol: 'WETH',
-              decimals: 18,
-              quantum: '0.0008',
-              source: {
-                contractAddress: '0x9B18C6CaD886D5653783E2B25759124760F4407F',
-                withdrawThreshold: '1',
-                lifetimeLimit: '400000000000000000',
-                __typename: 'ERC20',
-              },
-              __typename: 'NewAsset',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-      {
-        node: {
-          id: 'd848fc7881f13d366df5f61ab139d5fcfa72bf838151bb51b54381870e357931',
-          rationale: {
-            title: 'Add asset Dai Stablecoin',
-            description: 'Proposal to add asset DAI to Vega network',
-            __typename: 'ProposalRationale',
-          },
-          reference: '',
-          state: 'STATE_ENACTED',
-          datetime: '2022-11-29T15:49:57.80978Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2023-04-13T15:52:58Z',
-            enactmentDatetime: '2023-04-13T15:53:08Z',
-            change: {
-              name: 'Dai Stablecoin',
-              symbol: 'DAI',
-              decimals: 18,
-              quantum: '1',
-              source: {
-                contractAddress: '0xad018fB8ec00bfd622B91C83E684a6AC7bB8fbA4',
-                withdrawThreshold: '1',
-                lifetimeLimit: '500000000000000000000',
-                __typename: 'ERC20',
-              },
-              __typename: 'NewAsset',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-      {
-        node: {
-          id: 'ccbd651b4a1167fd73c4a0340ac759fa0a31ca487ad46a13254b741ad71947ed',
-          rationale: {
-            title: 'New DAI market',
-            description: 'New DAI market',
-            __typename: 'ProposalRationale',
-          },
-          reference: '0VFQusmmESdrP5GuL8naB6lxfoE3RPGaEeo7abdN',
-          state: 'STATE_ENACTED',
-          datetime: '2022-11-26T19:36:19.26034Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2022-11-26T19:36:42Z',
-            enactmentDatetime: '2023-03-22T13:57:37Z',
-            change: {
-              instrument: {
-                name: 'UNIDAI Monthly (Dec 2022)',
-                code: 'UNIDAI.MF21',
-                futureProduct: {
-                  settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
-                  __typename: 'FutureProduct',
-                },
-                __typename: 'InstrumentConfiguration',
-              },
-              __typename: 'NewMarket',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-      {
-        node: {
-          id: 'bc70383f0e9515b15542cf4c63590cd2ca46b3363ba7c4a72af0e62112b3951b',
-          rationale: {
-            title: 'USDC-III',
-            description: 'USDC-III D List test',
-            __typename: 'ProposalRationale',
-          },
-          reference: '',
-          state: 'STATE_ENACTED',
-          datetime: '2022-11-22T15:17:28.829605Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2022-11-22T15:18:56Z',
-            enactmentDatetime: '2022-11-22T15:19:06Z',
-            change: {
-              name: 'USDC-III',
-              symbol: 'USDC-III',
-              decimals: 18,
-              quantum: '1',
-              source: {
-                contractAddress: '0x1F1A067aEC530b66BA5128C9Db76825eC22c3C6b',
-                withdrawThreshold: '100000000000000000000000000',
-                lifetimeLimit: '1000000000000000000000000000',
-                __typename: 'ERC20',
-              },
-              __typename: 'NewAsset',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-      {
-        node: {
-          id: '9d9b2a9d0179d0e4ccb317f6c4a5db0b905d893190bfb5e5499985ef313281c8',
-          rationale: {
-            title: 'New BTC market',
-            description: 'New BTC market',
-            __typename: 'ProposalRationale',
-          },
-          reference: 'AXeRWS3TvLBFDgWOSHQpKFJf3NTbnWK6310q02fZ',
-          state: 'STATE_ENACTED',
-          datetime: '2022-11-26T19:36:19.26034Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2022-11-26T19:36:42Z',
-            enactmentDatetime: '2023-03-22T13:57:37Z',
-            change: {
-              instrument: {
-                name: 'ETHBTC Quarterly (Feb 2023)',
-                code: 'ETHBTC.QM21',
-                futureProduct: {
-                  settlementAsset: { symbol: 'tBTC', __typename: 'Asset' },
-                  __typename: 'FutureProduct',
-                },
-                __typename: 'InstrumentConfiguration',
-              },
-              __typename: 'NewMarket',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-      {
-        node: {
-          id: '9c48796e7988769ededc2b2b02220b00e93f65f23e8141bf1fd23a6983d95943',
-          rationale: {
-            title: 'Update governance.proposal.asset.requiredMajority',
-            description:
-              'Proposal to update governance.proposal.asset.requiredMajority to 300}',
-            __typename: 'ProposalRationale',
-          },
-          reference: '',
-          state: 'STATE_ENACTED',
-          datetime: '2022-11-22T13:22:52.370655Z',
-          rejectionReason: null,
-          party: {
-            id: '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f',
-            __typename: 'Party',
-          },
-          errorDetails: null,
-          terms: {
-            closingDatetime: '2022-11-22T13:27:13Z',
-            enactmentDatetime: '2022-11-22T13:27:33Z',
-            change: {
-              networkParameter: {
-                key: 'governance.proposal.asset.requiredParticipation',
-                value: '0.000001',
-                __typename: 'NetworkParameter',
-              },
-              __typename: 'UpdateNetworkParameter',
-            },
-            __typename: 'ProposalTerms',
-          },
-          votes: {
-            yes: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            no: {
-              totalTokens: '0',
-              totalNumber: '0',
-              totalEquityLikeShareWeight: '0',
-              __typename: 'ProposalVoteSide',
-            },
-            __typename: 'ProposalVotes',
-          },
-          __typename: 'Proposal',
-        },
-        __typename: 'ProposalEdge',
-      },
-    ],
-    __typename: 'ProposalsConnection',
-  },
-};
@@ -44,8 +44,7 @@ describe(
  function () {
    before('connect wallets and set approval limit', function () {
      cy.visit('/');
-      ethereumWalletConnect();
-      cy.associateTokensToVegaWallet('1');
+      vegaWalletSetSpecifiedApprovalAmount('1000');
    });

    beforeEach('visit proposals tab', function () {
@@ -57,7 +56,7 @@ describe(
      navigateTo(navigation.proposals);
    });

-    // 3001-VOTE-050 3001-VOTE-054 3001-VOTE-055 3002-PROP-019
+    // 3001-VOTE-055
    it('Newly created raw proposal details - shows proposal title and full description', function () {
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
@@ -214,7 +213,6 @@ describe(

    // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060
    it('Newly created proposal details - ability to increase associated tokens - by voting again after association', function () {
-      vegaWalletSetSpecifiedApprovalAmount('1000');
      createRawProposal();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getSubmittedProposalFromProposalList(rawProposal.rationale.title)
@@ -13,6 +13,7 @@ import {
  createUpdateNetworkProposalTxBody,
  createFreeFormProposalTxBody,
 } from '../../support/proposal.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

@@ -32,6 +33,10 @@ context(
    before('Connect wallets and set approval', function () {
      cy.visit('/');
      vegaWalletSetSpecifiedApprovalAmount('1000');
+      cy.connectVegaWallet();
+      ethereumWalletConnect();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
+      cy.clearLocalStorage();
    });

    beforeEach('visit proposals', function () {
@@ -109,7 +114,7 @@ context(
      navigateTo(navigation.proposals);
      cy.reload();
      waitForSpinner();
-      cy.get(openProposals, { timeout: 6000 }).within(() => {
+      cy.get(openProposals).within(() => {
        cy.contains(proposalTitle)
          .parentsUntil('[data-testid="proposals-list-item"]')
          .within(() => cy.get(viewProposalButton).click());
@@ -123,7 +128,7 @@ context(
        .and('be.visible');
    });

-    // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
+    // 3001-VOTE-048 3001-VOTE-049
    it('Able to fail proposal due to lack of participation', function () {
      const proposalTitle = 'Add New free form proposal with short enactment';
      const proposalTx = createFreeFormProposalTxBody();
@@ -19,7 +19,6 @@ import {
  waitForSpinner,
  navigateTo,
  navigation,
-  closeDialog,
 } from '../../support/common.functions';
 import {
  clickOnValidatorFromList,
@@ -42,6 +41,7 @@ const vegaWalletNameElement = '[data-testid="wallet-name"]';
 const vegaWallet = '[data-testid="vega-wallet"]';
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const dialogCloseButton = '[data-testid="dialog-close"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const rawProposalData = '[data-testid="proposal-data"]';
 const minVoteButton = '[data-testid="min-vote"]';
@@ -177,7 +177,7 @@ context(
        'be.visible'
      );
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      closeDialog();
+      cy.get(dialogCloseButton).click();
      waitForProposalSync();
      navigateTo(navigation.proposals);
      cy.get(rejectProposalsLink).click();
@@ -214,7 +214,7 @@ context(
      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
    });

    // 3002-PROP-009
@@ -227,12 +227,12 @@ context(
      enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
    });

    it('Unable to create a freeform proposal - when json parent section contains unexpected field', function () {
      const errorMsg =
-        'Invalid params: the transaction does not use a valid Vega command: unknown field "unexpected" in vega.commands.v1.ProposalSubmission';
+        'Invalid params: the transaction does not use a valid Vega command: unknown field unexpected" in vega.commands.v1.ProposalSubmission';

      // 3001-VOTE-038 3002-PROP-013 3002-PROP-014
      goToMakeNewProposal(governanceProposalType.RAW);
@@ -251,7 +251,7 @@ context(

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
      cy.get(rawProposalData)
        .invoke('val')
        .should('contain', "i shouldn't be here");
@@ -279,7 +279,7 @@ context(

      cy.contains('Transaction failed', proposalTimeout).should('be.visible');
      cy.get(feedbackError).should('have.text', errorMsg);
-      closeDialog();
+      cy.get(dialogCloseButton).click();
    });

    // 1005-PROP-009
@@ -313,7 +313,7 @@ context(

    it('Unable to vote on a proposal - when vega wallet disconnected - option to connect from within', function () {
      createRawProposal();
-      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="manage-vega-wallet"]').click();
      cy.get('[data-testid="disconnect"]').click();
      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
        getSubmittedProposalFromProposalList(
@@ -1,5 +1,4 @@
 import {
-  closeDialog,
  navigateTo,
  navigation,
  waitForSpinner,
@@ -40,6 +39,7 @@ const maxVoteDeadline = '[data-testid="max-vote"]';
 const minValidationDeadline = '[data-testid="min-validation"]';
 const minEnactDeadline = '[data-testid="min-enactment"]';
 const maxEnactDeadline = '[data-testid="max-enactment"]';
+const dialogCloseButton = '[data-testid="dialog-close"]';
 const inputError = '[data-testid="input-error-text"]';
 const enactmentDeadlineError =
  '[data-testid="enactment-before-voting-deadline"]';
@@ -48,7 +48,6 @@ const feedbackError = '[data-testid="Error"]';
 const viewProposalBtn = 'view-proposal-btn';
 const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
-const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
@@ -69,6 +68,7 @@ context(
  { tags: '@slow' },
  function () {
    before('connect wallets and set approval limit', function () {
+      cy.createMarket();
      cy.visit('/');
      vegaWalletSetSpecifiedApprovalAmount('1000');
    });
@@ -78,7 +78,6 @@ context(
      waitForSpinner();
      cy.connectVegaWallet();
      ethereumWalletConnect();
-      cy.createMarket();
      ensureSpecifiedUnstakedTokensAreAssociated('1');
      navigateTo(navigation.proposals);
    });
@@ -195,7 +194,7 @@ context(
        'have.text',
        'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
      );
-      closeDialog();
+      cy.get(dialogCloseButton).click();
      cy.get(minVoteDeadline).click();
      cy.get(enactmentDeadlineError).should('not.exist');
    });
@@ -218,7 +217,7 @@ context(

    it('Unable to submit new market proposal with missing/invalid fields', function () {
      const errorMsg =
-        'Invalid params: the transaction does not use a valid Vega command: unknown field "invalid" in vega.NewMarket';
+        'Invalid params: the transaction is not a valid Vega command: unknown field "filters" in vega.DataSourceDefinition';

      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
      cy.get(newProposalSubmitButton).should('be.visible').click();
@@ -287,7 +286,7 @@ context(
      );
    });

-    // 3001-VOTE-092 3004-PMAC-001
+    // 3001-VOTE-092
    it('Able to submit update market proposal and vote for proposal', function () {
      vegaWalletFaucetAssetsWithoutCheck(
        'fUSDC',
@@ -348,9 +347,8 @@ context(

    // 3001-VOTE-026 3001-VOTE-027  3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
    it('Able to submit new asset proposal using min deadlines', function () {
-      const proposalTitle = 'Test new asset proposal';
      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.get(newProposalTitle).type(proposalTitle);
+      cy.get(newProposalTitle).type('Test new asset proposal');
      cy.get(newProposalDescription).type('E2E test for proposals');
      cy.fixture('/proposals/new-asset').then((newAssetProposal) => {
        const newAssetPayload = JSON.stringify(newAssetProposal);
@@ -369,7 +367,7 @@ context(
      cy.contains('Proposal waiting for node vote', proposalTimeout).should(
        'be.visible'
      );
-      closeDialog();
+      cy.get(dialogCloseButton).click();
      cy.get(newProposalSubmitButton).should('be.visible').click();
      // cannot submit a proposal with ERC20 address already in use
      cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
@@ -379,17 +377,6 @@ context(
          'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
        );
      });
-      closeDialog();
-      navigateTo(navigation.proposals);
-      cy.contains(proposalTitle)
-        .parentsUntil(proposalListItem)
-        .within(() => {
-          cy.getByTestId(viewProposalBtn).click();
-        });
-      cy.getByTestId(proposalTermsSection).within(() => {
-        cy.contains('USDT Coin').should('be.visible');
-        cy.contains('USDT').should('be.visible');
-      });
    });

    it('Unable to submit new asset proposal with missing/invalid fields', function () {
@@ -428,12 +415,6 @@ context(
      getProposalInformationFromTable('Proposed enactment') // 3001-VOTE-044
        .invoke('text')
        .should('not.be.empty');
-      // 3001-VOTE-030 3001-VOTE-031
-      cy.getByTestId(proposalTermsSection).within(() => {
-        cy.contains('UpdateAsset').should('be.visible');
-        cy.contains('UpdateERC20').should('be.visible');
-        cy.contains('"lifetimeLimit": "10"').should('be.visible');
-      });
    });

    it('Able to submit update asset proposal using max deadline', function () {
@@ -12,6 +12,7 @@ import {
  generateFreeFormProposalTitle,
  getProposalIdFromList,
  getProposalInformationFromTable,
+  getSortOrderOfSuppliedArray,
  getSubmittedProposalFromProposalList,
  goToMakeNewProposal,
  governanceProposalType,
@@ -23,9 +24,9 @@ import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/stakin
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';

+const proposalDetailsTitle = '[data-testid="proposal-title"]';
 const openProposals = '[data-testid="open-proposals"]';
 const voteStatus = '[data-testid="vote-status"]';
-const proposalClosingDate = '[data-testid="vote-details"]';
 const viewProposalButton = '[data-testid="view-proposal-btn"]';

 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
@@ -44,8 +45,16 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
  });

  it('Newly created proposals list - proposals closest to closing date appear higher in list', function () {
+    const minCloseDays = 2;
+    const maxCloseDays = 3;
+
    // 3001-VOTE-005
-    const proposalDays = [364, 50, 2];
+    const proposalDays = [
+      minCloseDays + 1,
+      maxCloseDays,
+      minCloseDays + 3,
+      minCloseDays + 2,
+    ];
    for (let index = 0; index < proposalDays.length; index++) {
      goToMakeNewProposal(governanceProposalType.RAW);
      enterRawProposalBody(
@@ -55,12 +64,19 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
      waitForProposalSync();
    }

+    const arrayOfProposals: string[] = [];
+
    navigateTo(navigation.proposals);
-    cy.get(openProposals).within(() => {
-      cy.get(proposalClosingDate).first().should('contain.text', 'year');
-      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate).last().should('contain.text', 'days');
-    });
+    cy.get(proposalDetailsTitle)
+      .each((proposalTitleElement) => {
+        arrayOfProposals.push(proposalTitleElement.text());
+      })
+      .then(() => {
+        cy.wrap(getSortOrderOfSuppliedArray(arrayOfProposals)).should(
+          'equal',
+          'descending'
+        );
+      });
  });

  it('Newly created proposals list - able to filter by proposerID to show it in list', function () {
@@ -25,37 +25,31 @@ import {
  vegaWalletSetSpecifiedApprovalAmount,
  vegaWalletTeardown,
 } from '../../support/wallet-teardown.functions';
-const stakeValidatorListTotalStake = 'total-stake';
-const stakeValidatorListTotalShare = 'total-stake-share';
-const stakeValidatorListStakePercentage = 'stake-percentage';
-const userStakeBtn = 'my-stake-btn';
-const userStake = 'user-stake';
-const userStakeShare = 'user-stake-share';
-const viewAllValidatorsToggle = 'validators-view-toggle-all';
-const viewStakedByMeToggle = 'validators-view-toggle-myStake';
-const stakeRemoveStakeRadioButton = 'remove-stake-radio';
-const stakeTokenAmountInputBox = 'token-amount-input';
-const stakeTokenSubmitButton = 'token-input-submit-button';
-const stakeAddStakeRadioButton = 'add-stake-radio';
-const stakeMaximumTokens = 'token-amount-use-maximum';
-const vegaWalletAssociatedBalance = 'currency-value';
-const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
-const ethWallet = 'ethereum-wallet';
-const vegaWallet = 'vega-wallet';
+const stakeValidatorListTotalStake = '[col-id="stake"] > div > span';
+const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
+const stakeValidatorListValidatorStake = '[col-id="stake"] > div > span';
+const stakeRemoveStakeRadioButton = '[data-testid="remove-stake-radio"]';
+const stakeTokenAmountInputBox = '[data-testid="token-amount-input"]';
+const stakeTokenSubmitButton = '[data-testid="token-input-submit-button"]';
+const stakeAddStakeRadioButton = '[data-testid="add-stake-radio"]';
+const stakeMaximumTokens = '[data-testid="token-amount-use-maximum"]';
+const totalStake = '[data-testid="total-stake"]';
+const stakeShare = '[data-testid="stake-percentage"]';
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
+const vegaWalletStakedBalances =
+  '[data-testid="vega-wallet-balance-staked-validators"]';
+const ethWalletContainer = '[data-testid="ethereum-wallet"]';
+const vegaWallet = '[data-testid="vega-wallet"]';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');

-const getEthereumWallet = () => cy.get(`[data-testid="${ethWallet}"]:visible`);
-const getVegaWallet = () => cy.get(`[data-testid="${vegaWallet}"]:visible`);
-
 context(
  'Staking Tab - with eth and vega wallets connected',
  { tags: '@slow' },
  function () {
    // 2001-STKE-002, 2001-STKE-032
    before('visit staking tab and connect vega wallet', function () {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      ethereumWalletConnect();
      // this is a workaround for #2422 which can be removed once issue is resolved
@@ -97,39 +91,6 @@ context(
        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
      });

-      it('Able to view validators staked by me', function () {
-        ensureSpecifiedUnstakedTokensAreAssociated('4');
-        cy.get('button').contains('Select a validator to nominate').click();
-        clickOnValidatorFromList(0);
-        stakingValidatorPageAddStake('2');
-        closeStakingDialog();
-        navigateTo(navigation.validators);
-        cy.getByTestId(userStake, epochTimeout)
-          .first()
-          .should('have.text', '2.00');
-        cy.getByTestId('total-stake').first().realHover();
-        cy.getByTestId('staked-by-user-tooltip')
-          .first()
-          .should('have.text', 'Staked by me: 2.00');
-        cy.getByTestId('total-pending-stake').first().realHover();
-        cy.getByTestId('pending-user-stake-tooltip')
-          .first()
-          .should('have.text', 'My pending stake: 0.00');
-        cy.getByTestId(userStakeShare).invoke('text').should('not.be.empty'); // Adjust when #3286 is resolved
-        cy.getByTestId(userStakeBtn).should('exist').click();
-        verifyThisEpochValue(2.0);
-        navigateTo(navigation.validators);
-        cy.getByTestId(viewStakedByMeToggle).click();
-        cy.getByTestId(userStakeBtn).should('have.length', 1);
-        cy.getByTestId(viewAllValidatorsToggle).click();
-        clickOnValidatorFromList(1);
-        stakingValidatorPageAddStake('2');
-        closeStakingDialog();
-        navigateTo(navigation.validators);
-        cy.getByTestId(viewStakedByMeToggle).click();
-        cy.getByTestId(userStakeBtn).should('have.length', 2);
-      });
-
      it('Able to stake against a validator - using vega from vesting contract', function () {
        stakingPageAssociateTokens('3', { type: 'contract' });
        verifyUnstakedBalance(3.0);
@@ -148,13 +109,14 @@ context(
      });

      it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
-        vegaWalletTeardown();
        stakingPageAssociateTokens('3', { type: 'contract' });
        navigateTo(navigation.validators);
        stakingPageAssociateTokens('4', { type: 'wallet' });
        verifyUnstakedBalance(7.0);
        verifyEthWalletTotalAssociatedBalance('3.0');
        verifyEthWalletTotalAssociatedBalance('4.0');
+        verifyEthWalletTotalAssociatedBalance('3.0');
+        verifyEthWalletTotalAssociatedBalance('4.0');
        cy.get('button').contains('Select a validator to nominate').click();
        clickOnValidatorFromList(0);
        stakingValidatorPageAddStake('6');
@@ -174,7 +136,7 @@ context(
        clickOnValidatorFromList(0);
        stakingValidatorPageAddStake('2');
        verifyUnstakedBalance(3.0);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
+        cy.get(vegaWalletStakedBalances, txTimeout)
          .parent()
          .should('contain', 2.0, txTimeout);
        closeStakingDialog();
@@ -182,44 +144,40 @@ context(
        clickOnValidatorFromList(1);
        stakingValidatorPageAddStake('1');
        verifyUnstakedBalance(2.0);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
+        cy.get(vegaWalletStakedBalances, txTimeout)
          .should('have.length', 4, txTimeout)
          .eq(0)
          .should('contain', 2.0, txTimeout);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout)
+        cy.get(vegaWalletStakedBalances, txTimeout)
          .eq(1)
          .should('contain', 1.0, txTimeout);
        closeStakingDialog();
        navigateTo(navigation.validators);
-        cy.get(`[row-id="${0}"]`)
-          .eq(1)
-          .within(() => {
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .should('have.text', '2.00')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '66.67%')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '2.00')
-              .and('be.visible');
-          });
-        cy.get(`[row-id="${1}"]`)
-          .eq(1)
-          .within(() => {
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '1.00')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '33.33%')
-              .and('be.visible');
-            cy.getByTestId(stakeValidatorListTotalStake)
-              .scrollIntoView()
-              .should('have.text', '1.00')
-              .and('be.visible');
-          });
+        cy.get(`[row-id="${0}"]`).within(() => {
+          cy.get(stakeValidatorListTotalStake)
+            .should('have.text', '2.00')
+            .and('be.visible');
+          cy.get(stakeValidatorListTotalShare)
+            .should('have.text', '66.67%')
+            .and('be.visible');
+          cy.get(stakeValidatorListValidatorStake)
+            .scrollIntoView()
+            .should('have.text', '2.00')
+            .and('be.visible');
+        });
+        cy.get(`[row-id="${1}"]`).within(() => {
+          cy.get(stakeValidatorListTotalStake)
+            .scrollIntoView()
+            .should('have.text', '1.00')
+            .and('be.visible');
+          cy.get(stakeValidatorListTotalShare)
+            .should('have.text', '33.33%')
+            .and('be.visible');
+          cy.get(stakeValidatorListValidatorStake)
+            .scrollIntoView()
+            .should('have.text', '1.00')
+            .and('be.visible');
+        });
      });

      // 2001-STKE-041
@@ -245,15 +203,9 @@ context(
          verifyStakedBalance(2.0);
          verifyNextEpochValue(2.0);
          verifyThisEpochValue(2.0);
-          cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
-            'contain.text',
-            '2'
-          );
+          cy.get(totalStake, epochTimeout).should('contain.text', '2');
          waitForBeginningOfEpoch();
-          cy.getByTestId(stakeValidatorListStakePercentage).should(
-            'have.text',
-            '100%'
-          );
+          cy.get(stakeShare).should('have.text', '100%');
          navigateTo(navigation.validators);
          validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
        }
@@ -275,16 +227,12 @@ context(
        verifyUnstakedBalance(3.0);
        verifyNextEpochValue(0.0);
        verifyThisEpochValue(0.0);
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
          'not.exist',
          txTimeout
        );
        navigateTo(navigation.validators);
        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
-
-        cy.getByTestId(userStakeBtn).should('not.exist');
-        cy.getByTestId(userStake).should('not.exist');
-        cy.getByTestId(userStakeShare).should('not.exist');
      });

      it('Unable to remove a stake with a negative value for a validator', function () {
@@ -298,10 +246,10 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton, txTimeout).click();
-        cy.getByTestId(stakeTokenAmountInputBox).type('-0.1');
+        cy.get(stakeRemoveStakeRadioButton, txTimeout).click();
+        cy.get(stakeTokenAmountInputBox).type('-0.1');
        cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.getByTestId(stakeTokenSubmitButton)
+        cy.get(stakeTokenSubmitButton)
          .should('be.disabled', epochTimeout)
          .and('contain', `Remove -0.1 $VEGA tokens at the end of epoch`)
          .and('be.visible');
@@ -318,10 +266,10 @@ context(
        closeStakingDialog();
        navigateTo(navigation.validators);
        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeRemoveStakeRadioButton).click();
-        cy.getByTestId(stakeTokenAmountInputBox).type('4');
+        cy.get(stakeRemoveStakeRadioButton).click();
+        cy.get(stakeTokenAmountInputBox).type('4');
        cy.contains('Waiting for next epoch to start', epochTimeout);
-        cy.getByTestId(stakeTokenSubmitButton)
+        cy.get(stakeTokenSubmitButton)
          .should('be.disabled', epochTimeout)
          .and('contain', `Remove 4 $VEGA tokens at the end of epoch`)
          .and('be.visible');
@@ -337,17 +285,17 @@ context(
        verifyStakedBalance(2.0);
        closeStakingDialog();
        stakingPageDisassociateAllTokens();
-        getEthereumWallet().within(() => {
+        cy.get(ethWalletContainer).within(() => {
          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
        });
        verifyEthWalletTotalAssociatedBalance('0.0');
-        getVegaWallet().within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '0.00'
          );
        });
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
          'not.exist',
          txTimeout
        );
@@ -365,17 +313,17 @@ context(
        verifyStakedBalance(2.0);
        closeStakingDialog();
        stakingPageDisassociateAllTokens('contract');
-        getEthereumWallet().within(() => {
+        cy.get(ethWalletContainer).within(() => {
          cy.contains(vegaWalletPublicKeyShort, txTimeout).should('not.exist');
        });
        verifyEthWalletTotalAssociatedBalance('0.0');
-        getVegaWallet().within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '0.00'
          );
        });
-        cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+        cy.get(vegaWalletStakedBalances, txTimeout).should(
          'not.exist',
          txTimeout
        );
@@ -394,8 +342,8 @@ context(
        closeStakingDialog();
        stakingPageDisassociateTokens('1');
        verifyEthWalletTotalAssociatedBalance('2.0');
-        getVegaWallet().within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '2.00'
          );
@@ -461,8 +409,8 @@ context(
        verifyUnstakedBalance(0.0);
        closeStakingDialog();
        stakingPageAssociateTokens('6');
-        getVegaWallet().within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
            'contain',
            '12.00'
          );
@@ -481,12 +429,9 @@ context(
        verifyUnstakedBalance(1.0);
        closeStakingDialog();
        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeAddStakeRadioButton).click();
-        cy.getByTestId(stakeMaximumTokens, { timeout: 60000 }).click();
-        cy.getByTestId(stakeTokenSubmitButton).should(
-          'contain',
-          'Add 1 $VEGA tokens'
-        );
+        cy.get(stakeAddStakeRadioButton).click();
+        cy.get(stakeMaximumTokens, { timeout: 60000 }).click();
+        cy.get(stakeTokenSubmitButton).should('contain', 'Add 1 $VEGA tokens');
      });

      afterEach('Teardown Wallet', function () {
@@ -25,11 +25,11 @@ const vegaWalletUnstakedBalance =
  '[data-testid="vega-wallet-balance-unstaked"]';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
-const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
+const ethWalletAssociateButton = '[data-testid="associate-btn"]';
 const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
-const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
+const ethWalletDissociateButton = '[href="/token/disassociate"]';
 const vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
 const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
 const connectedVegaKey = '[data-testid="connected-vega-key"]';
@@ -78,12 +78,12 @@ context(

        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);

        // 0005-ETXN-002
        verifyEthWalletAssociatedBalance('2.0');
@@ -111,12 +111,12 @@ context(
        stakingPageDisassociateTokens('2');
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
          'not.exist'
        );
@@ -183,7 +183,6 @@ context(
        // 1004-ASSO-018
        // 1004-ASSO-024
        // 1004-ASSO-023
-        // 1004-ASSO-032

        stakingPageAssociateTokens('2', {
          type: 'contract',
@@ -192,12 +191,12 @@ context(

        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        verifyEthWalletAssociatedBalance('2.0');
        verifyEthWalletTotalAssociatedBalance('2.0');
        cy.get(vegaWallet).within(() => {
@@ -210,12 +209,12 @@ context(
        });
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '1.00');
        validateWalletCurrency('Total associated after pending', '1.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        verifyEthWalletAssociatedBalance('1.0');
        verifyEthWalletTotalAssociatedBalance('1.0');
      });
@@ -266,7 +265,7 @@ context(
        // 1004-ASSO-008
        // 1004-ASSO-010
        // No warning visible as described in AC, but the button is disabled
-        cy.get(ethWalletAssociateButton).click();
+        cy.get(ethWalletAssociateButton).first().click();
        cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
        cy.get(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
        cy.get(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
@@ -278,12 +277,12 @@ context(
        vegaWalletAssociate('2');
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '0.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '2.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        validateWalletCurrency('Associated', '2.00');
      });

@@ -294,24 +293,24 @@ context(
        });
        cy.getByTestId('currency-title', txTimeout).should(
          'have.length.above',
-          6
+          3
        );
        validateWalletCurrency('Associated', '2.00');
        validateWalletCurrency('Pending association', '2.00');
        validateWalletCurrency('Total associated after pending', '0.00');
-        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 3);
        validateWalletCurrency('Associated', '0.00');
      });

      it('Able to associate tokens to different public key of connected vega wallet', function () {
-        cy.get(ethWalletAssociateButton).click();
+        cy.get(ethWalletAssociateButton).first().click();
        cy.get(associateWalletRadioButton).click();
        cy.get(connectedVegaKey).should(
          'have.text',
          Cypress.env('vegaWalletPublicKey')
        );

-        cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+        cy.get('[data-testid="manage-vega-wallet"]').click();
        cy.get('[data-testid="select-keypair-button"]').eq(0).click();
        cy.get(connectedVegaKey).should(
          'have.text',
@@ -6,205 +6,159 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    cy.get('nav', { timeout: 10000 }).should('be.visible');
  });

-  describe('Links and buttons', function () {
-    it('should have link for proposal page', function () {
-      cy.getByTestId('home-proposals').within(() => {
-        cy.get('[href="/proposals"]')
-          .should('exist')
-          .and('have.text', 'Browse, vote, and propose');
+  describe('with wallets disconnected', function () {
+    describe('Links and buttons', function () {
+      it('should have link for proposal page', function () {
+        cy.getByTestId('home-proposals').within(() => {
+          cy.get('[href="/proposals"]')
+            .should('exist')
+            .and('have.text', 'Browse, vote, and propose');
+        });
      });
-    });
-
-    it('should display announcement banner', function () {
-      cy.getByTestId('app-announcement')
-        .should('contain.text', 'TEST ANNOUNCEMENT!')
-        .within(() => {
+      it('should show open or enacted proposals with proposal summary', function () {
+        cy.get('body').then(($body) => {
+          if (!$body.find('[data-testid="proposals-list-item"]').length) {
+            cy.createMarket();
+            cy.reload();
+            waitForSpinner();
+          }
+        });
+        cy.getByTestId('proposals-list-item')
+          .should('have.length.at.least', 1)
+          .first()
+          .within(() => {
+            cy.getByTestId('proposal-title')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-type')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-description')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-details')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('proposal-status')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('vote-details')
+              .invoke('text')
+              .should('not.be.empty');
+            cy.getByTestId('view-proposal-btn').should('be.visible');
+          });
+      });
+      it('should have external link for governance', function () {
+        cy.getByTestId('home-proposals').within(() => {
          cy.getByTestId('external-link')
-            .should('have.attr', 'href', 'https://fairground.wtf')
-            .and('have.text', 'CLICK LINK');
+            .should('have.attr', 'href')
+            .and('contain', 'https://vega.xyz/governance');
        });
-      cy.getByTestId('app-announcement-close').should('be.visible').click();
-      cy.getByTestId('app-announcement').should('not.exist');
-    });
-
-    it('should show open or enacted proposals with proposal summary', function () {
-      cy.get('body').then(($body) => {
-        if (!$body.find('[data-testid="proposals-list-item"]').length) {
-          cy.createMarket();
-          cy.reload();
-          waitForSpinner();
-        }
      });
-      cy.getByTestId('proposals-list-item')
-        .should('have.length.at.least', 1)
-        .first()
-        .within(() => {
-          cy.getByTestId('proposal-title')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('proposal-type').invoke('text').should('not.be.empty');
-          cy.getByTestId('proposal-description')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('proposal-details')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('proposal-status')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('vote-details').invoke('text').should('not.be.empty');
-          cy.getByTestId('view-proposal-btn').should('be.visible');
-        });
-    });
-
-    it('should have external link for governance', function () {
-      cy.getByTestId('home-proposals').within(() => {
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and('contain', 'https://vega.xyz/governance');
-      });
-    });
-
-    it('should have link for validator page', function () {
-      cy.getByTestId('home-validators').within(() => {
-        cy.get('[href="/validators"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'Browse, and stake');
-      });
-    });
-
-    it('should have external link for validators', function () {
-      cy.getByTestId('home-validators').within(() => {
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and(
-            'contain',
-            'https://community.vega.xyz/c/mainnet-validator-candidates'
-          );
-      });
-    });
-
-    it('should have information on active nodes', function () {
-      cy.getByTestId('node-information')
-        .first()
-        .should('contain.text', '2')
-        .and('contain.text', 'active nodes');
-    });
-
-    it('should have information on consensus nodes', function () {
-      cy.getByTestId('node-information')
-        .last()
-        .should('contain.text', '2')
-        .and('contain.text', 'consensus nodes');
-    });
-
-    it('should contain link to specific validators', function () {
-      cy.getByTestId('validators')
-        .should('have.length', '2')
-        .each(($validator) => {
-          cy.wrap($validator).find('a').should('have.attr', 'href');
-        });
-    });
-
-    it('should have link for rewards page', function () {
-      cy.getByTestId('home-rewards').within(() => {
-        cy.get('[href="/rewards"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'See rewards');
-      });
-    });
-
-    it('should have link for withdrawal page', function () {
-      cy.getByTestId('home-vega-token').within(() => {
-        cy.get('[href="/token/withdraw"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'Manage tokens');
-      });
-    });
-
-    it('should display network data', function () {
-      cy.getByTestId('git-network-data')
-        .should('contain.text', 'Reading network data from')
-        .within(() => {
-          cy.get('span')
+      it('should have link for validator page', function () {
+        cy.getByTestId('home-validators').within(() => {
+          cy.get('[href="/validators"]')
            .first()
-            .should('have.text', 'http://localhost:3028/query');
-          cy.getByTestId('link').should('exist');
+            .should('exist')
+            .and('have.text', 'Browse, and stake');
        });
-    });
-
-    it('should display eth data', function () {
-      cy.getByTestId('git-eth-data')
-        .should('contain.text', 'Reading Ethereum data from')
-        .within(() => {
-          cy.get('span').should('have.text', 'http://localhost:8545');
+      });
+      it('should have external link for validators', function () {
+        cy.getByTestId('home-validators').within(() => {
+          cy.getByTestId('external-link')
+            .should('have.attr', 'href')
+            .and(
+              'contain',
+              'https://community.vega.xyz/c/mainnet-validator-candidates'
+            );
        });
-    });
-
-    it('should contain link for known issues on Github', function () {
-      cy.getByTestId('git-info').within(() => {
-        cy.contains('Known issues and feedback on')
-          .find('[data-testid="link"]')
-          .should(
-            'have.attr',
-            'href',
-            'https://github.com/vegaprotocol/feedback/discussions'
-          );
      });
-    });
-  });
-
-  describe('Mobile view - navigation bar', function () {
-    before('Change to mobile resolution', function () {
-      cy.viewport('iphone-xr');
-    });
-
-    it('should have burger button', () => {
-      cy.getByTestId('button-menu-drawer').should('be.visible').click();
-      cy.getByTestId('menu-drawer').should('be.visible');
-    });
-
-    it('should have link for proposal page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/proposals"]')
-          .should('exist')
-          .and('have.text', 'Proposals');
-      });
-    });
-    it('should have link for validator page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/validators"]')
+      it('should have information on active nodes', function () {
+        cy.getByTestId('node-information')
          .first()
-          .should('exist')
-          .and('have.text', 'Validators');
+          .should('contain.text', '2')
+          .and('contain.text', 'active nodes');
+      });
+      it('should have information on consensus nodes', function () {
+        cy.getByTestId('node-information')
+          .last()
+          .should('contain.text', '2')
+          .and('contain.text', 'consensus nodes');
+      });
+      it('should contain link to specific validators', function () {
+        cy.getByTestId('validators')
+          .should('have.length', '2')
+          .each(($validator) => {
+            cy.wrap($validator).find('a').should('have.attr', 'href');
+          });
+      });
+      it('should have link for rewards page', function () {
+        cy.getByTestId('home-rewards').within(() => {
+          cy.get('[href="/rewards"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'See rewards');
+        });
+      });
+      it('should have link for withdrawal page', function () {
+        cy.getByTestId('home-vega-token').within(() => {
+          cy.get('[href="/token/withdraw"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Manage tokens');
+        });
      });
    });

-    it('should have link for rewards page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/rewards"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'Rewards');
+    describe('Mobile view - navigation bar', function () {
+      before('Change to mobile resolution', function () {
+        cy.viewport('iphone-xr');
      });
-    });
-    it('should have link for withdrawal page', function () {
-      cy.getByTestId('menu-drawer').within(() => {
-        cy.get('[href="/token/withdraw"]')
-          .first()
-          .should('exist')
-          .and('have.text', 'Withdraw');
-      });
-    });

-    after(function () {
-      cy.viewport(
-        Cypress.config('viewportWidth'),
-        Cypress.config('viewportHeight')
-      );
+      it('should have burger button', () => {
+        cy.getByTestId('button-menu-drawer').should('be.visible').click();
+        cy.getByTestId('menu-drawer').should('be.visible');
+      });
+
+      it('should have link for proposal page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/proposals"]')
+            .should('exist')
+            .and('have.text', 'Proposals');
+        });
+      });
+      it('should have link for validator page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/validators"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Validators');
+        });
+      });
+
+      it('should have link for rewards page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/rewards"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Rewards');
+        });
+      });
+      it('should have link for withdrawal page', function () {
+        cy.getByTestId('menu-drawer').within(() => {
+          cy.get('[href="/token/withdraw"]')
+            .first()
+            .should('exist')
+            .and('have.text', 'Withdraw');
+        });
+      });
+
+      after(function () {
+        cy.viewport(
+          Cypress.config('viewportWidth'),
+          Cypress.config('viewportHeight')
+        );
+      });
    });
  });
 });
@@ -3,14 +3,11 @@ import {
  navigation,
  verifyPageHeader,
  verifyTabHighlighted,
+  waitForSpinner,
 } from '../../support/common.functions';
-import {
-  goToMakeNewProposal,
-  governanceProposalType,
-} from '../../support/governance.functions';
-import { mockNetworkUpgradeProposal } from '../../support/proposal.functions';

 const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
+const newProposalButton = '[data-testid="new-proposal-link"]';
 const newProposalLink = '[data-testid="new-proposal-link"]';
 const governanceDocsUrl = 'https://vega.xyz/governance';
 const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
@@ -24,140 +21,56 @@ context(
      navigateTo(navigation.proposals);
    });

-    it('should have governance tab highlighted', function () {
-      verifyTabHighlighted(navigation.proposals);
-    });
-
-    it('should have GOVERNANCE header visible', function () {
-      verifyPageHeader('Proposals');
-    });
-
-    it('should be able to see a working link for - find out more about Vega governance', function () {
-      // 3001-VOTE-001
-      cy.get(proposalDocumentationLink)
-        .should('be.visible')
-        .and('have.text', 'Find out more about Vega governance')
-        .and('have.attr', 'href')
-        .and('equal', governanceDocsUrl);
-
-      // 3002-PROP-001
-      cy.request(governanceDocsUrl)
-        .its('body')
-        .then((body) => {
-          if (!body.includes('Govern the network')) {
-            assert.include(
-              body,
-              'Govern the network',
-              `Checking that governance link destination includes 'Govern the network' text`
-            );
-          }
-        });
-    });
-
-    it('should be able to see button for - new proposal', function () {
-      // 3001-VOTE-002
-      cy.get(newProposalLink)
-        .should('be.visible')
-        .and('have.text', 'New proposal')
-        .and('have.attr', 'href')
-        .and('equal', '/proposals/propose');
-    });
-
-    it('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
-      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.get(connectToVegaWalletButton)
-        .should('be.visible')
-        .and('have.text', 'Connect Vega wallet');
-    });
-
-    it('should see open network upgrade proposal on homepage', function () {
-      mockNetworkUpgradeProposal();
-      cy.visit('/');
-      cy.getByTestId('home-proposal-list').within(() => {
-        cy.getByTestId('protocol-upgrade-proposals-list-item').should('exist');
-        cy.getByTestId('protocol-upgrade-proposal-title').should(
-          'have.text',
-          'Vega release v1'
-        );
+    describe('with no network change proposals', function () {
+      it('should have governance tab highlighted', function () {
+        verifyTabHighlighted(navigation.proposals);
      });
-    });

-    it('should see network upgrade proposals in proposals list', function () {
-      mockNetworkUpgradeProposal();
-      navigateTo(navigation.proposals);
-      cy.getByTestId('open-proposals').within(() => {
-        cy.get('li')
-          .eq(0)
-          .should(
-            'have.attr',
-            'data-testid',
-            'protocol-upgrade-proposals-list-item'
-          )
-          .within(() => {
-            cy.get('h2').should('have.text', 'Vega release v1');
-            cy.getByTestId('protocol-upgrade-proposal-type').should(
-              'have.text',
-              'Network Upgrade'
-            );
-            cy.getByTestId('protocol-upgrade-proposal-release-tag').should(
-              'have.text',
-              'Vega release tagv1'
-            );
-            cy.getByTestId('protocol-upgrade-proposal-block-height').should(
-              'have.text',
-              'Upgrade block height2015942'
-            );
-            cy.getByTestId('protocol-upgrade-proposal-status').should(
-              'have.text',
-              'Approved'
-            );
+      it('should have GOVERNANCE header visible', function () {
+        verifyPageHeader('Proposals');
+      });
+
+      it('should be able to see a working link for - find out more about Vega governance', function () {
+        // 3001-VOTE-001
+        cy.get(proposalDocumentationLink)
+          .should('be.visible')
+          .and('have.text', 'Find out more about Vega governance')
+          .and('have.attr', 'href')
+          .and('equal', governanceDocsUrl);
+
+        // 3002-PROP-001
+        cy.request(governanceDocsUrl)
+          .its('body')
+          .then((body) => {
+            if (!body.includes('Govern the network')) {
+              assert.include(
+                body,
+                'Govern the network',
+                `Checking that governance link destination includes 'Govern the network' text`
+              );
+            }
          });
      });
-      cy.getByTestId('closed-proposals').within(() => {
-        cy.getByTestId('protocol-upgrade-proposals-list-item').should(
-          'have.length',
-          1
-        );
-      });
-    });

-    it('should see details of network upgrade proposal', function () {
-      mockNetworkUpgradeProposal();
-      navigateTo(navigation.proposals);
-      cy.getByTestId('protocol-upgrade-proposals-list-item')
-        .first()
-        .find('[data-testid="view-proposal-btn"]')
-        .click();
-      cy.getByTestId('protocol-upgrade-proposal').within(() => {
-        cy.get('h1').should('have.text', 'Vega Release v1');
-        cy.getByTestId('protocol-upgrade-block-height').should(
-          'have.text',
-          '2015942 (currently 2014133)'
-        );
-        cy.getByTestId('protocol-upgrade-state').should(
-          'have.text',
-          'Approved'
-        );
-        cy.getByTestId('protocol-upgrade-release-tag').should(
-          'have.text',
-          'v1'
-        );
-        cy.getByTestId('protocol-upgrade-approval-status')
-          .should('contain.text', '99.98% approval (% validator voting power)')
-          .and('contain.text', '(67% voting power required)');
-        cy.get('h2').should('contain.text', 'Approvers (4/4 validators)');
-        cy.getByTestId('validator-name')
-          .should('have.length', 4)
-          .each(($validator) => {
-            cy.wrap($validator).find('a').should('have.attr', 'href');
-          });
-        cy.getByTestId('validator-voting-power').each(
-          ($validatorVotingPower) => {
-            cy.wrap($validatorVotingPower)
-              .invoke('text')
-              .should('contain', '%');
-          }
-        );
+      it('should be able to see button for - new proposal', function () {
+        // 3001-VOTE-002
+        cy.get(newProposalLink)
+          .should('be.visible')
+          .and('have.text', 'New proposal')
+          .and('have.attr', 'href')
+          .and('equal', '/proposals/propose');
+      });
+
+      // Skipping this test for now, the new proposal button no longer takes a user directly
+      // to a proposal form, instead it takes them to a page where they can select a proposal type.
+      // Keeping this test here for now as it can be repurposed to test the new proposal forms.
+      it.skip('should be able to see a connect wallet button - if vega wallet disconnected and new proposal button selected', function () {
+        cy.get(newProposalButton).should('be.visible').click();
+        cy.get(connectToVegaWalletButton)
+          .should('be.visible')
+          .and('have.text', 'Connect Vega wallet');
+        navigateTo(navigation.proposals);
+        waitForSpinner();
      });
    });
  }
@@ -26,31 +26,29 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
    cy.connectPublicKey(vegaWalletPubKey);
  });

-  it('Able to connect public key using url', function () {
-    cy.getByTestId('exit-view').click();
-    cy.visit(`/?address=${vegaWalletPubKey}`);
-    verifyConnectedToPubKey();
-  });
-
-  it('Able to connect public key via wallet and view assets in wallet', function () {
+  it('Able to connect public key via wallet', function () {
    verifyConnectedToPubKey();
    cy.getByTestId('currency-title', { timeout: 10000 })
      .should('have.length.at.least', 4)
      .and('contain.text', 'USDC (fake)');
  });

+  it('Able to connect public key using url', function () {
+    cy.getByTestId('exit-view').click();
+    cy.visit(`/?address=${vegaWalletPubKey}`);
+    verifyConnectedToPubKey();
+  });
+
  it('Unable to submit proposal with public key', function () {
    const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;

    navigateTo(navigation.proposals);
    goToMakeNewProposal('Freeform');
    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
-    cy.getByTestId('dialog-content')
-      .first()
-      .within(() => {
-        cy.get('h1').should('have.text', 'Transaction failed');
-        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
-      });
+    cy.getByTestId('dialog-content').within(() => {
+      cy.get('h1').should('have.text', 'Transaction failed');
+      cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+    });
  });

  it('Able to disconnect via banner', function () {
@@ -3,7 +3,6 @@ import {
  navigation,
  verifyPageHeader,
 } from '../../support/common.functions';
-import { waitForBeginningOfEpoch } from '../../support/staking.functions';

 const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
 const warning = '[data-testid="callout"]';
@@ -38,41 +37,6 @@ context(
      it('should have toggle for seeing total vs individual rewards', function () {
        cy.get(viewToggle).should('be.visible');
      });
-
-      // Skipping due to bug #3471 causing flaky failuress
-      it.skip('should have option to view go to next and previous page', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('page-info')
-          .should('contain.text', 'Page ')
-          .invoke('text')
-          .then(($currentPage) => {
-            const currentPageNumber = Number($currentPage.slice(5));
-            cy.getByTestId('goto-next-page').click();
-            cy.getByTestId('page-info')
-              .invoke('text')
-              .then(($newPageNumber) => {
-                const newPageNumber = Number($newPageNumber.slice(5));
-                expect(newPageNumber).to.be.greaterThan(currentPageNumber);
-                cy.getByTestId('goto-previous-page').click();
-                cy.getByTestId('page-info').should(
-                  'contain.text',
-                  $currentPage
-                );
-              });
-          });
-      });
-
-      it('should have option to go to last and newest page', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('goto-last-page').click();
-        cy.getByTestId('epoch-total-rewards-table')
-          .last()
-          .find('h2')
-          .first()
-          .should('have.text', 'EPOCH 1');
-        cy.getByTestId('goto-first-page').click();
-        cy.get('h2').should('not.contain.text', 'EPOCH 1');
-      });
    });
  }
 );
@@ -1,6 +1,7 @@
 /// <reference types="cypress" />

 import {
+  navigateTo,
  navigation,
  verifyPageHeader,
  verifyTabHighlighted,
@@ -33,8 +34,8 @@ const stakeNumberRegex = /^\d*\.?\d*$/;

 context('Validators Page - verify elements on page', function () {
  before('navigate to validators page', function () {
-    cy.clearAllLocalStorage();
-    cy.visit('/validators');
+    cy.visit('/');
+    navigateTo(navigation.validators);
  });

  describe('with wallets disconnected', { tags: '@smoke' }, function () {
@@ -73,7 +74,7 @@ context('Validators Page - verify elements on page', function () {
        });

        it('Should be able to see validator stake', function () {
-          cy.getByTestId('total-stake')
+          cy.get('[col-id="stake"] > div > span > span')
            .should('have.length.at.least', 1)
            .each(($stake) => {
              cy.wrap($stake).should('not.be.empty');
@@ -81,7 +82,7 @@ context('Validators Page - verify elements on page', function () {
        });

        it('Should be able to see validator stake tooltip', function () {
-          cy.getByTestId('total-stake').first().realHover();
+          cy.get('[col-id="stake"] > div > span > span').first().realHover();

          cy.get(stakedByOperatorToolTip)
            .invoke('text')
@@ -95,15 +96,17 @@ context('Validators Page - verify elements on page', function () {
        });

        it('Should be able to see validator normalised voting power', function () {
-          cy.getByTestId('normalised-voting-power')
+          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
            .should('have.length.at.least', 1)
            .each(($vPower) => {
              cy.wrap($vPower).should('not.be.empty');
            });
        });

-        it('Should be able to see validator normalised voting power tooltip', function () {
-          cy.getByTestId('normalised-voting-power').first().realHover();
+        it('Should be able to see validator voting power tooltip', function () {
+          cy.get('[col-id="normalisedVotingPower"] > div > span > span')
+            .first()
+            .realHover();

          cy.get(unnormalisedVotingPowerToolTip)
            .invoke('text')
@@ -115,7 +118,7 @@ context('Validators Page - verify elements on page', function () {

        // 2002-SINC-018
        it('Should be able to see validator total penalties', function () {
-          cy.getByTestId('total-penalty')
+          cy.get('[col-id="totalPenalties"] > div > span > span')
            .should('have.length.at.least', 1)
            .each(($penalties) => {
              cy.wrap($penalties).should('contain.text', '0%');
@@ -123,7 +126,7 @@ context('Validators Page - verify elements on page', function () {
        });

        it('Should be able to see validator penalties tooltip', function () {
-          cy.getByTestId('total-penalty').realHover();
+          cy.get('[col-id="totalPenalties"] > div > span > span').realHover();

          cy.get(performancePenaltyToolTip)
            .invoke('text')
@@ -137,7 +140,7 @@ context('Validators Page - verify elements on page', function () {
        });

        it('Should be able to see validator pending stake', function () {
-          cy.getByTestId('total-pending-stake')
+          cy.get('[col-id="pendingStake"] > div > span')
            .should('have.length.at.least', 1)
            .each(($pendingStake) => {
              cy.wrap($pendingStake).should('contain.text', '0.00');
@@ -43,25 +43,23 @@ context(

      // 1005-VEST-020 1005-VEST-021
      it('Tokens in vesting contract for eth wallet is displayed on wallet window', function () {
-        cy.get('[data-testid="vega-in-vesting-contract"]:visible').within(
-          () => {
-            cy.getByTestId('currency-title')
-              .should('contain.text', 'VEGA')
-              .and('contain.text', 'In vesting contract');
-            cy.get('[data-testid="currency-value"]:visible').should(
-              'have.text',
-              lockedTokensInVestingContract
-            );
-            cy.get('[data-testid="currency-locked"]:visible').should(
-              'have.text',
-              lockedTokensInVestingContract
-            );
-            cy.get('[data-testid="currency-unlocked"]:visible').should(
-              'have.text',
-              '0.00'
-            );
-          }
-        );
+        cy.getByTestId('vega-in-vesting-contract').within(() => {
+          cy.getByTestId('currency-title')
+            .should('contain.text', 'VEGA')
+            .and('contain.text', 'In vesting contract');
+          cy.get('[data-testid="currency-value"]:visible').should(
+            'have.text',
+            lockedTokensInVestingContract
+          );
+          cy.get('[data-testid="currency-locked"]:visible').should(
+            'have.text',
+            lockedTokensInVestingContract
+          );
+          cy.get('[data-testid="currency-unlocked"]:visible').should(
+            'have.text',
+            '0.00'
+          );
+        });
      });
      // 1005-VEST-022 1005-VEST-023
      it('Tokens amount displayed in vesting page', function () {
@@ -17,7 +17,7 @@ const vegaInWallet = '[data-testid="vega-in-wallet"]:visible';
 const progressBar = '[data-testid="progress-bar"]:visible';
 const currencyLocked = '[data-testid="currency-locked"]:visible';
 const currencyUnlocked = '[data-testid="currency-unlocked"]:visible';
-const dialog = '[role="dialog"]:visible';
+const dialog = '[role="dialog"]';
 const dialogHeader = '[data-testid="dialog-title"]';
 const dialogCloseBtn = '[data-testid="dialog-close"]';

@@ -68,10 +68,8 @@ context(
      it('should have connector list visible', function () {
        const connectList = [
          'Unknown',
-          'MetaMask',
-          'Coinbase',
+          'MetaMask, Brave or other injected web wallet',
          'WalletConnect',
-          'WalletConnect Legacy',
        ];
        cy.get(connectorList).within(() => {
          cy.get('button').each(($btn, i) => {
@@ -7,7 +7,7 @@ const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectButton = '[data-testid="connect-vega-wallet"]';
 const getVegaLink = '[data-testid="link"]';
-const dialog = '[role="dialog"]:visible';
+const dialog = '[role="dialog"]';
 const dialogHeader = '[data-testid="dialog-title"]';
 const walletDialogHeader = '[data-testid="wallet-dialog-title"]';
 const connectorsList = '[data-testid="connectors-list"]';
@@ -35,7 +35,6 @@ context(
  { tags: '@regression' },
  () => {
    before('visit token home page', () => {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      cy.get(walletContainer, { timeout: 60000 }).should('be.visible');
    });
@@ -334,8 +333,10 @@ context(
                .parent()
                .siblings()
                .invoke('text')
-                .then(parseFloat)
-                .should('be.gte', parseFloat(expectedAmount));
+                .then((el) => {
+                  const value = parseFloat(el);
+                  cy.wrap(value).should('be.gte', parseFloat(expectedAmount));
+                });

              cy.get(vegaWalletCurrencyTitle)
                .contains(id)
@@ -12,7 +12,6 @@ context(
  { tags: '@smoke' },
  function () {
    before('navigate to withdrawals page', function () {
-      cy.clearAllLocalStorage();
      cy.visit('/');
      navigateTo(navigation.withdraw);
    });
@@ -26,11 +26,9 @@ const topLevelRoutes = [
 export function navigateTo(page: navigation) {
  if (!topLevelRoutes.includes(page)) {
    cy.getByTestId(tokenDropDown, { timeout: 10000 }).eq(0).click();
-    cy.getByTestId('token-dropdown')
-      .first()
-      .within(() => {
-        cy.get(page).eq(0).click();
-      });
+    cy.getByTestId('token-dropdown').within(() => {
+      cy.get(page).eq(0).click();
+    });
  } else {
    return cy.get(navigation.section, { timeout: 10000 }).within(() => {
      cy.get(page).eq(0).click();
@@ -86,7 +84,3 @@ export function verifyEthWalletAssociatedBalance(amount: string) {
    .parent(txTimeout)
    .should('contain', amount, txTimeout);
 }
-
-export function closeDialog() {
-  cy.getByTestId('dialog-close').click();
-}
@@ -1,4 +1,4 @@
-import { closeDialog, navigateTo, navigation } from './common.functions';
+import { navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';

 const newProposalButton = '[data-testid="new-proposal-link"]';
@@ -12,6 +12,7 @@ const voteButtons = '[data-testid="vote-buttons"]';
 const dialogTitle = '[data-testid="dialog-title"]';
 const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
 const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const dialogCloseButton = '[data-testid="dialog-close"]';
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };

@@ -124,7 +125,7 @@ export function voteForProposal(vote: string) {
    'have.text',
    'Transaction complete'
  );
-  closeDialog();
+  cy.get(dialogCloseButton).click();
 }

 export function waitForProposalSync() {
@@ -150,11 +151,22 @@ export function waitForProposalSync() {
  });
 }

+export function getSortOrderOfSuppliedArray(suppliedArray: string[]) {
+  const tempArray = [];
+  for (let index = 1; index < suppliedArray.length; index++) {
+    tempArray.push(
+      suppliedArray[index - 1].localeCompare(suppliedArray[index])
+    );
+  }
+  if (tempArray.every((n) => n <= 0)) return 'ascending';
+  else if (tempArray.every((n) => n >= 0)) return 'descending';
+  else return 'unsorted';
+}
+
 export function goToMakeNewProposal(proposalType: string) {
  navigateTo(navigation.proposals);
  cy.get(newProposalButton).should('be.visible').click();
  cy.url().should('include', '/proposals/propose');
-  cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
  cy.get('li').should('contain.text', proposalType).and('be.visible');
  cy.get('li').contains(proposalType).click();
 }
@@ -164,7 +176,7 @@ export function waitForProposalSubmitted() {
    'be.visible'
  );
  cy.contains('Proposal submitted', proposalTimeout).should('be.visible');
-  closeDialog();
+  cy.get(dialogCloseButton).click();
 }

 export function createRawProposal(proposerBalance?: string) {
@@ -1,9 +1,5 @@
 import { addSeconds, millisecondsToSeconds } from 'date-fns';
 import type { ProposalSubmissionBody } from '@vegaprotocol/wallet';
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import { upgradeProposalsData } from '../fixtures/mocks/network-upgrade';
-import { proposalsData } from '../fixtures/mocks/proposals';
-import { nodeData } from '../fixtures/mocks/nodes';

 export function createUpdateNetworkProposalTxBody(): ProposalSubmissionBody {
  const MIN_CLOSE_SEC = 5;
@@ -84,11 +80,3 @@ export function createFreeFormProposalTxBody(): ProposalSubmissionBody {
    },
  };
 }
-
-export function mockNetworkUpgradeProposal() {
-  cy.mockGQL((req) => {
-    aliasGQLQuery(req, 'Nodes', nodeData);
-    aliasGQLQuery(req, 'Proposals', proposalsData);
-    aliasGQLQuery(req, 'ProtocolUpgrades', upgradeProposalsData);
-  });
-}
@@ -1,4 +1,3 @@
-import { closeDialog } from './common.functions';
 import { vegaWalletTeardown } from './wallet-teardown.functions';

 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
@@ -15,10 +14,11 @@ const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const associateContractRadioButton = '[data-testid="associate-radio-contract"]';
 const stakeMaximumTokens = '[data-testid="token-amount-use-maximum"]';
 const stakeValidatorListPendingStake = '[col-id="pendingStake"]';
-const stakeValidatorListTotalStake = 'total-stake';
-const stakeValidatorListTotalShare = 'total-stake-share';
+const stakeValidatorListTotalStake = '[col-id="stake"] > div > span';
+const stakeValidatorListTotalShare = '[col-id="stakeShare"] > div > span';
 const stakeValidatorListName = '[col-id="validator"]';
 const vegaKeySelector = '#vega-key-selector';
+const dialogCloseButton = '[data-testid="dialog-close"]';

 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
@@ -54,7 +54,7 @@ export function stakingValidatorPageRemoveStake(stake: string) {
    .and('contain', `Remove ${stake} $VEGA tokens at the end of epoch`)
    .and('be.visible')
    .click();
-  closeDialog();
+  cy.get(dialogCloseButton).click();
 }

 export function stakingPageAssociateTokens(
@@ -184,18 +184,16 @@ export function validateValidatorListTotalStakeAndShare(
 ) {
  cy.contains('Loading...', epochTimeout).should('not.exist');
  waitForBeginningOfEpoch();
-  cy.get(`[row-id="${positionOnList}"]:visible`)
-    .eq(1)
-    .within(() => {
-      cy.getByTestId(stakeValidatorListTotalStake, epochTimeout).should(
-        'have.text',
-        expectedTotalStake
-      );
-      cy.getByTestId(stakeValidatorListTotalShare, epochTimeout).should(
-        'have.text',
-        expectedTotalShare
-      );
-    });
+  cy.get(`[row-id="${positionOnList}"]`).within(() => {
+    cy.get(stakeValidatorListTotalStake, epochTimeout).should(
+      'have.text',
+      expectedTotalStake
+    );
+    cy.get(stakeValidatorListTotalShare, epochTimeout).should(
+      'have.text',
+      expectedTotalShare
+    );
+  });
 }

 export function ensureSpecifiedUnstakedTokensAreAssociated(
@@ -220,15 +218,13 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }

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

 export function validateWalletCurrency(
@@ -8,8 +8,7 @@ import {
 } from '@vegaprotocol/smart-contracts';
 import { ethers, Wallet } from 'ethers';

-const associatedAmountInWallet = '[data-testid="associated-amount"]:visible';
-const vegaWalletContainer = 'aside [data-testid="vega-wallet"]:visible';
+const vegaWalletContainer = 'aside [data-testid="vega-wallet"]';
 const vegaWalletMnemonic = Cypress.env('vegaWalletMnemonic');
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -60,7 +59,7 @@ export async function faucetAsset(assetEthAddress: string) {
 }

 export async function vegaWalletTeardown() {
-  cy.get(associatedAmountInWallet)
+  cy.get('[data-testid="associated-amount"]')
    .should('be.visible')
    .invoke('text')
    .then((associatedAmount) => {
@@ -69,12 +68,15 @@ export async function vegaWalletTeardown() {
          $body.find('[data-testid="eth-wallet-associated-balances"]').length ||
          associatedAmount != '0.00'
        ) {
-          vegaWalletTeardownStaking(stakingBridgeContract);
          vegaWalletTeardownVesting(vestingContract);
+          vegaWalletTeardownStaking(stakingBridgeContract);
        }
      });
      cy.get(vegaWalletContainer).within(() => {
-        cy.get(associatedAmountInWallet, {
+        cy.getByTestId('vega-wallet-balance-staked-validators', {
+          timeout: transactionTimeout,
+        }).should('not.exist');
+        cy.getByTestId('associated-amount', {
          timeout: transactionTimeout,
        }).contains('0.00', {
          timeout: transactionTimeout,
@@ -91,7 +93,7 @@ export async function vegaWalletSetSpecifiedApprovalAmount(
  await promiseWithTimeout(
    token.approve(
      ethStakingBridgeContractAddress,
-      resetAmount + '0'.repeat(18)
+      resetAmount.concat('000000000000000000')
    ),
    10 * 60 * 1000,
    'set approval amount'
@@ -105,25 +107,13 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
    { timeout: transactionTimeout, log: false }
  ).then((stakeBalance) => {
    if (Number(stakeBalance) != 0) {
-      cy.get(vegaWalletContainer).within(() => {
-        cy.getByTestId('currency-value')
-          .invoke('text')
-          .then(($associatedAmount) => {
-            cy.wrap(
-              stakingBridgeContract.remove_stake(
-                String(stakeBalance),
-                vegaWalletPubKey
-              ),
-              { timeout: transactionTimeout, log: false }
-            );
-            cy.get("[data-testid='currency-value']")
-              .first()
-              .invoke('text', {
-                timeout: transactionTimeout,
-              })
-              .should('not.eq', $associatedAmount);
-          });
-      });
+      cy.wrap(
+        stakingBridgeContract.remove_stake(
+          String(stakeBalance),
+          vegaWalletPubKey
+        ),
+        { timeout: transactionTimeout, log: false }
+      );
    }
  });
 }
@@ -13,8 +13,6 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
-NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -5,7 +5,6 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_CONFIG_URL=''

 NX_VEGA_URL=http://localhost:3028/query
@@ -20,4 +19,3 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
-
@@ -10,4 +10,3 @@ NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -11,4 +11,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
@@ -0,0 +1,11 @@
+# App configuration variables
+NX_VEGA_ENV=MIRROR
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_URL=https://api.n00.mainnet-mirror.vega.xyz/graphql
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_VEGA_EXPLORER_URL=https://mirror.explorer.vega.xyz
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
+NX_DELEGATIONS_PAGINATION=50
@@ -0,0 +1,8 @@
+# App configuration variables
+NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
+NX_VEGA_ENV=SANDBOX
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/sandbox/vegawallet-sandbox.toml
+NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
+NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50
@@ -7,4 +7,3 @@ NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -8,4 +8,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet3-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -11,4 +11,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -8,4 +8,3 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
@@ -17,12 +17,6 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
 import { ContractsProvider } from './contexts/contracts/contracts-provider';
 import { AppRouter } from './routes';
 import type { EthereumConfig } from '@vegaprotocol/web3';
-import {
-  createConnectors,
-  useEthTransactionManager,
-  useEthWithdrawApprovalsManager,
-  useWeb3ConnectStore,
-} from '@vegaprotocol/web3';
 import { Web3Provider } from '@vegaprotocol/web3';
 import { VegaWalletDialogs } from './components/vega-wallet-dialogs';
 import { VegaWalletProvider } from '@vegaprotocol/wallet';
@@ -33,10 +27,10 @@ import {
  NetworkLoader,
  useInitializeEnv,
 } from '@vegaprotocol/environment';
-import { ENV } from './config';
+import { createConnectors } from './lib/web3-connectors';
+import { ENV } from './config/env';
 import type { InMemoryCacheConfig } from '@apollo/client';
 import { WithdrawalDialog } from '@vegaprotocol/withdraws';
-import { SplashLoader } from './components/splash-loader';

 const cache: InMemoryCacheConfig = {
  typePolicies: {
@@ -76,52 +70,20 @@ const cache: InMemoryCacheConfig = {

 const Web3Container = ({
  chainId,
+  providerUrl,
 }: {
  chainId: number;
  providerUrl: string;
 }) => {
-  const InitializeHandlers = () => {
-    useEthTransactionManager();
-    useEthWithdrawApprovalsManager();
-    return null;
-  };
-  const [connectors, initializeConnectors] = useWeb3ConnectStore((store) => [
-    store.connectors,
-    store.initialize,
-  ]);
-  const { ETHEREUM_PROVIDER_URL, ETH_LOCAL_PROVIDER_URL, ETH_WALLET_MNEMONIC } =
-    useEnvironment();
-  useEffect(() => {
-    if (chainId) {
-      return initializeConnectors(
-        createConnectors(
-          ETHEREUM_PROVIDER_URL,
-          Number(chainId),
-          ETH_LOCAL_PROVIDER_URL,
-          ETH_WALLET_MNEMONIC
-        ),
-        Number(chainId)
-      );
-    }
-  }, [
-    chainId,
-    ETHEREUM_PROVIDER_URL,
-    initializeConnectors,
-    ETH_LOCAL_PROVIDER_URL,
-    ETH_WALLET_MNEMONIC,
-  ]);
  const sideBar = React.useMemo(() => {
    return [<EthWallet />, <VegaWallet />];
  }, []);
-
-  if (connectors.length === 0) {
-    // Prevent loading when the connectors are not initialized
-    return <SplashLoader />;
-  }
-
+  const Connectors = React.useMemo(() => {
+    return createConnectors(providerUrl, Number(chainId));
+  }, [chainId, providerUrl]);
  return (
-    <Web3Provider connectors={connectors}>
-      <Web3Connector connectors={connectors} chainId={Number(chainId)}>
+    <Web3Provider connectors={Connectors}>
+      <Web3Connector connectors={Connectors} chainId={Number(chainId)}>
        <VegaWalletProvider>
          <ContractsProvider>
            <AppLoader>
@@ -135,7 +97,6 @@ const Web3Container = ({
                      <NetworkInfo />
                    </footer>
                  </AppLayout>
-                  <InitializeHandlers />
                  <VegaWalletDialogs />
                  <TransactionModal />
                  <WithdrawalDialog />
@@ -26,7 +26,6 @@ import {
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import colors from 'tailwindcss/colors';
 import { useBalances } from '../../lib/balances/balances-store';
-import { useWeb3Disconnect } from '@vegaprotocol/web3';

 const removeLeadingAddressSymbol = (key: string) => {
  if (key && key.length > 2 && key.slice(0, 2) === '0x') {
@@ -185,7 +184,6 @@ export const EthWallet = () => {
  const { appDispatch } = useAppState();
  const { account, connector } = useWeb3React();
  const pendingTxs = usePendingTransactions();
-  const disconnect = useWeb3Disconnect(connector);

  return (
    <WalletCard>
@@ -241,7 +239,7 @@ export const EthWallet = () => {
            <div className="flex justify-end">
              <button
                className="underline"
-                onClick={() => disconnect()}
+                onClick={() => connector.deactivate()}
                data-testid="disconnect-from-eth-wallet-button"
              >
                {t('disconnect')}
@@ -1,19 +1,15 @@
 import classNames from 'classnames';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import type { ReactNode } from 'react';
-import { AnnouncementBanner } from '@vegaprotocol/announcements';
-import { Nav } from '../nav';
-import { Networks, useEnvironment } from '@vegaprotocol/environment';
-import React from 'react';

 interface AppLayoutProps {
  children: ReactNode;
 }
 export const AppLayout = ({ children }: AppLayoutProps) => {
-  const { VEGA_ENV, ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
  const { isReadOnly } = useVegaWallet();
  const AppLayoutClasses = classNames(
-    'app w-full max-w-[1500px] mx-auto grid',
+    'app w-full max-w-[1500px] mx-auto grid min-h-full',
+    'border-neutral-700 lg:border-l lg:border-r',
    'lg:text-body-large',
    {
      'grid-rows-[repeat(2,min-content)_1fr_min-content]': !isReadOnly,
@@ -21,18 +17,5 @@ export const AppLayout = ({ children }: AppLayoutProps) => {
    }
  );

-  return (
-    <div className="min-h-full">
-      <div className="lg:text-body-large">
-        {ANNOUNCEMENTS_CONFIG_URL && (
-          <AnnouncementBanner
-            app="governance"
-            configUrl={ANNOUNCEMENTS_CONFIG_URL}
-          />
-        )}
-        <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
-      </div>
-      <div className={AppLayoutClasses}>{children}</div>
-    </div>
-  );
+  return <div className={AppLayoutClasses}>{children}</div>;
 };
@@ -1,16 +1,33 @@
-import { ViewingAsBanner } from '@vegaprotocol/ui-toolkit';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import {
+  ViewingAsBanner,
+  AnnouncementBanner,
+  ExternalLink,
+} from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import React from 'react';

+import { Nav } from '../nav';
+
 export interface TemplateSidebarProps {
  children: React.ReactNode;
  sidebar: React.ReactNode[];
 }

 export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
+  const { VEGA_ENV } = useEnvironment();
  const { isReadOnly, pubKey, disconnect } = useVegaWallet();
  return (
    <>
+      <AnnouncementBanner>
+        <div className="font-alpha calt uppercase text-center text-lg text-white">
+          <span className="pr-4">Wait no longer, SIM3 is here!</span>
+          <ExternalLink href="https://fairground.wtf/sim3">
+            Learn more
+          </ExternalLink>
+        </div>
+      </AnnouncementBanner>
+      <Nav theme={VEGA_ENV === Networks.TESTNET ? 'yellow' : 'dark'} />
      {isReadOnly ? (
        <ViewingAsBanner pubKey={pubKey} disconnect={disconnect} />
      ) : null}
@@ -1,10 +1,5 @@
 import { Button, Splash } from '@vegaprotocol/ui-toolkit';
-import {
-  getChainName,
-  useWeb3ConnectStore,
-  useWeb3Disconnect,
-  Web3ConnectDialog,
-} from '@vegaprotocol/web3';
+import { getChainName, Web3ConnectDialog } from '@vegaprotocol/web3';
 import { useWeb3React } from '@web3-react/core';
 import type { ReactElement } from 'react';
 import { useCallback, useEffect } from 'react';
@@ -56,9 +51,7 @@ interface Web3ContentProps {
 }

 export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
-  const { connector, chainId } = useWeb3React();
-  const error = useWeb3ConnectStore((store) => store.error);
-  const disconnect = useWeb3Disconnect(connector);
+  const { error, connector, chainId } = useWeb3React();

  useEffect(() => {
    if (connector?.connectEagerly) {
@@ -74,7 +67,7 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
      <Splash>
        <div className="flex flex-col items-center gap-12">
          <p className="text-white">Something went wrong: {error.message}</p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
        </div>
      </Splash>
    );
@@ -87,7 +80,7 @@ export const Web3Content = ({ children, appChainId }: Web3ContentProps) => {
          <p className="text-white">
            This app only works on {getChainName(appChainId)}
          </p>
-          <Button onClick={() => disconnect()}>Disconnect</Button>
+          <Button onClick={() => connector.deactivate()}>Disconnect</Button>
        </div>
      </Splash>
    );
@@ -12,7 +12,6 @@ const TRUTHY = ['1', 'true'];
 interface VegaContracts {
  claimAddress: string;
  lockedAddress: string;
-  tokenVestingAddress?: string;
 }

 const customClaimAddress = process.env['NX_CUSTOM_CLAIM_ADDRESS'] as string;
@@ -37,16 +36,21 @@ export const ContractAddresses: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
+  SANDBOX: {
+    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
+    lockedAddress: '0x0', // TODO not deployed to this env
+  },
  TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
  },
+  MIRROR: {
+    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
+    lockedAddress: '0x0', // TODO not deployed to this env
+  },
  VALIDATOR_TESTNET: {
    claimAddress: '0x8Cef746ab7C83B61F6461cC92882bD61AB65a994', // TODO not deployed to this env, but random address so app doesn't error
    lockedAddress: '0x0', // TODO not deployed to this env
-    // This is a fallback contract address for the validator testnet network which does not
-    // have a vesting contract address set and is therefore not in the ethereum config
-    tokenVestingAddress: '0xadFcb7f93a24F8743a8e548d74d2ecB373c92866',
  },
  MAINNET: {
    claimAddress: '0x0ee1fb382caf98e86e97e51f9f42f8b4654020f3',
@@ -49,13 +49,6 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
          signer = provider.getSigner();
        }

-        const tokenVestingAddress =
-          config.token_vesting_contract?.address ||
-          ENV.addresses.tokenVestingAddress;
-        if (!tokenVestingAddress) {
-          throw new Error('No token vesting address found');
-        }
-
        if (provider && config) {
          const staking = new StakingBridge(
            config.staking_bridge_contract.address,
@@ -70,7 +63,7 @@ export const ContractsProvider = ({ children }: { children: JSX.Element }) => {
                signer || provider
              ),
              vesting: new TokenVesting(
-                tokenVestingAddress,
+                config.token_vesting_contract.address,
                signer || provider
              ),
              claim: new Claim(ENV.addresses.claimAddress, signer || provider),
@@ -1,8 +1,9 @@
+import type { ObservableQuery } from '@apollo/client';
 import { useEffect } from 'react';

 export const useRefreshAfterEpoch = (
  epochExpiry: string | undefined,
-  refetch: () => void
+  refetch: ObservableQuery['refetch']
 ) => {
  return useEffect(() => {
    const epochInterval = setInterval(() => {
@@ -443,8 +443,8 @@
  "rewardType": "Reward type",
  "rewardsAndFeesReceived": "Rewards and fees received",
  "ThisDoesNotIncludeFeesReceivedForMakersOrLiquidityProviders": "This does not include fees received for makers or liquidity providers",
-  "totalDistributed": "Total distributed",
-  "earnedByMe": "Earned by me",
+  "totalDistributed": "TOTAL DISTRIBUTED",
+  "earnedByMe": "EARNED BY ME",
  "noRewardsHaveBeenDistributedYet": "NO REWARDS HAVE BEEN DISTRIBUTED YET",
  "rewardsColAssetHeader": "ASSET",
  "rewardsColStakingHeader": "STAKING",
@@ -595,7 +595,6 @@
  "noPercentage": "No percentage",
  "proposalTerms": "Proposal terms",
  "currentlySetTo": "Currently expected to ",
-  "currently": "currently",
  "finalOutcomeMayDiffer": "Final outcome may differ",
  "votingPower": "Voting power",
  "normalisedVotingPower": "Normalised voting power",
@@ -603,14 +602,11 @@
  "noValidators": "No validators",
  "validator": "Validator",
  "stake": "Stake",
-  "myStake": "My stake",
  "stakeShare": "Stake share",
  "stakedByOperator": "Staked by operator",
  "stakedByDelegates": "Staked by delegates",
-  "stakedByMe": "Staked by me",
  "totalStake": "Total stake",
  "pendingStake": "Pending stake",
-  "myPendingStake": "My pending stake",
  "totalPenalties": "Total penalties",
  "noPenaltyDataFromLastEpoch": "No penalty data from last epoch",
  "stakeNeededForPromotion": "Stake needed for promotion",
@@ -768,7 +764,7 @@
  "performancePenalty": "Performance penalty",
  "overstaked": "Overstaked",
  "overstakedPenalty": "Overstaked penalty",
-  "homeProposalsIntro": "Decisions on the Vega network are on-chain, with tokenholders creating proposals that other tokenholders vote to approve or reject. Network upgrades are proposed and approved by validators.",
+  "homeProposalsIntro": "Decisions on the Vega network are on-chain, with tokenholders creating proposals that other tokenholders vote to approve or reject.",
  "homeProposalsButtonText": "Browse, vote, and propose",
  "homeValidatorsIntro": "Vega runs on a delegated proof of stake blockchain, where validators earn fees for validating block transactions. Tokenholders can nominate validators by staking tokens to them.",
  "homeValidatorsButtonText": "Browse, and stake",
@@ -776,19 +772,5 @@
  "homeRewardsButtonText": "See rewards",
  "homeVegaTokenIntro": "VEGA Token is a governance asset used to make and vote on proposals, and nominate validators.",
  "homeVegaTokenButtonText": "Manage tokens",
-  "downloadProposalJson": "Download proposal as JSON",
-  "networkUpgrade": "Network Upgrade",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED": "Approved",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING": "Pending",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED": "Rejected",
-  "PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED": "Unspecified",
-  "vegaRelease{release}": "Vega Release {{release}}",
-  "upgradeBlockHeight": "Upgrade block height",
-  "vegaReleaseTag": "Vega release tag",
-  "approvalStatus": "Approval status",
-  "approvers": "Approvers",
-  "approval (% validator voting power)": "approval (% validator voting power)",
-  "67% voting power required": "67% voting power required",
-  "Token": "Token",
-  "associateVegaNow": "Associate $VEGA now"
+  "downloadProposalJson": "Download proposal as JSON"
 }
@@ -1,15 +0,0 @@
-export const calculateEpochOffset = ({
-  epochId,
-  page,
-  size,
-}: {
-  epochId: number;
-  page: number;
-  size: number;
-}) => {
-  // offset the epoch by the current page number times the page size while making sure it doesn't go below the minimum epoch value
-  return {
-    fromEpoch: Math.max(0, epochId - size * page) + 1,
-    toEpoch: epochId - size * page + size,
-  };
-};
@@ -1,17 +1,20 @@
 import { ethers } from 'ethers';
 import type { Web3ReactHooks } from '@web3-react/core';
+import { initializeConnector } from '@web3-react/core';
+import { MetaMask } from '@web3-react/metamask';
+import { WalletConnect } from '@web3-react/walletconnect';
 import type { Connector } from '@web3-react/types';
 import { ENV } from '../config/env';
-import {
-  initializeMetaMaskConnector,
-  initializeWalletConnector,
-  initializeWalletConnectLegacyConnector,
-  initializeCoinbaseConnector,
-  WALLETCONNECT_PROJECT_ID,
-  initializeUrlConnector,
-} from '@vegaprotocol/web3';
+import { UrlConnector } from '@vegaprotocol/web3';

-initializeUrlConnector(ENV.localProviderUrl, ENV.ethWalletMnemonic);
+const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
+  (actions) => new MetaMask(actions)
+);
+
+const [urlConnector, urlHooks] = initializeConnector<UrlConnector>(
+  (actions) =>
+    new UrlConnector(actions, ENV.localProviderUrl, ENV.ethWalletMnemonic)
+);

 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
  return new ethers.providers.JsonRpcProvider(providerUrl, chainId);
@@ -21,14 +24,19 @@ export const createConnectors = (providerUrl: string, chainId: number) => {
  if (isNaN(chainId)) {
    throw new Error('Invalid Ethereum chain ID for environment');
  }
-
+  const [walletconnect, walletconnectHooks] =
+    initializeConnector<WalletConnect>(
+      (actions) =>
+        new WalletConnect(actions, {
+          rpc: {
+            [chainId]: providerUrl,
+          },
+        }),
+      [chainId]
+    );
  return [
-    ENV.urlConnect
-      ? initializeUrlConnector(ENV.localProviderUrl, ENV.ethWalletMnemonic)
-      : null,
-    initializeMetaMaskConnector(),
-    initializeCoinbaseConnector(providerUrl),
-    initializeWalletConnector(WALLETCONNECT_PROJECT_ID, chainId, providerUrl),
-    initializeWalletConnectLegacyConnector(chainId, providerUrl),
-  ].filter(Boolean) as unknown as [Connector, Web3ReactHooks][];
+    ENV.urlConnect ? [urlConnector, urlHooks] : null,
+    [metamask, metamaskHooks],
+    [walletconnect, walletconnectHooks],
+  ].filter(Boolean) as [Connector, Web3ReactHooks][];
 };
@@ -10,31 +10,23 @@ import {
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import { useRefreshAfterEpoch } from '../../hooks/use-refresh-after-epoch';
 import { ProposalsListItem } from '../proposals/components/proposals-list-item';
-import { ProtocolUpgradeProposalsListItem } from '../proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import Routes from '../routes';
 import { ExternalLinks, removePaginationWrapper } from '@vegaprotocol/utils';
-import { useNodesQuery } from '../staking/home/__generated__/Nodes';
+import { useNodesQuery } from '../staking/home/__generated___/Nodes';
 import { useProposalsQuery } from '../proposals/proposals/__generated__/Proposals';
-import { useProtocolUpgradesQuery } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-import {
-  getNotRejectedProposals,
-  getNotRejectedProtocolUpgradeProposals,
-} from '../proposals/proposals/proposals-container';
+import { getNotRejectedProposals } from '../proposals/proposals/proposals-container';
 import { Heading } from '../../components/heading';
 import * as Schema from '@vegaprotocol/types';
 import type { RouteChildProps } from '..';
 import type { ProposalFieldsFragment } from '../proposals/proposals/__generated__/Proposals';
-import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../proposals/protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import type { NodesFragmentFragment } from '../staking/home/__generated___/Nodes';

 const nodesToShow = 6;

 const HomeProposals = ({
  proposals,
-  protocolUpgradeProposals,
 }: {
  proposals: ProposalFieldsFragment[];
-  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
 }) => {
  const { t } = useTranslation();

@@ -55,10 +47,6 @@ const HomeProposals = ({
        data-testid="home-proposal-list"
        className="grid md:grid-cols-2 lg:grid-cols-1 xl:grid-cols-2 gap-6"
      >
-        {protocolUpgradeProposals.map((proposal, index) => (
-          <ProtocolUpgradeProposalsListItem key={index} proposal={proposal} />
-        ))}
-
        {proposals.map((proposal) => (
          <ProposalsListItem key={proposal.id} proposal={proposal} />
        ))}
@@ -119,7 +107,20 @@ const HomeNodes = ({

        {trimmedActiveNodes.map(({ id, avatarUrl, name }) => (
          <div key={id} data-testid="validators" className="col-span-2">
-            <ValidatorDetailsLink id={id} avatarUrl={avatarUrl} name={name} />
+            <Link to={`${Routes.VALIDATORS}/${id}`}>
+              <RoundedWrapper paddingBottom={true} border={false}>
+                <div className="flex items-center justify-center m-[-1rem] p-4 bg-neutral-900 hover:bg-neutral-800">
+                  {avatarUrl && (
+                    <img
+                      className="h-6 w-6 rounded-full mr-2"
+                      src={avatarUrl}
+                      alt={`Avatar icon for ${name}`}
+                    />
+                  )}
+                  <span className="text-sm">{name}</span>
+                </div>
+              </RoundedWrapper>
+            </Link>
          </div>
        ))}
      </div>
@@ -135,35 +136,6 @@ const HomeNodes = ({
  );
 };

-interface ValidatorDetailsLinkProps {
-  id: string;
-  avatarUrl: string | null | undefined;
-  name: string;
-}
-
-export const ValidatorDetailsLink = ({
-  id,
-  avatarUrl,
-  name,
-}: ValidatorDetailsLinkProps) => {
-  return (
-    <Link to={`${Routes.VALIDATORS}/${id}`}>
-      <RoundedWrapper paddingBottom={true} border={false}>
-        <div className="flex items-center justify-center m-[-1rem] p-3 bg-neutral-900 hover:bg-neutral-800">
-          {avatarUrl && (
-            <img
-              className="h-6 w-6 rounded-full mr-2"
-              src={avatarUrl}
-              alt={`Avatar icon for ${name}`}
-            />
-          )}
-          <span className="text-sm">{name}</span>
-        </div>
-      </RoundedWrapper>
-    </Link>
-  );
-};
-
 const GovernanceHome = ({ name }: RouteChildProps) => {
  useDocumentTitle(name);
  const { t } = useTranslation();
@@ -177,16 +149,6 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
    errorPolicy: 'ignore',
  });

-  const {
-    data: protocolUpgradesData,
-    loading: protocolUpgradesLoading,
-    error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
-    pollInterval: 5000,
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-  });
-
  const {
    data: validatorsData,
    error: validatorsError,
@@ -201,38 +163,11 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
      proposalsData
        ? getNotRejectedProposals<ProposalFieldsFragment>(
            proposalsData.proposalsConnection
-          )
+          ).slice(0, 3)
        : [],
    [proposalsData]
  );

-  const protocolUpgradeProposals = useMemo(
-    () =>
-      protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
-            protocolUpgradesData.protocolUpgradeProposals
-          ).filter(
-            (p) =>
-              Number(p.upgradeBlockHeight) >
-              Number(protocolUpgradesData.lastBlockHeight)
-          )
-        : [],
-    [protocolUpgradesData]
-  );
-
-  const totalProposalsDesired = 4;
-  const protocolUpgradeProposalsToShow = protocolUpgradeProposals.slice(
-    0,
-    totalProposalsDesired
-  );
-  const proposalsToShow =
-    protocolUpgradeProposalsToShow.length === totalProposalsDesired
-      ? []
-      : proposals.slice(
-          0,
-          totalProposalsDesired - protocolUpgradeProposalsToShow.length
-        );
-
  const activeNodes = removePaginationWrapper(
    validatorsData?.nodesConnection.edges
  );
@@ -247,14 +182,11 @@ const GovernanceHome = ({ name }: RouteChildProps) => {

  return (
    <AsyncRenderer
-      loading={proposalsLoading || protocolUpgradesLoading || validatorsLoading}
-      error={proposalsError || protocolUpgradesError || validatorsError}
-      data={proposalsData && protocolUpgradesData && validatorsData}
+      loading={proposalsLoading || validatorsLoading}
+      error={proposalsError || validatorsError}
+      data={proposalsData && validatorsData}
    >
-      <HomeProposals
-        proposals={proposalsToShow}
-        protocolUpgradeProposals={protocolUpgradeProposalsToShow}
-      />
+      <HomeProposals proposals={proposals} />

      <HomeNodes
        activeNodes={activeNodes}
@@ -63,7 +63,7 @@ const renderComponent = (proposals: ProposalQuery['proposal'][]) => (
    <MockedProvider mocks={[networkParamsQueryMock]}>
      <AppStateProvider>
        <VegaWalletContext.Provider value={mockWalletContext}>
-          <ProposalsList proposals={proposals} protocolUpgradeProposals={[]} />
+          <ProposalsList proposals={proposals} />
        </VegaWalletContext.Provider>
      </AppStateProvider>
    </MockedProvider>
@@ -3,21 +3,17 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Heading, SubHeading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
-import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
-import { ExternalLinks } from '@vegaprotocol/utils';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import { ExternalLinks } from '@vegaprotocol/utils';
+import { ExternalLink } from '@vegaprotocol/ui-toolkit';

 interface ProposalsListProps {
  proposals: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
-  protocolUpgradeProposals: ProtocolUpgradeProposalFieldsFragment[];
-  lastBlockHeight?: string;
 }

 interface SortedProposalsProps {
@@ -25,16 +21,7 @@ interface SortedProposalsProps {
  closed: Array<ProposalFieldsFragment | ProposalQuery['proposal']>;
 }

-interface SortedProtocolUpgradeProposalsProps {
-  open: ProtocolUpgradeProposalFieldsFragment[];
-  closed: ProtocolUpgradeProposalFieldsFragment[];
-}
-
-export const ProposalsList = ({
-  proposals,
-  protocolUpgradeProposals,
-  lastBlockHeight,
-}: ProposalsListProps) => {
+export const ProposalsList = ({ proposals }: ProposalsListProps) => {
  const { t } = useTranslation();
  const [filterString, setFilterString] = useState('');
  const sortedProposals = proposals.reduce(
@@ -52,21 +39,6 @@ export const ProposalsList = ({
    }
  );

-  const sortedProtocolUpgradeProposals = protocolUpgradeProposals.reduce(
-    (acc: SortedProtocolUpgradeProposalsProps, proposal) => {
-      if (Number(proposal?.upgradeBlockHeight) > Number(lastBlockHeight)) {
-        acc.open.push(proposal);
-      } else {
-        acc.closed.push(proposal);
-      }
-      return acc;
-    },
-    {
-      open: [],
-      closed: [],
-    }
-  );
-
  const filterPredicate = (
    p: ProposalFieldsFragment | ProposalQuery['proposal']
  ) =>
@@ -93,7 +65,7 @@ export const ProposalsList = ({
      </div>
      <p className="mb-8">
        {t(
-          `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
+          `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network.`
        )}{' '}
        <ExternalLink
          data-testid="proposal-documentation-link"
@@ -108,15 +80,8 @@ export const ProposalsList = ({
      )}
      <section className="-mx-4 p-4 mb-8 bg-neutral-800">
        <SubHeading title={t('openProposals')} />
-        {sortedProposals.open.length > 0 ||
-        sortedProtocolUpgradeProposals.open.length > 0 ? (
+        {sortedProposals.open.length > 0 ? (
          <ul data-testid="open-proposals">
-            {sortedProtocolUpgradeProposals.open.map((proposal) => (
-              <ProtocolUpgradeProposalsListItem
-                key={proposal.upgradeBlockHeight}
-                proposal={proposal}
-              />
-            ))}
            {sortedProposals.open.filter(filterPredicate).map((proposal) => (
              <ProposalsListItem key={proposal?.id} proposal={proposal} />
            ))}
@@ -129,16 +94,8 @@ export const ProposalsList = ({
      </section>
      <section>
        <SubHeading title={t('closedProposals')} />
-        {sortedProposals.closed.length > 0 ||
-        sortedProtocolUpgradeProposals.closed.length > 0 ? (
+        {sortedProposals.closed.length > 0 ? (
          <ul data-testid="closed-proposals">
-            {sortedProtocolUpgradeProposals.closed.map((proposal) => (
-              <ProtocolUpgradeProposalsListItem
-                key={proposal.upgradeBlockHeight}
-                proposal={proposal}
-              />
-            ))}
-
            {sortedProposals.closed.filter(filterPredicate).map((proposal) => (
              <ProposalsListItem key={proposal?.id} proposal={proposal} />
            ))}
@@ -1 +0,0 @@
-export * from './protocol-update-proposal-detail-approvals';
@@ -1,81 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import {
-  RoundedWrapper,
-  KeyValueTable,
-  KeyValueTableRow,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-import { ValidatorDetailsLink } from '../../../home';
-import { getNormalisedVotingPower } from '../../../staking/shared';
-import type { NodesFragmentFragment } from '../../../staking/home/__generated__/Nodes';
-
-export interface ProtocolUpdateProposalDetailApprovalsProps {
-  totalConsensusValidators: number;
-  // Consensus validators that have approved the proposal
-  consensusApprovals: NodesFragmentFragment[];
-  consensusApprovalsVotingPowerPercentage: string;
-}
-
-export const ProtocolUpdateProposalDetailApprovals = ({
-  totalConsensusValidators,
-  consensusApprovals,
-  consensusApprovalsVotingPowerPercentage,
-}: ProtocolUpdateProposalDetailApprovalsProps) => {
-  const { t } = useTranslation();
-
-  return (
-    <>
-      <div className="mb-10">
-        <SubHeading title={t('approvalStatus')} />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-          <KeyValueTable data-testid="protocol-upgrade-approval-status">
-            <KeyValueTableRow noBorder={true}>
-              <span>{`${consensusApprovalsVotingPowerPercentage} ${t(
-                'approval (% validator voting power)'
-              )}`}</span>
-              <span>({t('67% voting power required')})</span>
-            </KeyValueTableRow>
-          </KeyValueTable>
-        </RoundedWrapper>
-      </div>
-
-      <div className="mb-10">
-        <SubHeading
-          title={`${t('approvers')} (${
-            consensusApprovals.length
-          }/${totalConsensusValidators} validators)`}
-        />
-        <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-          <KeyValueTable data-testid="protocol-upgrade-approvers">
-            <KeyValueTableRow>
-              <div className="mb-2">{t('validator')}</div>
-              <div className="text-white mb-2">{t('votingPower')}</div>
-            </KeyValueTableRow>
-
-            {consensusApprovals.map((validator, index) => (
-              <KeyValueTableRow
-                noBorder={index === consensusApprovals?.length - 1}
-                key={validator.pubkey}
-              >
-                <div className="-mb-3 mt-1" data-testid={'validator-name'}>
-                  <ValidatorDetailsLink
-                    id={validator.id}
-                    avatarUrl={validator.avatarUrl}
-                    name={validator.name}
-                  />
-                </div>
-
-                <span data-testid="validator-voting-power">
-                  {getNormalisedVotingPower(
-                    validator.rankingScore.votingPower,
-                    2
-                  )}
-                </span>
-              </KeyValueTableRow>
-            ))}
-          </KeyValueTable>
-        </RoundedWrapper>
-      </div>
-    </>
-  );
-};
@@ -1,86 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { BrowserRouter } from 'react-router-dom';
-import * as Schema from '@vegaprotocol/types';
-import { ProtocolUpdateProposalDetailApprovals } from './protocol-update-proposal-detail-approvals';
-import { getNormalisedVotingPower } from '../../../staking/shared';
-import type { ProtocolUpdateProposalDetailApprovalsProps } from './protocol-update-proposal-detail-approvals';
-import type { NodesFragmentFragment } from '../../../staking/home/__generated__/Nodes';
-
-describe('ProtocolUpdateProposalDetailApprovals', () => {
-  const mockValidators: NodesFragmentFragment[] = [
-    {
-      id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
-      name: 'Marvin',
-      avatarUrl:
-        'https://upload.wikimedia.org/wikipedia/en/2/25/Marvin-TV-3.jpg',
-      pubkey:
-        '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b2917',
-      stakedTotal: '14182454495731682635157',
-      stakedByOperator: '1000000000000000000000',
-      stakedByDelegates: '13182454495731682635157',
-      pendingStake: '0',
-      rankingScore: {
-        rankingScore: '0.67845061012234727427532760837568',
-        stakeScore: '0.3392701644525644',
-        performanceScore: '0.9998677767864936',
-        votingPower: '3500',
-        status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-        __typename: 'RankingScore',
-      },
-      __typename: 'Node',
-    },
-  ];
-
-  const defaultProps = {
-    totalConsensusValidators: 3,
-    consensusApprovals: mockValidators,
-    consensusApprovalsVotingPowerPercentage: '75%',
-  };
-
-  const renderComponent = (
-    props: Partial<ProtocolUpdateProposalDetailApprovalsProps> = {}
-  ) => {
-    const mergedProps = {
-      ...defaultProps,
-      ...props,
-    };
-    return render(
-      <BrowserRouter>
-        <ProtocolUpdateProposalDetailApprovals {...mergedProps} />
-      </BrowserRouter>
-    );
-  };
-
-  it('renders without crashing', () => {
-    renderComponent();
-    expect(
-      screen.getByTestId('protocol-upgrade-approval-status')
-    ).toBeInTheDocument();
-    expect(
-      screen.getByTestId('protocol-upgrade-approvers')
-    ).toBeInTheDocument();
-  });
-
-  it('renders the correct number of consensus approvers', () => {
-    renderComponent();
-    const validators = screen.getAllByTestId(/validator-name/);
-    expect(validators.length).toBe(mockValidators.length);
-  });
-
-  it('renders the correct approval status with the required percentage', () => {
-    renderComponent();
-    expect(screen.getByText(/75% approval/i)).toBeInTheDocument();
-    expect(screen.getByText(/67% voting power required/i)).toBeInTheDocument();
-  });
-
-  it('renders the correct voting power for each validator', () => {
-    renderComponent();
-    mockValidators.forEach((validator) => {
-      const normalisedVotingPower = getNormalisedVotingPower(
-        validator.rankingScore.votingPower,
-        2
-      );
-      expect(screen.getByText(normalisedVotingPower)).toBeInTheDocument();
-    });
-  });
-});
@@ -1 +0,0 @@
-export * from './protocol-upgrade-proposal-detail-header';
@@ -1,18 +0,0 @@
-import { render } from '@testing-library/react';
-import { ProtocolUpgradeProposalDetailHeader } from './protocol-upgrade-proposal-detail-header';
-
-describe('ProtocolUpgradeProposalDetailHeader', () => {
-  it('should render successfully', () => {
-    const { baseElement } = render(
-      <ProtocolUpgradeProposalDetailHeader releaseTag="v1.0.0" />
-    );
-    expect(baseElement).toBeTruthy();
-  });
-
-  it('should render the release tag', () => {
-    const { getByText } = render(
-      <ProtocolUpgradeProposalDetailHeader releaseTag="v1.0.0" />
-    );
-    expect(getByText('Vega Release v1.0.0')).toBeTruthy();
-  });
-});
@@ -1,21 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { Intent, Lozenge } from '@vegaprotocol/ui-toolkit';
-import { Heading } from '../../../../components/heading';
-
-export interface ProtocolUpgradeProposalDetailHeaderProps {
-  releaseTag: string;
-}
-
-export const ProtocolUpgradeProposalDetailHeader = ({
-  releaseTag,
-}: ProtocolUpgradeProposalDetailHeaderProps) => {
-  const { t } = useTranslation();
-  return (
-    <>
-      <Heading title={t('vegaRelease{release}', { release: releaseTag })} />
-      <div className="mb-10">
-        <Lozenge variant={Intent.Success}>{t('networkUpgrade')}</Lozenge>
-      </div>
-    </>
-  );
-};
@@ -1 +0,0 @@
-export * from './protocol-upgrade-proposal-detail-info';
@@ -1,44 +0,0 @@
-// jest tests for the protocol upgrade proposal detail info component
-
-import { render } from '@testing-library/react';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import { ProtocolUpgradeProposalDetailInfo } from './protocol-upgrade-proposal-detail-info';
-
-const renderComponent = () =>
-  render(
-    <ProtocolUpgradeProposalDetailInfo
-      proposal={{
-        vegaReleaseTag: 'v0.1.234',
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-        upgradeBlockHeight: '12345',
-        approvers: [],
-      }}
-    />
-  );
-
-describe('ProtocolUpgradeProposalDetailInfo', () => {
-  it('should render successfully', () => {
-    const { baseElement } = renderComponent();
-    expect(baseElement).toBeTruthy();
-  });
-
-  it('should render the upgrade block height', () => {
-    const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-block-height')).toHaveTextContent(
-      '12345'
-    );
-  });
-
-  it('should render the state', () => {
-    const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-state')).toHaveTextContent('Pending');
-  });
-
-  it('should render the vega release tag', () => {
-    const { getByTestId } = renderComponent();
-    expect(getByTestId('protocol-upgrade-release-tag')).toHaveTextContent(
-      'v0.1.234'
-    );
-  });
-});
@@ -1,58 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import {
-  KeyValueTable,
-  KeyValueTableRow,
-  RoundedWrapper,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-
-export interface ProtocolUpgradeProposalDetailInfoProps {
-  proposal: ProtocolUpgradeProposalFieldsFragment;
-  lastBlockHeight?: string;
-}
-
-export const ProtocolUpgradeProposalDetailInfo = ({
-  proposal,
-  lastBlockHeight,
-}: ProtocolUpgradeProposalDetailInfoProps) => {
-  const { t } = useTranslation();
-
-  return (
-    <div className="mb-10">
-      <SubHeading title={t('proposal')} />
-      <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>
-        <KeyValueTable data-testid="protocol-upgrade-proposal-details">
-          <KeyValueTableRow>
-            <span className="uppercase">{t('upgradeBlockHeight')}</span>
-
-            <span data-testid="protocol-upgrade-block-height">
-              {proposal.upgradeBlockHeight}{' '}
-              {lastBlockHeight && (
-                <>
-                  ({t('currently')} {lastBlockHeight})
-                </>
-              )}
-            </span>
-          </KeyValueTableRow>
-
-          <KeyValueTableRow>
-            <span className="uppercase">{t('state')}</span>
-
-            <span data-testid="protocol-upgrade-state">
-              {t(`${proposal.status}`)}
-            </span>
-          </KeyValueTableRow>
-
-          <KeyValueTableRow noBorder={true}>
-            <span className="uppercase">{t('vegaReleaseTag')}</span>
-
-            <span data-testid="protocol-upgrade-release-tag">
-              {proposal.vegaReleaseTag}
-            </span>
-          </KeyValueTableRow>
-        </KeyValueTable>
-      </RoundedWrapper>
-    </div>
-  );
-};
@@ -1,69 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { BrowserRouter } from 'react-router-dom';
-import { ProtocolUpgradeProposalsListItem } from './protocol-upgrade-proposals-list-item';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-
-const proposal = {
-  status:
-    ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-  vegaReleaseTag: 'v1.0.0',
-  upgradeBlockHeight: '12345',
-} as ProtocolUpgradeProposalFieldsFragment;
-
-const renderComponent = (proposal: ProtocolUpgradeProposalFieldsFragment) =>
-  render(
-    <BrowserRouter>
-      <ProtocolUpgradeProposalsListItem proposal={proposal} />
-    </BrowserRouter>
-  );
-
-describe('ProtocolUpgradeProposalsListItem', () => {
-  it('renders the correct status icon for each proposal status', () => {
-    const statuses = [
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED,
-        icon: 'protocol-upgrade-proposal-status-icon-rejected',
-      },
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-        icon: 'protocol-upgrade-proposal-status-icon-pending',
-      },
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED,
-        icon: 'protocol-upgrade-proposal-status-icon-approved',
-      },
-      {
-        status:
-          ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED,
-        icon: 'protocol-upgrade-proposal-status-icon-unspecified',
-      },
-    ];
-
-    statuses.forEach(({ status, icon }) => {
-      renderComponent({ ...proposal, status });
-      const statusIcon = screen.getByTestId(icon);
-      expect(statusIcon).toBeInTheDocument();
-    });
-  });
-
-  it('renders the correct Vega release tag', () => {
-    renderComponent(proposal);
-    const releaseTag = screen.getByTestId(
-      'protocol-upgrade-proposal-release-tag'
-    );
-    expect(releaseTag).toHaveTextContent(proposal.vegaReleaseTag);
-  });
-
-  it('renders the correct upgrade block height', () => {
-    renderComponent(proposal);
-    const blockHeight = screen.getByTestId(
-      'protocol-upgrade-proposal-block-height'
-    );
-    expect(blockHeight).toHaveTextContent(proposal.upgradeBlockHeight);
-  });
-});
@@ -1,124 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
-import {
-  Button,
-  Icon,
-  Intent,
-  Lozenge,
-  RoundedWrapper,
-} from '@vegaprotocol/ui-toolkit';
-import { stripFullStops } from '@vegaprotocol/utils';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import { SubHeading } from '../../../../components/heading';
-import type { ReactNode } from 'react';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
-import Routes from '../../../routes';
-
-interface ProtocolProposalsListItemProps {
-  proposal: ProtocolUpgradeProposalFieldsFragment;
-}
-
-export const ProtocolUpgradeProposalsListItem = ({
-  proposal,
-}: ProtocolProposalsListItemProps) => {
-  const { t } = useTranslation();
-  if (!proposal || !proposal.upgradeBlockHeight) return null;
-
-  let proposalStatusIcon: ReactNode;
-
-  switch (proposal.status) {
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-rejected">
-          <Icon name={'cross'} />
-        </div>
-      );
-      break;
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-pending">
-          <Icon name={'time'} />
-        </div>
-      );
-      break;
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-approved">
-          <Icon name={'tick'} />
-        </div>
-      );
-      break;
-    case ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_UNSPECIFIED:
-      proposalStatusIcon = (
-        <div data-testid="protocol-upgrade-proposal-status-icon-unspecified">
-          <Icon name={'disable'} />
-        </div>
-      );
-      break;
-  }
-
-  return (
-    <li
-      id={proposal.upgradeBlockHeight}
-      data-testid="protocol-upgrade-proposals-list-item"
-    >
-      <RoundedWrapper paddingBottom={true} heightFull={true}>
-        <div
-          data-testid="protocol-upgrade-proposal-title"
-          className="text-sm mb-2"
-        >
-          <SubHeading title={`Vega release ${proposal.vegaReleaseTag}`} />
-        </div>
-
-        <div className="text-sm">
-          <div
-            data-testid="protocol-upgrade-proposal-type"
-            className="flex items-center gap-2 mb-4"
-          >
-            <Lozenge variant={Intent.Success}>{t('networkUpgrade')}</Lozenge>
-          </div>
-
-          <div
-            data-testid="protocol-upgrade-proposal-release-tag"
-            className="mb-2"
-          >
-            <span className="pr-2">{t('vegaReleaseTag')}</span>
-            <Lozenge>{proposal.vegaReleaseTag}</Lozenge>
-          </div>
-
-          <div
-            data-testid="protocol-upgrade-proposal-block-height"
-            className="mb-2"
-          >
-            <span className="pr-2">{t('upgradeBlockHeight')}</span>
-            <Lozenge>{proposal.upgradeBlockHeight}</Lozenge>
-          </div>
-
-          <div className="grid grid-cols-[1fr_auto] mt-3 items-start gap-2">
-            <div className="col-start-1 row-start-1 text-white">
-              <div
-                data-testid="protocol-upgrade-proposal-status"
-                className="flex items-center gap-2"
-              >
-                <span>{t(`${proposal.status}`)}</span>
-                <span>{proposalStatusIcon}</span>
-              </div>
-            </div>
-
-            <div className="col-start-2 row-start-2 justify-self-end">
-              <Link
-                to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
-                  proposal.vegaReleaseTag
-                )}`}
-              >
-                <Button data-testid="view-proposal-btn" size="sm">
-                  {t('View')}
-                </Button>
-              </Link>
-            </div>
-          </div>
-        </div>
-      </RoundedWrapper>
-    </li>
-  );
-};
@@ -5,33 +5,23 @@ import { useTranslation } from 'react-i18next';
 import { SplashLoader } from '../../../components/splash-loader';
 import { ProposalsList } from '../components/proposals-list';
 import { useProposalsQuery } from './__generated__/Proposals';
+import type { ProposalFieldsFragment } from './__generated__/Proposals';
+import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import { getNodes } from '@vegaprotocol/utils';
 import flow from 'lodash/flow';
-import {
-  ProposalState,
-  ProtocolUpgradeProposalStatus,
-} from '@vegaprotocol/types';
-import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
-import type { ProposalFieldsFragment } from './__generated__/Proposals';
-import type { ProtocolUpgradeProposalFieldsFragment } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';
+import { ProposalState } from '@vegaprotocol/types';

 import orderBy from 'lodash/orderBy';
-import { useProtocolUpgradesQuery } from '../protocol-upgrade/__generated__/ProtocolUpgradeProposals';

 const orderByDate = (arr: ProposalFieldsFragment[]) =>
  orderBy(
    arr,
-    [(p) => new Date(p?.terms?.closingDatetime).getTime(), (p) => p.id],
-    ['desc', 'desc']
-  );
-
-const orderByUpgradeBlockHeight = (
-  arr: ProtocolUpgradeProposalFieldsFragment[]
-) =>
-  orderBy(
-    arr,
-    [(p) => p?.upgradeBlockHeight, (p) => p.vegaReleaseTag],
-    ['desc', 'desc']
+    [
+      (p) => new Date(p?.terms?.enactmentDatetime || 0).getTime(), // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered.
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
+      (p) => p.id,
+    ],
+    ['desc', 'desc', 'desc']
  );

 export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
@@ -46,21 +36,6 @@ export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
  ])(data);
 }

-export function getNotRejectedProtocolUpgradeProposals<
-  T extends ProtocolUpgradeProposalFieldsFragment
->(data?: NodeConnection<NodeEdge<T>> | null): T[] {
-  return flow([
-    (data) =>
-      getNodes<ProtocolUpgradeProposalFieldsFragment>(data, (p) =>
-        p
-          ? p.status !==
-            ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED
-          : false
-      ),
-    orderByUpgradeBlockHeight,
-  ])(data);
-}
-
 export const ProposalsContainer = () => {
  const { t } = useTranslation();
  const { data, loading, error } = useProposalsQuery({
@@ -69,16 +44,6 @@ export const ProposalsContainer = () => {
    errorPolicy: 'ignore',
  });

-  const {
-    data: protocolUpgradesData,
-    loading: protocolUpgradesLoading,
-    error: protocolUpgradesError,
-  } = useProtocolUpgradesQuery({
-    pollInterval: 5000,
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-  });
-
  const proposals = useMemo(
    () =>
      getNotRejectedProposals<ProposalFieldsFragment>(
@@ -87,25 +52,15 @@ export const ProposalsContainer = () => {
    [data]
  );

-  const protocolUpgradeProposals = useMemo(
-    () =>
-      protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
-            protocolUpgradesData.protocolUpgradeProposals
-          )
-        : [],
-    [protocolUpgradesData]
-  );
-
-  if (error || protocolUpgradesError) {
+  if (error) {
    return (
      <Callout intent={Intent.Danger} title={t('Something went wrong')}>
-        <pre>{error?.message || protocolUpgradesError?.message}</pre>
+        <pre>{error.message}</pre>
      </Callout>
    );
  }

-  if (loading || protocolUpgradesLoading) {
+  if (loading) {
    return (
      <Splash>
        <SplashLoader />
@@ -113,11 +68,5 @@ export const ProposalsContainer = () => {
    );
  }

-  return (
-    <ProposalsList
-      proposals={proposals}
-      protocolUpgradeProposals={protocolUpgradeProposals}
-      lastBlockHeight={protocolUpgradesData?.lastBlockHeight}
-    />
-  );
+  return <ProposalsList proposals={proposals} />;
 };
@@ -1,17 +0,0 @@
-fragment ProtocolUpgradeProposalFields on ProtocolUpgradeProposal {
-  upgradeBlockHeight
-  vegaReleaseTag
-  approvers
-  status
-}
-
-query ProtocolUpgrades {
-  lastBlockHeight
-  protocolUpgradeProposals {
-    edges {
-      node {
-        ...ProtocolUpgradeProposalFields
-      }
-    }
-  }
-}
@@ -1,59 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ProtocolUpgradeProposalFieldsFragment = { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus };
-
-export type ProtocolUpgradesQueryVariables = Types.Exact<{ [key: string]: never; }>;
-
-
-export type ProtocolUpgradesQuery = { __typename?: 'Query', lastBlockHeight: string, protocolUpgradeProposals?: { __typename?: 'ProtocolUpgradeProposalConnection', edges?: Array<{ __typename?: 'ProtocolUpgradeProposalEdge', node: { __typename?: 'ProtocolUpgradeProposal', upgradeBlockHeight: string, vegaReleaseTag: string, approvers: Array<string>, status: Types.ProtocolUpgradeProposalStatus } }> | null } | null };
-
-export const ProtocolUpgradeProposalFieldsFragmentDoc = gql`
-    fragment ProtocolUpgradeProposalFields on ProtocolUpgradeProposal {
-  upgradeBlockHeight
-  vegaReleaseTag
-  approvers
-  status
-}
-    `;
-export const ProtocolUpgradesDocument = gql`
-    query ProtocolUpgrades {
-  lastBlockHeight
-  protocolUpgradeProposals {
-    edges {
-      node {
-        ...ProtocolUpgradeProposalFields
-      }
-    }
-  }
-}
-    ${ProtocolUpgradeProposalFieldsFragmentDoc}`;
-
-/**
- * __useProtocolUpgradesQuery__
- *
- * To run a query within a React component, call `useProtocolUpgradesQuery` and pass it any options that fit your needs.
- * When your component renders, `useProtocolUpgradesQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useProtocolUpgradesQuery({
- *   variables: {
- *   },
- * });
- */
-export function useProtocolUpgradesQuery(baseOptions?: Apollo.QueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-      }
-export function useProtocolUpgradesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>(ProtocolUpgradesDocument, options);
-        }
-export type ProtocolUpgradesQueryHookResult = ReturnType<typeof useProtocolUpgradesQuery>;
-export type ProtocolUpgradesLazyQueryHookResult = ReturnType<typeof useProtocolUpgradesLazyQuery>;
-export type ProtocolUpgradesQueryResult = Apollo.QueryResult<ProtocolUpgradesQuery, ProtocolUpgradesQueryVariables>;
@@ -1 +0,0 @@
-export { ProtocolUpgradeProposalContainer as default } from './protocol-upgrade-proposal-container';
@@ -1,78 +0,0 @@
-import { useEffect, useMemo } from 'react';
-import { useParams } from 'react-router-dom';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { removePaginationWrapper, stripFullStops } from '@vegaprotocol/utils';
-import * as Schema from '@vegaprotocol/types';
-
-import { ProtocolUpgradeProposal } from './protocol-upgrade-proposal';
-import { ProposalNotFound } from '../components/proposal-not-found';
-import { useProtocolUpgradesQuery } from './__generated__/ProtocolUpgradeProposals';
-import { useNodesQuery } from '../../staking/home/__generated__/Nodes';
-import { useRefreshAfterEpoch } from '../../../hooks/use-refresh-after-epoch';
-
-export const ProtocolUpgradeProposalContainer = () => {
-  const params = useParams<{ proposalReleaseTag: string }>();
-
-  const { data, loading, error, refetch } = useProtocolUpgradesQuery({
-    fetchPolicy: 'network-only',
-    errorPolicy: 'ignore',
-    skip: !params.proposalReleaseTag,
-  });
-
-  useEffect(() => {
-    const interval = setInterval(refetch, 1000);
-    return () => clearInterval(interval);
-  }, [refetch]);
-
-  const {
-    data: nodesData,
-    error: nodesError,
-    loading: nodesLoading,
-    refetch: nodesRefetch,
-  } = useNodesQuery();
-
-  useRefreshAfterEpoch(nodesData?.epoch.timestamps.expiry, nodesRefetch);
-
-  const protocolUpgradeProposal = useMemo(() => {
-    if (!data?.protocolUpgradeProposals) return null;
-
-    const proposals = removePaginationWrapper(
-      data.protocolUpgradeProposals.edges
-    );
-
-    return proposals.find(
-      ({ vegaReleaseTag }) =>
-        params.proposalReleaseTag &&
-        params.proposalReleaseTag === stripFullStops(vegaReleaseTag)
-    );
-  }, [data, params.proposalReleaseTag]);
-
-  const consensusValidators = useMemo(() => {
-    if (!nodesData?.nodesConnection.edges) return null;
-
-    const nodes = removePaginationWrapper(nodesData.nodesConnection.edges);
-
-    return nodes.filter(
-      ({ rankingScore: { status } }) =>
-        status === Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT
-    );
-  }, [nodesData]);
-
-  return (
-    <AsyncRenderer
-      loading={loading || nodesLoading}
-      error={error || nodesError}
-      data={{ ...data, ...nodesData }}
-    >
-      {protocolUpgradeProposal ? (
-        <ProtocolUpgradeProposal
-          proposal={protocolUpgradeProposal}
-          lastBlockHeight={data?.lastBlockHeight}
-          consensusValidators={consensusValidators}
-        />
-      ) : (
-        <ProposalNotFound />
-      )}
-    </AsyncRenderer>
-  );
-};
@@ -1,134 +0,0 @@
-import { render } from '@testing-library/react';
-import * as Schema from '@vegaprotocol/types';
-import {
-  ProtocolUpgradeProposal,
-  getConsensusApprovals,
-  getConsensusApprovalsVotingPower,
-  getConsensusApprovalsVotingPowerPercentage,
-} from './protocol-upgrade-proposal';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
-import { getNormalisedVotingPower } from '../../staking/shared';
-import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
-import type { ProtocolUpgradeProposalFieldsFragment } from './__generated__/ProtocolUpgradeProposals';
-
-const mockProposal: ProtocolUpgradeProposalFieldsFragment = {
-  vegaReleaseTag: 'v0.1.234',
-  status:
-    ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_PENDING,
-  upgradeBlockHeight: '12345',
-  approvers: [],
-};
-
-const mockConsensusValidators: NodesFragmentFragment[] = [
-  {
-    id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b4',
-    name: 'Marvin',
-    avatarUrl: 'https://upload.wikimedia.org/wikipedia/en/2/25/Marvin-TV-3.jpg',
-    pubkey: '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b2917',
-    stakedTotal: '14182454495731682635157',
-    stakedByOperator: '1000000000000000000000',
-    stakedByDelegates: '13182454495731682635157',
-    pendingStake: '0',
-    rankingScore: {
-      rankingScore: '0.67845061012234727427532760837568',
-      stakeScore: '0.3392701644525644',
-      performanceScore: '0.9998677767864936',
-      votingPower: '3500',
-      status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-      __typename: 'RankingScore',
-    },
-    __typename: 'Node',
-  },
-  {
-    id: 'ccc022b7e63a4d0a6d3a193c3940c88574060e58a184964c994998d86835a1b5',
-    name: 'Barvin',
-    avatarUrl: 'https://upload.wikimedia.org/wikipedia/en/2/25/Barvin-TV-3.jpg',
-    pubkey: '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b291b',
-    stakedTotal: '1418245449573168263',
-    stakedByOperator: '100000000000000000',
-    stakedByDelegates: '1318245449573168263',
-    pendingStake: '0',
-    rankingScore: {
-      rankingScore: '0.5',
-      stakeScore: '0.3',
-      performanceScore: '0.98',
-      votingPower: '2500',
-      status: Schema.ValidatorStatus.VALIDATOR_NODE_STATUS_TENDERMINT,
-      __typename: 'RankingScore',
-    },
-    __typename: 'Node',
-  },
-];
-
-const renderComponent = () =>
-  render(
-    <ProtocolUpgradeProposal proposal={mockProposal} consensusValidators={[]} />
-  );
-
-describe('ProtocolUpgradeProposal', () => {
-  it('should render successfully', () => {
-    const { baseElement } = renderComponent();
-    expect(baseElement).toBeTruthy();
-  });
-});
-
-describe('getConsensusApprovals', () => {
-  it('returns an empty array when there are no matching approvers', () => {
-    const result = getConsensusApprovals(mockConsensusValidators, {
-      ...mockProposal,
-      approvers: [],
-    });
-    expect(result).toEqual([]);
-  });
-
-  it('returns the correct consensus approvals when there are matching approvers', () => {
-    const expectedApprovals = mockConsensusValidators[1];
-
-    const result = getConsensusApprovals(mockConsensusValidators, {
-      ...mockProposal,
-      approvers: [
-        '6abc23391a9f888ab240415bf63d6844b03fc360be822f4a1d2cd832d87b291b',
-      ],
-    });
-
-    expect(result.length).toEqual(1);
-    expect(result[0].id).toEqual(expectedApprovals.id);
-  });
-});
-
-describe('getConsensusApprovalsVotingPower', () => {
-  it('returns 0 when the input array is empty', () => {
-    const result = getConsensusApprovalsVotingPower([]);
-    expect(result).toBe(0);
-  });
-
-  it('returns the correct sum of voting power for a given array of consensus validators', () => {
-    const expectedSum = mockConsensusValidators.reduce(
-      (acc, curr) => acc + Number(curr.rankingScore.votingPower),
-      0
-    );
-
-    const result = getConsensusApprovalsVotingPower(mockConsensusValidators);
-    expect(result).toBe(expectedSum);
-  });
-});
-
-describe('getConsensusApprovalsVotingPowerPercentage', () => {
-  it('returns "0%" when the input value is 0 or less', () => {
-    const resultZero = getConsensusApprovalsVotingPowerPercentage(0);
-    const resultNegative = getConsensusApprovalsVotingPowerPercentage(-10);
-    expect(resultZero).toBe('0%');
-    expect(resultNegative).toBe('0%');
-  });
-
-  it('returns the correct percentage string when the input value is greater than 0', () => {
-    const inputValue = 12345;
-    const expectedPercentage = getNormalisedVotingPower(
-      inputValue.toString(),
-      2
-    );
-
-    const result = getConsensusApprovalsVotingPowerPercentage(inputValue);
-    expect(result).toBe(expectedPercentage);
-  });
-});
@@ -1,83 +0,0 @@
-import { useMemo } from 'react';
-import { ProtocolUpgradeProposalDetailHeader } from '../components/protocol-upgrade-proposal-detail-header';
-import { ProtocolUpdateProposalDetailApprovals } from '../components/protocol-upgrade-proposal-detail-approvals';
-import { ProtocolUpgradeProposalDetailInfo } from '../components/protocol-upgrade-proposal-detail-info';
-import { getNormalisedVotingPower } from '../../staking/shared';
-import type { ProtocolUpgradeProposalFieldsFragment } from './__generated__/ProtocolUpgradeProposals';
-import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
-
-export interface ProtocolUpgradeProposalProps {
-  proposal: ProtocolUpgradeProposalFieldsFragment;
-  consensusValidators: NodesFragmentFragment[] | null;
-  lastBlockHeight?: string;
-}
-
-export const getConsensusApprovals = (
-  consensusValidators: NodesFragmentFragment[],
-  proposal: ProtocolUpgradeProposalFieldsFragment
-) =>
-  consensusValidators?.filter(({ pubkey }) =>
-    proposal.approvers?.includes(pubkey)
-  );
-
-export const getConsensusApprovalsVotingPower = (
-  consensusValidators: NodesFragmentFragment[]
-) =>
-  consensusValidators?.reduce<number>(
-    (acc: number, curr: NodesFragmentFragment) => {
-      return acc + Number(curr.rankingScore.votingPower);
-    },
-    0
-  );
-
-export const getConsensusApprovalsVotingPowerPercentage = (
-  consensusApprovalsVotingPower: number
-) =>
-  consensusApprovalsVotingPower > 0
-    ? getNormalisedVotingPower(consensusApprovalsVotingPower.toString(), 2)
-    : '0%';
-
-export const ProtocolUpgradeProposal = ({
-  proposal,
-  lastBlockHeight,
-  consensusValidators,
-}: ProtocolUpgradeProposalProps) => {
-  const consensusApprovals = useMemo(
-    () => getConsensusApprovals(consensusValidators || [], proposal),
-    [consensusValidators, proposal]
-  );
-
-  const consensusApprovalsVotingPower = useMemo(
-    () => getConsensusApprovalsVotingPower(consensusApprovals || []),
-    [consensusApprovals]
-  );
-
-  const consensusApprovalsVotingPowerPercentage = useMemo(
-    () =>
-      getConsensusApprovalsVotingPowerPercentage(consensusApprovalsVotingPower),
-    [consensusApprovalsVotingPower]
-  );
-
-  return (
-    <section data-testid="protocol-upgrade-proposal">
-      <ProtocolUpgradeProposalDetailHeader
-        releaseTag={proposal.vegaReleaseTag}
-      />
-
-      <ProtocolUpgradeProposalDetailInfo
-        proposal={proposal}
-        lastBlockHeight={lastBlockHeight}
-      />
-
-      {consensusValidators && consensusApprovals && (
-        <ProtocolUpdateProposalDetailApprovals
-          consensusApprovals={consensusApprovals}
-          consensusApprovalsVotingPowerPercentage={
-            consensusApprovalsVotingPowerPercentage
-          }
-          totalConsensusValidators={consensusValidators.length}
-        />
-      )}
-    </section>
-  );
-};
@@ -3,7 +3,7 @@ import { AppStateProvider } from '../../../contexts/app-state/app-state-provider
 import { EpochIndividualRewardsTable } from './epoch-individual-rewards-table';

 const mockData = {
-  epoch: 4441,
+  epoch: '4441',
  rewards: [
    {
      asset: 'tDAI',
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`export * from './protocol-update-proposal-detail-approvals';`
				`@@ -1 +0,0 @@`
				`export * from './protocol-upgrade-proposal-detail-header';`
				`@@ -1 +0,0 @@`
				`export { ProtocolUpgradeProposalContainer as default } from './protocol-upgrade-proposal-container';`