test: move closeWelcomeDialog

.github/ISSUE_TEMPLATE/chore.md

@@ -14,7 +14,8 @@ What we need to achieve and who for
 
 ## Tasks
 
-- [ ]
+- [ ] What do we need to do first
-- [ ]
+- [ ] and then what?
+- [ ] Etc.
 
 ## Additional details / background info

.github/ISSUE_TEMPLATE/user-story.md

@@ -22,14 +22,11 @@ So that
 
 ## Tasks
 
-- [ ] UX (if needed)
+- [ ] Explore and sketch
-- [ ] Design (if needed)
 - [ ] Team and stakeholder review
-- [ ] Specs reviewed and created or adjusted
+- [ ] Visual Design
-- [ ] Implementation
+- [ ] Team review
-- [ ] Testing (unit and/or e2e)
+- [ ] Etc.
-- [ ] Code review
-- [ ] QA review
 
 ## Sketch
 

.github/workflows/add-ipfs-notes-to-release.yml

@@ -9,11 +9,6 @@ jobs:
     runs-on: ubuntu-22.04
     timeout-minutes: 30
     steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
@@ -32,16 +27,14 @@ jobs:
 
       - name: resolve ipfs hashes for release
         run: |
+          echo "Tag name: ${{ github.event.release.tag_name }}"
           echo "Name: ${{ github.event.release.name }}"
           echo "Description: ${{ github.event.release.body }}"
-          echo "Tag: ${{ github.event.release.tag_name }}"
+          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; do
-          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
-          echo "Commit: $commit"
-          until docker pull vegaprotocol/trading:$commit; do
             echo "Image not pushed yet, waiting 60 seconds"
             sleep 60
           done
-          docker run --rm vegaprotocol/trading:$commit cat /ipfs-hash > ipfs-hash
+          docker run --rm vegaprotocol/trading:${{ github.event.release.tag_name }} cat /ipfs-hash > ipfs-hash
           curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
           tar -xzf kubo.tgz
           export PATH="$PATH:$PWD/kubo"
@@ -55,20 +48,19 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           id: ${{ github.event.release.id }}
           body: |
-
+            ---
-            ___
 
             # Deployments
             * https://explorer.vega.xyz
             * https://governance.vega.xyz
 
             # IPFS releases
-            The IPFS hash of this release of the Trading app is:
+            Tye IPFS hash of this release of the Trading app is:
 
             CIDv0: ${{ env.IPFS_V0 }}
             CIDv1: ${{ env.IPFS_V1 }}
 
-            You can always access the latest IPFS release by visiting [console.vega.xyz](https://console.vega.xyz).
+            You can always access the latest IPFS release by visiting [vega.trading](https://vega.trading).
 
             You can also access Trading directly from an IPFS gateway.
             BEWARE: The Trading interface uses [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported. You should always use an IPFS gateway that enforces [origin separation](https://ipfs.github.io/public-gateway-checker/).

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

@@ -5,10 +5,9 @@ on:
     branches:
       - release/*
       - develop
-      - main
+    tags:
-  # uncomment pull_request and comment pull_request_target to test CI changes against feature branch not target branch (develop)
+      - v*
-  # pull_request:
+  pull_request:
-  pull_request_target:
     types:
       - opened
       - ready_for_review
@@ -22,8 +21,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Cache node modules
         id: cache
@@ -49,7 +46,7 @@ jobs:
 
   lint-pr-title:
     needs: node-modules
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
     name: Verify PR title
     uses: ./.github/workflows/lint-pr.yml
     secrets: inherit
@@ -64,7 +61,6 @@ jobs:
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup node
         uses: actions/setup-node@v3
@@ -102,96 +98,44 @@ jobs:
       # See affected apps
       - name: See affected apps
         run: |
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
-
           echo ">>>> debug"
           echo "NX_BASE: ${{ env.NX_BASE }}"
           echo "NX_HEAD: ${{ env.NX_HEAD }}"
-          echo "Affected: ${affected}"
-          echo "Branch slug: ${branch_slug}"
           echo ">>>> eof debug"
 
-          projects_array=()
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
 
+          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
+          projects_e2e=""
           preview_governance="not deployed"
           preview_trading="not deployed"
           preview_explorer="not deployed"
-          preview_tools="not deployed"
+          if [[ -z "$projects_e2e" ]]; then
-
+            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
-          # parse if affected is any of three main applications, if none - use all of them
-          if echo "$affected" | grep -q governance; then
-            echo "Governance is affected"
-            projects_array+=("governance")
-            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-          fi
-          if echo "$affected" | grep -q trading; then
-            echo "Trading is affected"
-            projects_array+=("trading")
-            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-          fi
-          if echo "$affected" | grep -q explorer; then
-            echo "Explorer is affected"
-            projects_array+=("explorer")
-            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          fi
-          if [[ ${#projects_array[@]} -eq 0 ]]; then
-            projects_array=("governance" "trading" "explorer")
             preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
             preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
             preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          fi
+          else
-
+            if [[ $affected == *"governance"* ]]; then
-          # applications parsed before this loop are applicable for running e2e-tests
+              projects_e2e+='"governance-e2e" '
-          projects_e2e_array=()
+              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-          for project in "${projects_array[@]}"; do
-            projects_e2e_array+=("${project}-e2e")
-          done
-          # all applications below this loop are not applicable for running e2e-test
-
-          # check if pull request event to deploy tools
-          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
-            if echo "$affected" | grep -q multisig-signer; then
-              echo "Tools are affected"
-              echo "Deploying tools on preview"
-              preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
-
-              projects_array+=("multisig-signer")
             fi
-          # those apps deploy only from develop to mainnet
+            if [[ $affected == *"trading"* ]]; then
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+              projects_e2e+='"trading-e2e" '
-            if echo "$affected" | grep -q multisig-signer; then
+              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-              echo "Tools are affected"
-              echo "Deploying tools on s3"
-
-              projects_array+=("multisig-signer")
             fi
-            if echo "$affected" | grep -q static; then
+            if [[ $affected == *"explorer"* ]]; then
-              echo "static is affected"
+              projects_e2e+='"explorer-e2e" '
-              echo "Deploying static on s3"
+              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-
-              projects_array+=("static")
-            fi
-            if echo "$affected" | grep -q ui-toolkit; then
-              echo "ui-toolkit is affected"
-              echo "Deploying ui-toolkit on s3"
-
-              projects_array+=("ui-toolkit")
             fi
           fi
-
+          projects_e2e=${projects_e2e%?}
-          echo "Projects: ${projects_array[@]}"
+          projects_e2e=[${projects_e2e// /,}]
-          echo "Projects E2E: ${projects_e2e_array[@]}"
+          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
-          projects_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_array[@]}")
+          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
-          projects_e2e_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_e2e_array[@]}")
-
-          echo PROJECTS_E2E=$projects_e2e_json >> $GITHUB_ENV
-          echo PROJECTS=$projects_json >> $GITHUB_ENV
-
           echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
           echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
           echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
-          echo PREVIEW_TOOLS=$preview_tools >> $GITHUB_ENV
 
     outputs:
       projects: ${{ env.PROJECTS }}
@@ -199,12 +143,11 @@ jobs:
       preview_governance: ${{ env.PREVIEW_GOVERNANCE }}
       preview_trading: ${{ env.PREVIEW_TRADING }}
       preview_explorer: ${{ env.PREVIEW_EXPLORER }}
-      preview_tools: ${{ env.PREVIEW_TOOLS }}
 
   cypress:
     needs: lint-test-build
     name: '(CI) cypress'
-    # if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
+    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
@@ -214,7 +157,7 @@ jobs:
   publish-dist:
     needs: lint-test-build
     name: '(CD) publish dist'
-    # if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
     uses: ./.github/workflows/publish-dist.yml
     secrets: inherit
     with:
@@ -225,8 +168,7 @@ jobs:
     needs:
       - publish-dist
       - lint-test-build
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
-    timeout-minutes: 60
     name: '(CD) comment preview links'
     steps:
       - name: Find Comment
@@ -236,35 +178,6 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Previews
 
-      - name: Wait for deployments
-        run: |
-          # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
-          regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
-          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
-              echo "waiting for governance preview"
-              sleep 5
-            done
-          fi
-          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
-              echo "waiting for explorer preview"
-              sleep 5
-            done
-          fi
-          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
-              echo "waiting for trading preview"
-              sleep 5
-            done
-          fi
-          if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
-              echo "waiting for tools preview"
-              sleep 5
-            done
-          fi
-
       - name: Create comment
         uses: peter-evans/create-or-update-comment@v3
         if: ${{ steps.fc.outputs.comment-id == 0 }}
@@ -275,11 +188,16 @@ jobs:
             * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
             * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
             * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
-            * tools: ${{ needs.lint-test-build.outputs.preview_tools }}
 
-  # Report single result at the end, to avoid mess with required checks in PR
   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

.github/workflows/cypress-run.yml

@@ -20,7 +20,7 @@ jobs:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
     runs-on: self-hosted-runner
-    timeout-minutes: 100
+    timeout-minutes: 60
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag
@@ -33,7 +33,6 @@ jobs:
         with:
           fetch-depth: 0
           path: './frontend-monorepo'
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       # Restore node_modules from cache if possible
       - name: Restore node_modules from cache

.github/workflows/lint-pr.yml

@@ -11,8 +11,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Setup node
         uses: actions/setup-node@v3

.github/workflows/process-tranches.yml

@@ -0,0 +1,32 @@
+name: Generate tranches
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'
+
+jobs:
+  master:
+    name: Generate Queries
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          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: Generate queries
+        run: node ./scripts/get-tranches.js
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'chore: update tranches'
+          commit_options: '--no-verify --signoff'
+          skip_fetch: true
+          skip_checkout: true

.github/workflows/publish-dist.yml

@@ -19,8 +19,6 @@ jobs:
     steps:
       - name: Check out code
         uses: actions/checkout@v3
-        with:
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
       - name: Set up QEMU
         id: quemu
@@ -33,7 +31,6 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Log in to the Container registry (ghcr)
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
@@ -42,7 +39,7 @@ jobs:
 
       - name: Log in to the Container registry (docker hub)
         uses: docker/login-action@v2
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ startsWith(github.ref, 'refs/tags/v') }}
         with:
           # registry: registry.hub.docker.com
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -62,68 +59,40 @@ jobs:
           key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
 
       # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Define dist variables
+      - name: Define variables
-        if: ${{ github.event_name == 'push' }}
         run: |
           envName=''
           domain="vega.rocks"
-          bucketName=''
+          if [[ "${{ github.event_name }}" = "push" ]]; then
-
+            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-          if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
+              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+              envName="stagnet1"
-            envName="stagnet1"
+            elif [[ "${{ matrix.app}}" = "trading" ]] && [[ ${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }} = "true" ]]; then
-            if [[ "${{ matrix.app }}" = "multisig-signer" ]]; then
               envName="mainnet"
-              bucketName="tools.vega.xyz"
+            elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
-            fi
-            if [[ "${{ matrix.app }}" = "static" ]]; then
               envName="mainnet"
-              bucketName="static.vega.xyz"
             fi
-            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
+            if [[ "${envName}" = "mainnet" ]]; then
-              envName="mainnet"
+              domain="vega.xyz"
-              bucketName="ui.vega.rocks"
             fi
-          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
-            envName="mainnet"
-          fi
-
-          if [[ "${envName}" = "mainnet" ]]; then
-            domain="vega.xyz"
-            if [[ -z "${bucketName}" ]]; then
-              bucketName="${{ matrix.app }}.${domain}"
-            fi
-          elif [[ "${envName}" = "testnet" ]]; then
-            domain="fairground.wtf"
-            if [[ -z "${bucketName}" ]]; then
-              bucketName="${{ matrix.app }}.${domain}"
-            fi
-          fi
-
-          if [[ -z "${bucketName}" ]]; then
             bucketName="${{ matrix.app }}.${envName}.${domain}"
+            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
           fi
-
-          echo "bucket name: ${bucketName}"
-          echo "env name: ${envName}"
-
-          echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
           echo ENV_NAME=${envName} >> $GITHUB_ENV
 
       - name: Build local dist
         run: |
           flags=""
           if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            flags="--env=${{ env.ENV_NAME }}"
+            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
-          elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
-            NODE_ENV=production yarn nx run ui-toolkit:build-storybook
-            DIST_LOCATION=dist/storybook/ui-toolkit
           else
             yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
             DIST_LOCATION=dist/apps/${{ matrix.app }}
@@ -145,7 +114,7 @@ jobs:
             ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
 
       - name: Image digest
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
         run: echo ${{ steps.docker_build.outputs.digest }}
 
       - name: Sanity check docker image
@@ -158,9 +127,7 @@ jobs:
 
       - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
-        continue-on-error: true
+        if: ${{ github.event_name == 'pull_request' || (matrix.app == 'trading' && github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') ) }}
-        id: ghcr-push
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -173,9 +140,7 @@ jobs:
 
       - name: Publish dist as docker image (docker hub)
         uses: docker/build-push-action@v3
-        continue-on-error: true
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        id: dockerhub-push
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -184,41 +149,13 @@ jobs:
             APP=${{ matrix.app }}
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
-            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
+            vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:mainnet
-
-      - name: Publish dist as docker image (ghcr - retry)
-        uses: docker/build-push-action@v3
-        if: ${{ steps.ghcr-push.outcome == 'failure' }}
-        with:
-          context: .
-          file: docker/node-outside-docker.Dockerfile
-          push: true
-          build-args: |
-            APP=${{ matrix.app }}
-            ENV_NAME=${{ env.ENV_NAME }}
-          tags: |
-            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Publish dist as docker image (docker hub - retry)
-        uses: docker/build-push-action@v3
-        if: ${{ steps.dockerhub-push.outcome == 'failure' }}
-        with:
-          context: .
-          file: docker/node-outside-docker.Dockerfile
-          push: true
-          build-args: |
-            APP=${{ matrix.app }}
-            ENV_NAME=${{ env.ENV_NAME }}
-          tags: |
-            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master
-        # s3 releases are not happening for trading on mainnet - it's IPFS
+        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') }}
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -230,57 +167,29 @@ jobs:
 
       - name: Add preview label
         uses: actions-ecosystem/action-add-labels@v1
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' }}
         with:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
 
       - name: Trigger fleek deployment
-        # release to ipfs happens only on mainnet (represented by main branch) for trading
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
         run: |
-          if echo ${{ github.ref }} | grep -q main; then
+          # display info about app
-            # display info about app
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
-              -H "Content-Type: application/json" \
+            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-              -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
+            https://api.fleek.co/graphql
-              https://api.fleek.co/graphql
 
-            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
+            -H "Content-Type: application/json" \
-              -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-              https://api.fleek.co/graphql
+            https://api.fleek.co/graphql
 
-          elif echo ${{ github.ref }} | grep -q release/testnet; then
+      - name: Update vega.trading DNS to redirect to the new console
-            # display info about app
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "query{getSiteById(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id latestDeploy{id status}}}"}' \
-              https://api.fleek.co/graphql
-
-            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "mutation{triggerDeploy(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id status}}"}' \
-              https://api.fleek.co/graphql
-          fi
-
-      - name: Check out ipfs-redirect
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
-        uses: actions/checkout@v3
-        with:
-          repository: 'vegaprotocol/ipfs-redirect'
-          path: 'ipfs-redirect'
-          fetch-depth: '0'
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-
-      - name: Update interstitial page to point to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
-        env:
-          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
         run: |
-          # set CID
           curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
           tar -xzf kubo.tgz
           export PATH="$PATH:$PWD/kubo"
@@ -288,28 +197,26 @@ jobs:
           new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
           new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
 
-          (
+          # Generate console URL
-            cd ipfs-redirect
+          new_console_url_type=ipfs
+          # new_console_url_type=ipns
+          new_console_url_domain=cf-ipfs.com
+          # new_console_url_domain=dweb.link
+          new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
+          echo "new_console_url=${new_console_url}"
 
-            # configure git
+          # Update record in DNSimple
-            git status
+          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-            cat .git/config
+          dnsimple_account_id=84895
-            git config --global user.email "vega-ci-bot@vega.xyz"
+          dnsimple_zone_name=vega.trading
-            git config --global user.name "vega-ci-bot"
+          dnsimple_record_id=44409591
+          # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
 
-            # update CID files
+          curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-            if echo ${{ github.ref }} | grep -q main; then
+                -H 'Accept: application/json' \
-              echo $new_hash > cidv0-mainnet.txt
+                -H 'Content-Type: application/json' \
-              echo $new_cid > cidv1-mainnet.txt
+                -X PATCH \
-              git add cidv0-mainnet.txt cidv1-mainnet.txt
+                -d "{
-            elif echo ${{ github.ref }} | grep -q release/testnet; then
+                      \"content\": \"${new_console_url}\"
-              echo $new_hash > cidv0-fairground.txt
+                }" \
-              echo $new_cid > cidv1-fairground.txt
+                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}
-              git add cidv0-fairground.txt cidv1-fairground.txt
-            fi
-
-            # create commit
-            commit_msg="Automated hash update from ${{ github.ref }}"
-            git commit -m "$commit_msg"
-            git push -u origin "main"
-          )

.github/workflows/rollback-console.yml

@@ -43,17 +43,7 @@ jobs:
             -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
             https://api.fleek.co/graphql
 
-      - name: Check out ipfs-redirect
+      - name: Update vega.trading DNS to redirect to the new console
-        uses: actions/checkout@v3
-        with:
-          repository: 'vegaprotocol/ipfs-redirect'
-          path: 'ipfs-redirect'
-          fetch-depth: '0'
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-
-      - name: Update console.vega.xyz DNS to redirect to the new console
-        env:
-          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
         run: |
           curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
           tar -xzf kubo.tgz
@@ -61,24 +51,27 @@ jobs:
           which ipfs
           new_hash=$(cat ipfs-hash)
           new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-          git config --global user.email "vega-ci-bot@vega.xyz"
-          git config --global user.name "vega-ci-bot"
-          echo $new_hash > ipfs-redirect/cidv0.txt
-          echo $new_cid > ipfs-redirect/cidv1.txt
 
-          (
+          # Generate console URL
-            cd ipfs-redirect
+          new_console_url_type=ipfs
+          # new_console_url_type=ipns
+          new_console_url_domain=cf-ipfs.com
+          # new_console_url_domain=dweb.link
+          new_console_url="https://${new_cid}.${new_console_url_type}.${new_console_url_domain}/"
+          echo "new_console_url=${new_console_url}"
 
-            git status
+          # Update record in DNSimple
-            branch_name="rollback-to-$new_hash"
+          # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
-            git checkout -b "$branch_name"
+          dnsimple_account_id=84895
-            commit_msg="hash rollback to $new_hash"
+          dnsimple_zone_name=vega.trading
-            git add cidv0.txt cidv1.txt
+          dnsimple_record_id=44409591
-            git commit -m "$commit_msg"
+          # see: https://dnsimple.com/a/84895/domains/vega.trading/records/44409591/edit
-            git push -u origin "$branch_name" --force-with-lease
+
-            pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
+          curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
-            echo $pr_url
+                -H 'Accept: application/json' \
-            # once auto merge get's enabled on documentation repo let's do follow up
+                -H 'Content-Type: application/json' \
-            sleep 5
+                -X PATCH \
-            gh pr merge "${pr_url}" --delete-branch --squash --admin
+                -d "{
-          )
+                      \"content\": \"${new_console_url}\"
+                }" \
+                https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}

.gitignore

@@ -50,5 +50,3 @@ cypress.env.json
 
 #cypress
 /apps/**/cypress/reports/
-/apps/**/cypress/downloads/
-/apps/**/fixtures/wallet/node**

apps/explorer-e2e/.env

@@ -1,3 +1,4 @@
+NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_URL=http://localhost:3008/graphql

apps/explorer-e2e/.env.devnet

@@ -1,4 +1,5 @@
 # App configuration variables
+NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql

apps/explorer-e2e/.env.mainnet

@@ -1,4 +1,5 @@
 # App configuration variables
+NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
 NX_VEGA_URL=https://api.vega.community/graphql

apps/explorer-e2e/.env.testnet

@@ -1,4 +1,5 @@
 # App configuration variables
+NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql

apps/explorer/.env

@@ -3,19 +3,18 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_TOKEN_URL=https://stagnet1.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 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_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.governance.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases/tag/
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.mainnet

@@ -1,13 +1,11 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://be.vega.community
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
-NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/6242427
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
-NX_BLOCK_EXPLORER=https://be.vega.community/rest
+NX_BLOCK_EXPLORER=https://be.vega.community/rest/
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
-NX_VEGA_CONSOLE_URL=https://console.vega.xyz

apps/explorer/.env.stagnet1

@@ -1,2 +1,2 @@
 # .env is stagnet1, so there are no overrides required
-NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET1":"https://stagnet1.explorer.vega.xyz"}'
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET3":"https://stagnet3.explorer.vega.xyz"}'

apps/explorer/.env.testnet

@@ -10,4 +10,3 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
-NX_VEGA_CONSOLE_URL=https://console.fairground.wtf

apps/explorer/.env.validator-testnet

@@ -7,9 +7,8 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
+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_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
-NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
+NX_VEGA_EXPLORER_URL=https://validator-testnet.explorer.vega.xyz/
-NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
-NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/

apps/explorer/project.json

@@ -70,7 +70,7 @@
       "executor": "@nrwl/workspace:run-commands",
       "options": {
         "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.71.4/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.67.3/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
         ]
       }
     },

apps/explorer/src/app/app.tsx

@@ -13,7 +13,6 @@ import { DEFAULT_CACHE_CONFIG } from '@vegaprotocol/apollo-client';
 import { RouterProvider } from 'react-router-dom';
 import { router } from './routes/router-config';
 import { t } from '@vegaprotocol/i18n';
-import { Suspense } from 'react';
 
 const splashLoading = (
   <Splash>
@@ -33,9 +32,7 @@ function App() {
           skeleton={<div>{t('Loading')}</div>}
           failure={<AppFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />}
         >
-          <Suspense fallback={splashLoading}>
+          <RouterProvider router={router} fallbackElement={splashLoading} />
-            <RouterProvider router={router} fallbackElement={splashLoading} />
-          </Suspense>
         </NodeGuard>
         <NodeSwitcherDialog
           open={nodeSwitcherOpen}

apps/explorer/src/app/components/blocks/blocks-refetch.spec.tsx

@@ -1,13 +1,29 @@
 import WS from 'jest-websocket-mock';
-import { render, screen } from '@testing-library/react';
+import useWebSocket from 'react-use-websocket';
+import {
+  render,
+  screen,
+  fireEvent,
+  act,
+  waitFor,
+} from '@testing-library/react';
+import { TendermintWebsocketContext } from '../../contexts/websocket/tendermint-websocket-context';
 import { BlocksRefetch } from './blocks-refetch';
 
 const BlocksRefetchInWebsocketProvider = ({
   callback,
+  mocketLocation,
 }: {
   callback: () => null;
+  mocketLocation: string;
 }) => {
-  return <BlocksRefetch refetch={callback} />;
+  const contextShape = useWebSocket(mocketLocation);
+
+  return (
+    <TendermintWebsocketContext.Provider value={{ ...contextShape }}>
+      <BlocksRefetch refetch={callback} />
+    </TendermintWebsocketContext.Provider>
+  );
 };
 
 describe('Blocks refetch', () => {
@@ -16,8 +32,111 @@ describe('Blocks refetch', () => {
     const mocket = new WS(mocketLocation, { jsonProtocol: true });
     new WebSocket(mocketLocation);
 
-    render(<BlocksRefetchInWebsocketProvider callback={() => null} />);
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={() => null}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('new blocks');
     expect(screen.getByTestId('refresh')).toBeInTheDocument();
     mocket.close();
   });
+
+  it('should initiate callback when the button is clicked', async () => {
+    const mocketLocation = 'wss:localhost:3003';
+    const mocket = new WS(mocketLocation, { jsonProtocol: true });
+    new WebSocket(mocketLocation);
+
+    const callback = jest.fn();
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={callback}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+    const button = screen.getByTestId('refresh');
+
+    act(() => {
+      fireEvent.click(button);
+    });
+
+    expect(callback.mock.calls.length).toEqual(1);
+    mocket.close();
+  });
+
+  it('should show new blocks as websocket is correctly updated', async () => {
+    const mocketLocation = 'wss:localhost:3004';
+    const mocket = new WS(mocketLocation, { jsonProtocol: true });
+    new WebSocket(mocketLocation);
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={() => null}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+
+    // Ensuring we send an ID equal to the one the client subscribed with.
+    await waitFor(() => expect(mocket.messages.length).toEqual(1));
+    // @ts-ignore id on messages
+    const id = mocket.messages[0].id;
+
+    const newBlockMessage = {
+      id,
+      result: {
+        query: "tm.event = 'NewBlock'",
+      },
+    };
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
+
+    act(() => {
+      mocket.send(newBlockMessage);
+    });
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('1 new blocks');
+
+    act(() => {
+      mocket.send(newBlockMessage);
+    });
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('2 new blocks');
+    mocket.close();
+  });
+
+  it('will not show new blocks if websocket has wrong ID', async () => {
+    const mocketLocation = 'wss:localhost:3005';
+    const mocket = new WS(mocketLocation, { jsonProtocol: true });
+    new WebSocket(mocketLocation);
+
+    render(
+      <BlocksRefetchInWebsocketProvider
+        callback={() => null}
+        mocketLocation={mocketLocation}
+      />
+    );
+    await mocket.connected;
+
+    // Ensuring we send an ID equal to the one the client subscribed with.
+    await waitFor(() => expect(mocket.messages.length).toEqual(1));
+
+    const newBlockMessageBadId = {
+      id: 'blahblahblah',
+      result: {
+        query: "tm.event = 'NewBlock'",
+      },
+    };
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
+
+    act(() => {
+      mocket.send(newBlockMessageBadId);
+    });
+
+    expect(screen.getByTestId('new-blocks')).toHaveTextContent('0 new blocks');
+    mocket.close();
+  });
 });

apps/explorer/src/app/components/blocks/blocks-refetch.tsx

@@ -1,19 +1,36 @@
+import { useState, useEffect } from 'react';
+import { useTendermintWebsocket } from '../../hooks/use-tendermint-websocket';
 import { t } from '@vegaprotocol/i18n';
-import { Button, Icon } from '@vegaprotocol/ui-toolkit';
+import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 
 interface BlocksRefetchProps {
   refetch: () => void;
 }
 
 export const BlocksRefetch = ({ refetch }: BlocksRefetchProps) => {
+  const [blocksToLoad, setBlocksToLoad] = useState<number>(0);
+
+  const { messages } = useTendermintWebsocket({
+    query: "tm.event = 'NewBlock'",
+  });
+
+  useEffect(() => {
+    if (messages.length > 0) {
+      setBlocksToLoad((prev) => prev + 1);
+    }
+  }, [messages]);
+
   const refresh = () => {
     refetch();
+    setBlocksToLoad(0);
   };
 
   return (
-    <Button onClick={refresh} data-testid="refresh" size="xs">
+    <div className="mb-4">
-      <Icon name="refresh" className="!align-baseline mr-2" size={3} />
+      <span data-testid="new-blocks">{blocksToLoad} new blocks - </span>
-      {t('Load new')}
+      <ButtonLink onClick={refresh} data-testid="refresh">
-    </Button>
+        {t('refresh to see latest')}
+      </ButtonLink>
+    </div>
   );
 };

apps/explorer/src/app/components/footer/footer.tsx

@@ -4,11 +4,9 @@ import {
 } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { Link, ExternalLink } from '@vegaprotocol/ui-toolkit';
+import { ExternalLink, Link } from '@vegaprotocol/ui-toolkit';
 import { useMemo } from 'react';
 import { ENV } from '../../config/env';
-import { Routes } from '../../routes/route-names';
-import { Link as RouteLink } from 'react-router-dom';
 
 export const Footer = () => {
   const { VEGA_URL, GIT_COMMIT_HASH, GIT_ORIGIN_URL } = useEnvironment();
@@ -23,7 +21,7 @@ export const Footer = () => {
   );
 
   return (
-    <footer className="grid grid-rows-2 lg:grid-cols-[1fr_auto] text-xs md:text-md lg:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
+    <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-xs md:text-md md:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
       <div className="flex justify-between gap-2 align-middle">
         {GIT_COMMIT_HASH && (
           <div className="content-center flex border-r border-neutral-700 dark:border-neutral-300 pr-4">
@@ -58,16 +56,11 @@ export const Footer = () => {
           </div>
         ) : null}
       </div>
-      <div className="pl-2 align-center lg:align-right lg:flex lg:justify-end gap-2 align-middle lg:max-w-xs lg:ml-auto">
-        <RouteLink to={`/${Routes.DISCLAIMER}`} className="underline">
-          Disclaimer
-        </RouteLink>
-      </div>
     </footer>
   );
 };
 
-export const NodeUrl = ({ url }: { url: string }) => {
+const NodeUrl = ({ url }: { url: string }) => {
   // get base url from api url, api sub domain
   const urlObj = new URL(url);
   const nodeUrl = urlObj.origin.replace(/^[^.]+\./g, '');

apps/explorer/src/app/components/markets/market-details.tsx

@@ -1,6 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
-import { PriceMonitoringBoundsInfoPanel } from '@vegaprotocol/markets';
 import {
   LiquidityInfoPanel,
   LiquidityMonitoringParametersInfoPanel,
@@ -40,69 +39,133 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
     return [];
   };
 
-  const showTwoOracles = isEqual(
+  const oraclePanels = isEqual(
     getSigners(settlementData),
     getSigners(terminationData)
-  );
+  )
+    ? [
+        {
+          title: t('Settlement Oracle'),
+          content: (
+            <OracleInfoPanel
+              noBorder={false}
+              market={market}
+              type="settlementData"
+            />
+          ),
+        },
+        {
+          title: t('Termination Oracle'),
+          content: (
+            <OracleInfoPanel
+              noBorder={false}
+              market={market}
+              type="termination"
+            />
+          ),
+        },
+      ]
+    : [
+        {
+          title: t('Oracle'),
+          content: (
+            <OracleInfoPanel
+              noBorder={false}
+              market={market}
+              type="settlementData"
+            />
+          ),
+        },
+      ];
 
-  const headerClassName = 'font-alpha calt text-xl mt-4 border-b-2 pb-2';
+  const panels = [
-
+    {
-  return (
+      title: t('Key details'),
-    <div>
+      content: <KeyDetailsInfoPanel noBorder={false} market={market} />,
-      <h2 className={headerClassName}>{t('Key details')}</h2>
+    },
-      <KeyDetailsInfoPanel market={market} />
+    {
-      <h2 className={headerClassName}>{t('Instrument')}</h2>
+      title: t('Instrument'),
-      <InstrumentInfoPanel market={market} />
+      content: <InstrumentInfoPanel noBorder={false} market={market} />,
-      <h2 className={headerClassName}>{t('Settlement asset')}</h2>
+    },
-      <SettlementAssetInfoPanel market={market} />
+    {
-      <h2 className={headerClassName}>{t('Metadata')}</h2>
+      title: t('Settlement asset'),
-      <MetadataInfoPanel market={market} />
+      content: <SettlementAssetInfoPanel market={market} noBorder={false} />,
-      <h2 className={headerClassName}>{t('Risk model')}</h2>
+    },
-      <RiskModelInfoPanel market={market} />
+    {
-      <h2 className={headerClassName}>{t('Risk parameters')}</h2>
+      title: t('Metadata'),
-      <RiskParametersInfoPanel market={market} />
+      content: <MetadataInfoPanel noBorder={false} market={market} />,
-      <h2 className={headerClassName}>{t('Risk factors')}</h2>
+    },
-      <RiskFactorsInfoPanel market={market} />
+    {
-      {(market.data?.priceMonitoringBounds || []).map((trigger, i) => (
+      title: t('Risk model'),
+      content: <RiskModelInfoPanel noBorder={false} market={market} />,
+    },
+    {
+      title: t('Risk parameters'),
+      content: <RiskParametersInfoPanel noBorder={false} market={market} />,
+    },
+    {
+      title: t('Risk factors'),
+      content: <RiskFactorsInfoPanel noBorder={false} market={market} />,
+    },
+    ...(market.priceMonitoringSettings?.parameters?.triggers || []).map(
+      (trigger, i) => ({
+        title: t(`Price monitoring trigger ${i + 1}`),
+        content: <MarketInfoTable noBorder={false} data={trigger} />,
+      })
+    ),
+    ...(market.data?.priceMonitoringBounds || []).map((trigger, i) => ({
+      title: t(`Price monitoring bound ${i + 1}`),
+      content: (
         <>
-          <h2 className={headerClassName}>
+          <MarketInfoTable
-            {t('Price monitoring bounds %s', [(i + 1).toString()])}
+            noBorder={false}
-          </h2>
+            data={{
-          <PriceMonitoringBoundsInfoPanel
+              maxValidPrice: trigger.maxValidPrice,
-            market={market}
+              minValidPrice: trigger.minValidPrice,
-            triggerIndex={i + 1}
+            }}
+            decimalPlaces={market.decimalPlaces}
+          />
+          <MarketInfoTable
+            noBorder={false}
+            data={{ referencePrice: trigger.referencePrice }}
+            decimalPlaces={
+              market.tradableInstrument.instrument.product.settlementAsset
+                .decimals
+            }
           />
         </>
+      ),
+    })),
+    {
+      title: t('Liquidity monitoring parameters'),
+      content: (
+        <LiquidityMonitoringParametersInfoPanel
+          noBorder={false}
+          market={market}
+        />
+      ),
+    },
+    {
+      title: t('Liquidity'),
+      content: <LiquidityInfoPanel market={market} noBorder={false} />,
+    },
+    {
+      title: t('Liquidity price range'),
+      content: (
+        <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
+      ),
+    },
+    ...oraclePanels,
+  ];
+
+  return (
+    <>
+      {panels.map((p) => (
+        <div key={p.title} className="mb-3">
+          <h2 className="font-alpha calt text-xl">{p.title}</h2>
+          {p.content}
+        </div>
       ))}
-      {(market.priceMonitoringSettings?.parameters?.triggers || []).map(
+    </>
-        (trigger, i) => (
-          <>
-            <h2 className={headerClassName}>
-              {t('Price monitoring settings %s', [(i + 1).toString()])}
-            </h2>
-            <MarketInfoTable data={trigger} key={i} />
-          </>
-        )
-      )}
-      <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
-      <LiquidityMonitoringParametersInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Liquidity')}</h2>
-      <LiquidityInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
-      <LiquidityPriceRangeInfoPanel market={market} />
-      {showTwoOracles ? (
-        <>
-          <h2 className={headerClassName}>{t('Settlement oracle')}</h2>
-          <OracleInfoPanel market={market} type="settlementData" />
-          <h2 className={headerClassName}>{t('Termination oracle')}</h2>
-          <OracleInfoPanel market={market} type="termination" />
-        </>
-      ) : (
-        <>
-          <h2 className={headerClassName}>{t('Oracle')}</h2>
-          <OracleInfoPanel market={market} type="settlementData" />
-        </>
-      )}
-    </div>
   );
 };

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

@@ -77,24 +77,22 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
         hide={window.innerWidth <= BREAKPOINT_MD}
         valueGetter={({
           data,
-        }: VegaValueGetterParams<MarketFieldsFragment>) => {
+        }: VegaValueGetterParams<MarketFieldsFragment, 'state'>) => {
           return data?.state ? MarketStateMapping[data?.state] : '-';
         }}
       />
       <AgGridColumn
         colId="asset"
         headerName={t('Settlement asset')}
-        field="tradableInstrument.instrument.product.settlementAsset.symbol"
+        field="tradableInstrument.instrument.product.settlementAsset"
         hide={window.innerWidth <= BREAKPOINT_MD}
         cellRenderer={({
-          data,
+          value,
         }: VegaICellRendererParams<
           MarketFieldsFragment,
-          'tradableInstrument.instrument.product.settlementAsset.symbol'
+          'tradableInstrument.instrument.product.settlementAsset'
-        >) => {
+        >) =>
-          const value =
+          value ? (
-            data?.tradableInstrument.instrument.product.settlementAsset;
-          return value ? (
             <ButtonLink
               onClick={(e) => {
                 openAssetDetailsDialog(value.id, e.target as HTMLElement);
@@ -104,8 +102,8 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
             </ButtonLink>
           ) : (
             ''
-          );
+          )
-        }}
+        }
       />
       <AgGridColumn
         flex={2}

apps/explorer/src/app/components/txs/details/chain-response-code/chain-reponse.code.tsx

@@ -5,13 +5,12 @@ export const ErrorCodes = new Map([
   [51, 'Transaction failed validation'],
   [60, 'Transaction could not be decoded'],
   [70, 'Error'],
-  [71, 'Partial success/error'],
   [80, 'Unknown command'],
   [89, 'Rejected as spam'],
   [0, 'Success'],
 ]);
 
-export const successCodes = new Set([0, 71]);
+export const successCodes = new Set([0]);
 
 interface ChainResponseCodeProps {
   code: number;
@@ -30,12 +29,11 @@ export const ChainResponseCode = ({
   error,
 }: ChainResponseCodeProps) => {
   const isSuccess = successCodes.has(code);
-  const successColour =
+
-    code === 71 ? 'fill-vega-orange' : 'fill-vega-green-600';
   const icon = isSuccess ? (
-    <Icon name="tick-circle" className={successColour} />
+    <Icon name="tick-circle" className="fill-vega-green-550" />
   ) : (
-    <Icon name="cross" className="fill-vega-pink-600" />
+    <Icon name="cross" className="fill-vega-pink-550" />
   );
   const label = ErrorCodes.get(code) || 'Unknown response code';
 

apps/explorer/src/app/components/txs/details/tx-liquidity-amend.test.tsx

@@ -1,86 +0,0 @@
-import { render } from '@testing-library/react';
-import { TxDetailsLiquidityAmendment } from './tx-liquidity-amend';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MockedProvider } from '@apollo/client/testing';
-import { MemoryRouter } from 'react-router-dom';
-
-describe('TxDetailsLiquidityAmendment', () => {
-  const mockTxData = {
-    hash: 'test',
-    command: {
-      liquidityProvisionAmendment: {
-        marketId: 'BTC-USD',
-        commitmentAmount: 100,
-        fee: '0.01',
-      },
-    },
-  };
-  const mockPubKey = '123';
-  const mockBlockData = {
-    result: {
-      block: {
-        header: {
-          height: '123',
-        },
-      },
-    },
-  };
-
-  it('should render the component with correct data', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquidityAmendment
-            txData={mockTxData as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(getByText('Market')).toBeInTheDocument();
-    expect(getByText('BTC-USD')).toBeInTheDocument();
-    expect(getByText('Commitment amount')).toBeInTheDocument();
-    expect(getByText('100')).toBeInTheDocument();
-    expect(getByText('Fee')).toBeInTheDocument();
-    expect(getByText('1%')).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when tx data is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquidityAmendment
-            txData={undefined}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when liquidityProvisionAmendment is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquidityAmendment
-            txData={{ command: {} } as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-});

apps/explorer/src/app/components/txs/details/tx-liquidity-amend.tsx

@@ -7,7 +7,6 @@ import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
 import { LiquidityProvisionDetails } from './liquidity-provision/liquidity-provision-details';
 import PriceInMarket from '../../price-in-market/price-in-market';
-import BigNumber from 'bignumber.js';
 
 export type LiquidityAmendment =
   components['schemas']['v1LiquidityProvisionAmendment'];
@@ -35,10 +34,6 @@ export const TxDetailsLiquidityAmendment = ({
     txData.command.liquidityProvisionAmendment;
   const marketId: string = amendment.marketId || '-';
 
-  const fee = amendment.fee
-    ? new BigNumber(amendment.fee).times(100).toString()
-    : '-';
-
   return (
     <>
       <TableWithTbody className="mb-8" allowWrap={true}>
@@ -68,7 +63,7 @@ export const TxDetailsLiquidityAmendment = ({
         {amendment.fee ? (
           <TableRow modifier="bordered">
             <TableCell>{t('Fee')}</TableCell>
-            <TableCell>{fee}%</TableCell>
+            <TableCell>{amendment.fee}%</TableCell>
           </TableRow>
         ) : null}
       </TableWithTbody>

apps/explorer/src/app/components/txs/details/tx-liquidity-submission.test.tsx

@@ -1,86 +0,0 @@
-import { render } from '@testing-library/react';
-import { TxDetailsLiquiditySubmission } from './tx-liquidity-submission';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MockedProvider } from '@apollo/client/testing';
-import { MemoryRouter } from 'react-router-dom';
-
-describe('TxDetailsLiquiditySubmission', () => {
-  const mockTxData = {
-    hash: 'test',
-    command: {
-      liquidityProvisionSubmission: {
-        marketId: 'BTC-USD',
-        commitmentAmount: 100,
-        fee: '0.01',
-      },
-    },
-  };
-  const mockPubKey = '123';
-  const mockBlockData = {
-    result: {
-      block: {
-        header: {
-          height: '123',
-        },
-      },
-    },
-  };
-
-  it('should render the component with correct data', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquiditySubmission
-            txData={mockTxData as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(getByText('Market')).toBeInTheDocument();
-    expect(getByText('BTC-USD')).toBeInTheDocument();
-    expect(getByText('Commitment amount')).toBeInTheDocument();
-    expect(getByText('100')).toBeInTheDocument();
-    expect(getByText('Fee')).toBeInTheDocument();
-    expect(getByText('1%')).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when tx data is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquiditySubmission
-            txData={undefined}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-
-  it('should display awaiting message when liquidityProvisionSubmission is undefined', () => {
-    const { getByText } = render(
-      <MockedProvider>
-        <MemoryRouter>
-          <TxDetailsLiquiditySubmission
-            txData={{ command: {} } as BlockExplorerTransactionResult}
-            pubKey={mockPubKey}
-            blockData={mockBlockData as TendermintBlocksResponse}
-          />
-        </MemoryRouter>
-      </MockedProvider>
-    );
-
-    expect(
-      getByText('Awaiting Block Explorer transaction details')
-    ).toBeInTheDocument();
-  });
-});

apps/explorer/src/app/components/txs/details/tx-liquidity-submission.tsx

@@ -7,7 +7,6 @@ import { TableCell, TableRow, TableWithTbody } from '../../table';
 import type { components } from '../../../../types/explorer';
 import { LiquidityProvisionDetails } from './liquidity-provision/liquidity-provision-details';
 import PriceInMarket from '../../price-in-market/price-in-market';
-import BigNumber from 'bignumber.js';
 
 export type LiquiditySubmission =
   components['schemas']['v1LiquidityProvisionSubmission'];
@@ -34,10 +33,6 @@ export const TxDetailsLiquiditySubmission = ({
     txData.command.liquidityProvisionSubmission;
   const marketId: string = submission.marketId || '-';
 
-  const fee = submission.fee
-    ? new BigNumber(submission.fee).times(100).toString()
-    : '-';
-
   return (
     <>
       <TableWithTbody className="mb-8" allowWrap={true}>
@@ -67,7 +62,7 @@ export const TxDetailsLiquiditySubmission = ({
         {submission.fee ? (
           <TableRow modifier="bordered">
             <TableCell>{t('Fee')}</TableCell>
-            <TableCell>{fee}%</TableCell>
+            <TableCell>{submission.fee}%</TableCell>
           </TableRow>
         ) : null}
       </TableWithTbody>

apps/explorer/src/app/components/txs/tx-filter-label.tsx

@@ -1,24 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-
-export interface FilterLabelProps {
-  filters: Set<string>;
-}
-
-/**
- * Renders the list (currently limited to 1) of filters set by the
- * Transaction Filter
- */
-export function FilterLabel({ filters }: FilterLabelProps) {
-  if (!filters || filters.size !== 1) {
-    return <span className="uppercase">{t('Filter')}</span>;
-  }
-
-  return (
-    <div>
-      <span className="uppercase">{t('Filters')}:</span>&nbsp;
-      <code className="bg-vega-light-150 px-2 rounded-md capitalize">
-        {Array.from(filters)[0]}
-      </code>
-    </div>
-  );
-}

apps/explorer/src/app/components/txs/tx-filter.tsx

@@ -1,164 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import {
-  DropdownMenu,
-  DropdownMenuCheckboxItem,
-  DropdownMenuContent,
-  DropdownMenuItemIndicator,
-  DropdownMenuSeparator,
-  DropdownMenuSub,
-  DropdownMenuSubTrigger,
-  DropdownMenuTrigger,
-  DropdownMenuSubContent,
-  Icon,
-  Button,
-} from '@vegaprotocol/ui-toolkit';
-import type { Dispatch, SetStateAction } from 'react';
-import { FilterLabel } from './tx-filter-label';
-
-// All possible transaction types. Should be generated.
-export type FilterOption =
-  | 'Amend LiquidityProvision Order'
-  | 'Amend Order'
-  | 'Batch Market Instructions'
-  | 'Cancel LiquidityProvision Order'
-  | 'Cancel Order'
-  | 'Cancel Transfer Funds'
-  | 'Chain Event'
-  | 'Delegate'
-  | 'Ethereum Key Rotate Submission'
-  | 'Issue Signatures'
-  | 'Key Rotate Submission'
-  | 'Liquidity Provision Order'
-  | 'Node Signature'
-  | 'Node Vote'
-  | 'Proposal'
-  | 'Protocol Upgrade'
-  | 'Register new Node'
-  | 'State Variable Proposal'
-  | 'Submit Oracle Data'
-  | 'Submit Order'
-  | 'Transfer Funds'
-  | 'Undelegate'
-  | 'Validator Heartbeat'
-  | 'Vote on Proposal'
-  | 'Withdraw';
-
-// Alphabetised list of transaction types to appear at the top level
-export const PrimaryFilterOptions: FilterOption[] = [
-  'Amend LiquidityProvision Order',
-  'Amend Order',
-  'Batch Market Instructions',
-  'Cancel LiquidityProvision Order',
-  'Cancel Order',
-  'Cancel Transfer Funds',
-  'Delegate',
-  'Liquidity Provision Order',
-  'Proposal',
-  'Submit Oracle Data',
-  'Submit Order',
-  'Transfer Funds',
-  'Undelegate',
-  'Vote on Proposal',
-  'Withdraw',
-];
-
-// Alphabetised list of transaction types to nest under a 'More...' submenu
-export const SecondaryFilterOptions: FilterOption[] = [
-  'Chain Event',
-  'Ethereum Key Rotate Submission',
-  'Issue Signatures',
-  'Key Rotate Submission',
-  'Node Signature',
-  'Node Vote',
-  'Protocol Upgrade',
-  'Register new Node',
-  'State Variable Proposal',
-  'Validator Heartbeat',
-];
-
-export const AllFilterOptions: FilterOption[] = [
-  ...PrimaryFilterOptions,
-  ...SecondaryFilterOptions,
-];
-
-export interface TxFilterProps {
-  filters: Set<FilterOption>;
-  setFilters: Dispatch<SetStateAction<Set<FilterOption>>>;
-}
-
-/**
- * Renders a structured dropdown menu of all of the available transaction
- * types. It allows a user to select one transaction type to view. Later
- * it will support multiple selection, but until the API supports that it is
- * one or all.
- * @param filters null or Set of tranaction types
- * @param setFilters A function to update the filters prop
- * @returns
- */
-export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
-  return (
-    <DropdownMenu
-      modal={false}
-      trigger={
-        <DropdownMenuTrigger className="ml-2">
-          <Button size="xs">
-            <FilterLabel filters={filters} />
-          </Button>
-        </DropdownMenuTrigger>
-      }
-    >
-      <DropdownMenuContent>
-        {filters.size > 1 ? null : (
-          <>
-            <DropdownMenuCheckboxItem
-              onCheckedChange={() => setFilters(new Set(AllFilterOptions))}
-            >
-              {t('Clear filters')} <Icon name="cross" />
-            </DropdownMenuCheckboxItem>
-            <DropdownMenuSeparator />
-          </>
-        )}
-        {PrimaryFilterOptions.map((f) => (
-          <DropdownMenuCheckboxItem
-            key={f}
-            checked={filters.has(f)}
-            onCheckedChange={() => {
-              // NOTE: These act like radio buttons until the API supports multiple filters
-              setFilters(new Set([f]));
-            }}
-            id={`radio-${f}`}
-          >
-            {f}
-            <DropdownMenuItemIndicator>
-              <Icon name="tick-circle" />
-            </DropdownMenuItemIndicator>
-          </DropdownMenuCheckboxItem>
-        ))}
-        <DropdownMenuSub>
-          <DropdownMenuSubTrigger>
-            {t('More Types')}
-            <Icon name="chevron-right" />
-          </DropdownMenuSubTrigger>
-          <DropdownMenuSubContent>
-            {SecondaryFilterOptions.map((f) => (
-              <DropdownMenuCheckboxItem
-                key={f}
-                checked={filters.has(f)}
-                onCheckedChange={(checked) => {
-                  // NOTE: These act like radio buttons until the API supports multiple filters
-                  setFilters(new Set([f]));
-                }}
-                id={`radio-${f}`}
-              >
-                {f}
-                <DropdownMenuItemIndicator>
-                  <Icon name="tick-circle" className="inline" />
-                </DropdownMenuItemIndicator>
-              </DropdownMenuCheckboxItem>
-            ))}
-          </DropdownMenuSubContent>
-        </DropdownMenuSub>
-      </DropdownMenuContent>
-    </DropdownMenu>
-  );
-};

apps/explorer/src/app/components/txs/tx-order-type.tsx

@@ -160,7 +160,6 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
         vote={command?.voteSubmission?.value === 'VALUE_YES'}
         yesText="Proposal vote"
         noText="Proposal vote"
-        useVoteColour={false}
       />
     );
   }

apps/explorer/src/app/components/txs/txs-infinite-list.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useRef } from 'react';
+import React from 'react';
 import { FixedSizeList as List } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 import { t } from '@vegaprotocol/i18n';
@@ -69,17 +69,6 @@ export const TxsInfiniteList = ({
 }: TxsInfiniteListProps) => {
   const { screenSize } = useScreenDimensions();
   const isStacked = ['xs', 'sm'].includes(screenSize);
-  const infiniteLoaderRef = useRef<InfiniteLoader>(null);
-  const hasMountedRef = useRef(false);
-
-  useEffect(() => {
-    if (hasMountedRef.current) {
-      if (infiniteLoaderRef.current) {
-        infiniteLoaderRef.current.resetloadMoreItemsCache(true);
-      }
-    }
-    hasMountedRef.current = true;
-  }, [loadMoreTxs]);
 
   if (!txs) {
     if (!areTxsLoading) {
@@ -121,7 +110,6 @@ export const TxsInfiniteList = ({
           isItemLoaded={isItemLoaded}
           itemCount={itemCount}
           loadMoreItems={loadMoreItems}
-          ref={infiniteLoaderRef}
         >
           {({ onItemsRendered, ref }) => (
             <List

apps/explorer/src/app/components/vote-icon/vote-icon.spec.tsx

@@ -34,17 +34,4 @@ describe('Vote TX icon', () => {
     const no = render(<VoteIcon vote={false} />);
     expect(no.getByRole('img')).toHaveAttribute('aria-label', 'delete icon');
   });
-
-  it('useVoteColour prop can be used to override coloured background', () => {
-    const no = render(<VoteIcon vote={false} />);
-    expect(no.container.children[0]).toHaveClass('bg-vega-pink-550');
-
-    const monochromeNo = render(
-      <VoteIcon vote={false} useVoteColour={false} />
-    );
-    expect(monochromeNo.container.children[0]).not.toHaveClass(
-      'bg-vega-pink-550'
-    );
-    expect(monochromeNo.container.children[0]).toHaveClass('bg-vega-dark-200');
-  });
 });

apps/explorer/src/app/components/vote-icon/vote-icon.tsx

@@ -8,32 +8,6 @@ export interface VoteIconProps {
   yesText?: string;
   // Defaults to 'Against', but can be any text
   noText?: string;
-  // If set to false the background will not be coloured
-  useVoteColour?: boolean;
-}
-
-function getBgColour(useVoteColour: boolean, vote: boolean) {
-  if (useVoteColour === false) {
-    return 'bg-vega-dark-200';
-  }
-
-  return vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
-}
-
-function getFillColour(useVoteColour: boolean, vote: boolean) {
-  if (useVoteColour === false) {
-    return 'white';
-  }
-
-  return vote ? 'vega-green-300' : 'vega-pink-300';
-}
-
-function getTextColour(useVoteColour: boolean, vote: boolean) {
-  if (useVoteColour === false) {
-    return 'white';
-  }
-
-  return vote ? 'vega-green-200' : 'vega-pink-200';
 }
 
 /**
@@ -44,15 +18,14 @@ function getTextColour(useVoteColour: boolean, vote: boolean) {
  */
 export function VoteIcon({
   vote,
-  useVoteColour = true,
   yesText = 'For',
   noText = 'Against',
 }: VoteIconProps) {
   const label = vote ? yesText : noText;
+  const bg = vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
   const icon: IconName = vote ? 'tick-circle' : 'delete';
-  const bg = getBgColour(useVoteColour, vote);
+  const fill = vote ? 'vega-green-300' : 'vega-pink-300';
-  const fill = getFillColour(useVoteColour, vote);
+  const text = vote ? 'vega-green-200' : 'vega-pink-200';
-  const text = getTextColour(useVoteColour, vote);
 
   return (
     <div

apps/explorer/src/app/hooks/use-txs-data.ts

@@ -33,7 +33,7 @@ export const getTxsDataUrl = ({ limit, filters }: IGetTxsDataUrl) => {
   // Hacky fix for param as array
   let urlAsString = url.toString();
   if (filters) {
-    urlAsString += '&' + filters.replace(' ', '%20');
+    urlAsString += '&' + filters;
   }
 
   return urlAsString;
@@ -65,14 +65,6 @@ export const useTxsData = ({ limit, filters }: IUseTxsData) => {
     }
   }, [setTxsState, data]);
 
-  useEffect(() => {
-    setTxsState((prev) => ({
-      txsData: [],
-      hasMoreTxs: true,
-      lastCursor: '',
-    }));
-  }, [filters]);
-
   const loadTxs = useCallback(() => {
     return refetch({
       limit: limit,

apps/explorer/src/app/routes/oracles/components/oracle-details-type.spec.tsx

@@ -1,13 +1,12 @@
 import { render } from '@testing-library/react';
-import { OracleDetailsType, isInternalSourceType } from './oracle-details-type';
+import { OracleDetailsType } from './oracle-details-type';
-import type { SourceType } from './oracle';
+import type { SourceTypeName } from './oracle-details-type';
-import { PropertyKeyType } from '@vegaprotocol/types';
 
-function renderComponent(type: SourceType) {
+function renderComponent(type: SourceTypeName) {
-  return <OracleDetailsType sourceType={type} />;
+  return <OracleDetailsType type={type} />;
 }
 
-function renderWrappedComponent(type: SourceType) {
+function renderWrappedComponent(type: SourceTypeName) {
   return (
     <table>
       <tbody>{renderComponent(type)}</tbody>
@@ -15,53 +14,19 @@ function renderWrappedComponent(type: SourceType) {
   );
 }
 
-function mock(name: string): SourceType {
-  return {
-    sourceType: {
-      filters: [
-        {
-          __typename: 'Filter',
-          key: {
-            name,
-            type: PropertyKeyType.TYPE_STRING,
-          },
-        },
-      ],
-    },
-  };
-}
-
 describe('Oracle type view', () => {
   it('Renders nothing when type is null', () => {
-    const res = render(renderComponent(null as unknown as SourceType));
+    const res = render(renderComponent(null as unknown as SourceTypeName));
     expect(res.container).toBeEmptyDOMElement();
   });
 
-  it('Renders Internal time for internal sources - timestamp', () => {
+  it('Renders Internal time for internal sources', () => {
-    const s = mock('vegaprotocol.builtin.timestamp');
+    const res = render(renderWrappedComponent('DataSourceDefinitionInternal'));
-    expect(isInternalSourceType(s)).toEqual(true);
+    expect(res.getByText('Internal time')).toBeInTheDocument();
-    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('Internal data')).toBeInTheDocument();
-  });
-
-  it('Renders Internal time for internal sources - potential future types', () => {
-    const s = mock('vegaprotocol.builtin.boolean');
-    expect(isInternalSourceType(s)).toEqual(true);
-    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('Internal data')).toBeInTheDocument();
-  });
-
-  it('Renders External data otherwise - prices.external.whatever', () => {
-    const s = mock('prices.external.whatever');
-    expect(isInternalSourceType(s)).toEqual(false);
-    const res = render(renderWrappedComponent(s));
-    expect(res.getByText('External data')).toBeInTheDocument();
   });
 
   it('Renders External data otherwise', () => {
-    const s = mock('prices.external.vegaprotocol.builtin.');
+    const res = render(renderWrappedComponent('DataSourceDefinitionExternal'));
-    expect(isInternalSourceType(s)).toEqual(false);
-    const res = render(renderWrappedComponent(s));
     expect(res.getByText('External data')).toBeInTheDocument();
   });
 });

apps/explorer/src/app/routes/oracles/components/oracle-details-type.tsx

@@ -1,51 +1,27 @@
 import { TableRow, TableCell, TableHeader } from '../../../components/table';
 import type { SourceType } from './oracle';
 
-/**
+export type SourceTypeName = SourceType['__typename'] | undefined;
- * Basic function to determine if a source is internal or external.
- *
- * This should be distinguishable using __typename, but the type is incorrectly
- * reported at the moment, so instead we check the filters.
- *
- * @param s SourceType
- * @returns boolean True if the source is internal
- */
-export function isInternalSourceType(s: SourceType) {
-  if ('filters' in s.sourceType) {
-    const filters = s.sourceType.filters;
-
-    if (filters) {
-      return (
-        filters?.filter((f) => {
-          return f.key.name?.indexOf('vegaprotocol.builtin.') === 0;
-        }).length > 0
-      );
-    }
-  }
-
-  return false;
-}
 
 interface OracleDetailsTypeProps {
-  sourceType: SourceType;
+  type: SourceTypeName;
 }
 
 /**
  * Renders a a single table row for the Oracle Details view that shows
  * if the oracle is using the internal time oracle or external data
  */
-export function OracleDetailsType({ sourceType }: OracleDetailsTypeProps) {
+export function OracleDetailsType({ type }: OracleDetailsTypeProps) {
-  if (!sourceType) {
+  if (!type) {
     return null;
   }
-
-  const isInternal = isInternalSourceType(sourceType);
-
   return (
     <TableRow modifier="bordered">
       <TableHeader scope="row">Type</TableHeader>
       <TableCell modifier="bordered">
-        {isInternal ? 'Internal data' : 'External data'}
+        {type === 'DataSourceDefinitionInternal'
+          ? 'Internal time'
+          : 'External data'}
       </TableCell>
     </TableRow>
   );

apps/explorer/src/app/routes/oracles/components/oracle.tsx

@@ -53,7 +53,7 @@ export const OracleDetails = ({
             <OracleLink id={id} />
           </TableCell>
         </TableRow>
-        <OracleDetailsType sourceType={sourceType} />
+        <OracleDetailsType type={sourceType.__typename} />
         <OracleSigners sourceType={sourceType} />
         <OracleMarkets id={id} />
         <TableRow modifier="bordered">

apps/explorer/src/app/routes/pages/disclaimer.tsx

@@ -1,40 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import { RouteTitle } from '../../components/route-title';
-
-export const Disclaimer = () => {
-  return (
-    <section>
-      <div className="px-40 max-sm:px-0 max-md:px-10 mb-4 max-w-5xl">
-        <RouteTitle data-testid="disclaimer-header">
-          {t('Disclaimer')}
-        </RouteTitle>
-        <p className="mt-3">
-          The Vega Block Explorer is an application that allows users to, among
-          other things, browse through blocks, view wallet addresses, network
-          hashrate, transaction data and other key information on the Vega
-          blockchain. It is free, public and open source software. Software
-          upgrades may contain bugs or security vulnerabilities that might
-          result in loss of functionality.
-        </p>
-        <p className="mt-3">
-          The Vega Block Explorer uses data from nodes on the Vega Blockchain.
-          The developers of the Vega Block Explorer do not operate or run the
-          Vega Blockchain or any other blockchain.
-        </p>
-        <p className="mt-3 font-semibold">
-          The Vega Block Explorer is provided “as is”. The developers of the
-          Vega Block Explorer make no representations or warranties of any kind,
-          whether express or implied, statutory or otherwise regarding the Vega
-          Block Explorer. They disclaim all warranties of merchantability,
-          quality, fitness for purpose. They disclaim all warranties that the
-          Vega Block Explorer is free of harmful components or errors.
-        </p>
-        <p className="mt-3 font-bold">
-          No developer of the Vega Block Explorer accepts any responsibility
-          for, or liability to users in connection with their use of the Vega
-          Block Explorer.
-        </p>
-      </div>
-    </section>
-  );
-};

apps/explorer/src/app/routes/route-names.tsx

@@ -10,5 +10,4 @@ export const Routes = {
   MARKETS: 'markets',
   ORACLES: 'oracles',
   NETWORK_PARAMETERS: 'network-parameters',
-  DISCLAIMER: 'disclaimer',
 };

apps/explorer/src/app/routes/router-config.tsx

@@ -29,7 +29,6 @@ import { AssetLink, MarketLink } from '../components/links';
 import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import { remove0x } from '@vegaprotocol/utils';
 import { PartyAccountsByAsset } from './parties/id/accounts';
-import { Disclaimer } from './pages/disclaimer';
 
 export type Navigable = {
   path: string;
@@ -336,17 +335,6 @@ export const routerConfig: Route[] = [
           },
         ],
       },
-      {
-        path: Routes.DISCLAIMER,
-        element: <Disclaimer />,
-        handle: {
-          name: t('Disclaimer'),
-          text: t('Disclaimer'),
-          breadcrumb: () => (
-            <Link to={Routes.DISCLAIMER}>{t('Disclaimer')}</Link>
-          ),
-        },
-      },
       ...partiesRoutes,
       ...assetsRoutes,
       ...genesisRoutes,

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

@@ -5,43 +5,17 @@ import { TxsInfiniteList } from '../../../components/txs';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 
-import { useState } from 'react';
+const BE_TXS_PER_REQUEST = 20;
-import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
-
-const BE_TXS_PER_REQUEST = 15;
 
 export const TxsList = () => {
   useDocumentTitle(['Transactions']);
 
-  return (
-    <section className="md:p-2 lg:p-4 xl:p-6 relative">
-      <RouteTitle>{t('Transactions')}</RouteTitle>
-      <TxsListFiltered />
-    </section>
-  );
-};
-
-export const TxsListFiltered = () => {
-  const [filters, setFilters] = useState(new Set(AllFilterOptions));
-
-  const f =
-    filters && filters.size === 1
-      ? `filters[cmd.type]=${Array.from(filters)[0]}`
-      : '';
-
   const { hasMoreTxs, loadTxs, error, txsData, refreshTxs, loading } =
-    useTxsData({
+    useTxsData({ limit: BE_TXS_PER_REQUEST });
-      limit: BE_TXS_PER_REQUEST,
-      filters: f,
-    });
-
   return (
-    <>
+    <section className="md:p-2 lg:p-4 xl:p-6">
-      <menu className="mb-2">
+      <RouteTitle>{t('Transactions')}</RouteTitle>
-        <BlocksRefetch refetch={refreshTxs} />
+      <BlocksRefetch refetch={refreshTxs} />
-        <TxsFilter filters={filters} setFilters={setFilters} />
-      </menu>
-
       <TxsInfiniteList
         hasMoreTxs={hasMoreTxs}
         areTxsLoading={loading}
@@ -50,6 +24,6 @@ export const TxsListFiltered = () => {
         error={error}
         className="mb-28"
       />
-    </>
+    </section>
   );
 };

apps/governance-e2e/cypress.config.js

@@ -26,7 +26,6 @@ module.exports = defineConfig({
     viewportWidth: 1440,
     viewportHeight: 900,
     numTestsKeptInMemory: 5,
-    downloadsFolder: 'cypress/downloads',
     testIsolation: false,
   },
   env: {
@@ -49,7 +48,7 @@ module.exports = defineConfig({
     vegaTokenContractAddress: '0xF41bD86d462D36b997C0bbb4D97a0a3382f205B7',
     vegaTokenAddress: '0x67175Da1D5e966e40D11c4B2519392B2058373de',
     txTimeout: { timeout: 70000 },
-    epochTimeout: { timeout: 12000 },
+    epochTimeout: { timeout: 6000 },
     blockConfirmations: 3,
     grepTags: '@regression @smoke @slow',
     grepFilterSpecs: true,

apps/governance-e2e/src/fixtures/mocks/previous-epoch.ts

@@ -1,63 +0,0 @@
-export const previousEpochData = {
-  epoch: {
-    id: '7611',
-    validatorsConnection: {
-      edges: [
-        {
-          node: {
-            id: 'cd96782bc0ad5679869cf69fe7838a92212da7f53b4a214bed68067117494122',
-            stakedTotal: '3154229668720612941799',
-            rewardScore: {
-              rawValidatorScore: '0.2',
-              performanceScore: '1',
-              multisigScore: '0',
-              validatorScore: '0.2',
-              normalisedScore: '0.2007216887087119',
-              validatorStatus: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-              __typename: 'RewardScore',
-            },
-            rankingScore: {
-              status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-              previousStatus: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-              rankingScore: '0.211713765544955625',
-              stakeScore: '0.2016321576618625',
-              performanceScore: '1',
-              votingPower: '2007',
-              __typename: 'RankingScore',
-            },
-            __typename: 'Node',
-          },
-          __typename: 'NodeEdge',
-        },
-        {
-          node: {
-            id: '887d936f797a47032eceb572a13b69b581d3b1fa595a7d021a3e3cf2a5d2acfd',
-            stakedTotal: '3151161904761904764551',
-            rewardScore: {
-              rawValidatorScore: '0.2',
-              performanceScore: '1',
-              multisigScore: '1',
-              validatorScore: '0.2',
-              normalisedScore: '0.2007216887087119',
-              validatorStatus: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-              __typename: 'RewardScore',
-            },
-            rankingScore: {
-              status: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-              previousStatus: 'VALIDATOR_NODE_STATUS_TENDERMINT',
-              rankingScore: '0.211507855409133255',
-              stakeScore: '0.2014360527706031',
-              performanceScore: '1',
-              votingPower: '2007',
-              __typename: 'RankingScore',
-            },
-            __typename: 'Node',
-          },
-          __typename: 'NodeEdge',
-        },
-      ],
-      __typename: 'NodesConnection',
-    },
-    __typename: 'Epoch',
-  },
-};

apps/governance-e2e/src/integration/flow/proposal-details.cy.ts

@@ -14,34 +14,27 @@ import {
   submitUniqueRawProposal,
   voteForProposal,
 } from '../../../../governance-e2e/src/support/governance.functions';
-import {
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governance-e2e/src/support/staking.functions';
-  ensureSpecifiedUnstakedTokensAreAssociated,
-  stakingPageAssociateTokens,
-  stakingPageDisassociateAllTokens,
-} from '../../../../governance-e2e/src/support/staking.functions';
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
-import {
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../../../governance-e2e/src/support/wallet-teardown.functions';
-  switchVegaWalletPubKey,
-  vegaWalletSetSpecifiedApprovalAmount,
-} from '../../support/wallet-functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
 
 const proposalVoteProgressForPercentage =
-  'vote-progress-indicator-percentage-for';
+  '[data-testid="vote-progress-indicator-percentage-for"]';
 const proposalVoteProgressAgainstPercentage =
-  'vote-progress-indicator-percentage-against';
+  '[data-testid="vote-progress-indicator-percentage-against"]';
-const proposalVoteProgressForTokens = 'vote-progress-indicator-tokens-for';
+const proposalVoteProgressForTokens =
+  '[data-testid="vote-progress-indicator-tokens-for"]';
 const proposalVoteProgressAgainstTokens =
-  'vote-progress-indicator-tokens-against';
+  '[data-testid="vote-progress-indicator-tokens-against"]';
-const changeVoteButton = 'change-vote-button';
+const changeVoteButton = '[data-testid="change-vote-button"]';
-const proposalDetailsTitle = 'proposal-title';
+const proposalDetailsTitle = '[data-testid="proposal-title"]';
-const proposalDetailsDescription = 'proposal-description';
+const proposalDetailsDescription = '[data-testid="proposal-description"]';
-const openProposals = 'open-proposals';
+const openProposals = '[data-testid="open-proposals"]';
-const viewProposalButton = 'view-proposal-btn';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const proposalDescriptionToggle = 'proposal-description-toggle';
 const voteBreakdownToggle = 'vote-breakdown-toggle';
-const proposalTermsToggle = 'proposal-json-toggle';
+const proposalTermsToggle = 'proposal-terms-toggle';
 
 describe(
   'Governance flow for proposal details',
@@ -50,7 +43,7 @@ describe(
     before('connect wallets and set approval limit', function () {
       cy.visit('/');
       ethereumWalletConnect();
-      // cy.associateTokensToVegaWallet('1');
+      cy.associateTokensToVegaWallet('1');
     });
 
     beforeEach('visit proposals tab', function () {
@@ -71,37 +64,25 @@ describe(
 
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        cy.getByTestId(openProposals).within(() => {
+        cy.get(openProposals).within(() => {
           getProposalFromTitle(rawProposal.rationale.title).within(() => {
-            cy.getByTestId(viewProposalButton).should('be.visible').click();
+            cy.get(viewProposalButton).should('be.visible').click();
           });
         });
-        cy.getByTestId(proposalDetailsTitle).should(
+        cy.get(proposalDetailsTitle).should(
           'contain.text',
           rawProposal.rationale.title
         );
-        cy.getByTestId(proposalDescriptionToggle).click();
+        cy.get(proposalDetailsDescription)
-        cy.getByTestId('proposal-description-toggle');
-        cy.getByTestId(proposalDetailsDescription)
           .find('p')
           .should('have.text', proposalDescription);
       });
-      // 3001-VOTE-008
-      getProposalInformationFromTable('ID')
-        .invoke('text')
-        .should('not.be.empty')
-        .and('have.length', 64);
-      // 3001-VOTE-009
-      getProposalInformationFromTable('Proposed by')
-        .invoke('text')
-        .should('not.be.empty')
-        .and('have.length', 64);
       cy.getByTestId(proposalTermsToggle).click();
-      // 3001-VOTE-052 3001-VOTE-010
+      // 3001-VOTE-052
       cy.get('code.language-json')
         .should('exist')
         .within(() => {
-          cy.get('.hljs-attr').eq(0).should('have.text', '"id"');
+          cy.get('.hljs-string').eq(0).should('have.text', '"ProposalTerms"');
         });
     });
 
@@ -109,6 +90,8 @@ describe(
     it('Newly created freeform proposal details - shows proposed and closing dates', function () {
       const proposalTitle = generateFreeFormProposalTitle();
       const proposalTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+      // const currentDate = new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
+      // const proposedDate = new Date(currentDate.getTime() + 60000)
 
       submitUniqueRawProposal({
         proposalTitle: proposalTitle,
@@ -116,7 +99,7 @@ describe(
       });
       navigateTo(navigation.proposals);
       getProposalFromTitle(proposalTitle).within(() =>
-        cy.getByTestId(viewProposalButton).click()
+        cy.get(viewProposalButton).click()
       );
       cy.wrap(
         formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
@@ -126,9 +109,16 @@ describe(
           closingDate
         );
       });
-      getProposalInformationFromTable('Proposed on')
+      cy.wrap(
-        .invoke('text')
+        formatDateWithLocalTimezone(
-        .should('not.be.empty');
+          new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
+        )
+      ).then((proposalDate) => {
+        getProposalInformationFromTable('Proposed on').should(
+          'have.text',
+          proposalDate
+        );
+      });
     });
 
     it('Newly created proposal details - shows default status set to fail', function () {
@@ -138,7 +128,7 @@ describe(
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
         );
       });
       cy.contains('Participation: Not Met 0.00 0.00%(0.00% Required)').should(
@@ -165,7 +155,7 @@ describe(
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
         );
       });
       // 3001-VOTE-080
@@ -182,16 +172,14 @@ describe(
           .contains(votedDate)
           .should('be.visible');
       });
-      cy.getByTestId(proposalVoteProgressForPercentage) // 3001-VOTE-072
+      cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
         .contains('100.00%')
         .and('be.visible');
-      cy.getByTestId(proposalVoteProgressAgainstPercentage)
+      cy.get(proposalVoteProgressAgainstPercentage)
         .contains('0.00%')
         .and('be.visible');
-      cy.getByTestId(proposalVoteProgressForTokens)
+      cy.get(proposalVoteProgressForTokens).contains('1.00').and('be.visible');
-        .contains('1.00')
+      cy.get(proposalVoteProgressAgainstTokens)
-        .and('be.visible');
-      cy.getByTestId(proposalVoteProgressAgainstTokens)
         .contains('0.00')
         .and('be.visible');
       cy.getByTestId(voteBreakdownToggle).click();
@@ -212,15 +200,15 @@ describe(
       getProposalInformationFromTable('Number of voting parties')
         .should('have.text', '1')
         .and('be.visible');
-      cy.getByTestId(changeVoteButton).should('be.visible').click();
+      cy.get(changeVoteButton).should('be.visible').click();
       voteForProposal('for');
       // 3001-VOTE-064
       getProposalInformationFromTable('Tokens for proposal')
         .should('have.text', (1).toFixed(2))
         .and('be.visible');
-      cy.getByTestId(changeVoteButton).should('be.visible').click();
+      cy.get(changeVoteButton).should('be.visible').click();
       voteForProposal('against');
-      cy.getByTestId(proposalVoteProgressAgainstPercentage)
+      cy.get(proposalVoteProgressAgainstPercentage)
         .contains('100.00%')
         .and('be.visible');
       getProposalInformationFromTable('Tokens against proposal')
@@ -237,15 +225,13 @@ describe(
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
         );
       });
       voteForProposal('for');
       // 3001-VOTE-079
       cy.contains('You voted: For').should('be.visible');
-      cy.getByTestId(proposalVoteProgressForTokens)
+      cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
-        .contains('1')
-        .and('be.visible');
       cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Total Supply')
         .invoke('text')
@@ -261,22 +247,22 @@ describe(
           navigateTo(navigation.proposals);
           cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
             getProposalFromTitle(rawProposal.rationale.title).within(() =>
-              cy.getByTestId(viewProposalButton).click()
+              cy.get(viewProposalButton).click()
             );
           });
-          cy.getByTestId(proposalVoteProgressForPercentage)
+          cy.get(proposalVoteProgressForPercentage)
             .contains('100.00%')
             .and('be.visible');
-          cy.getByTestId(proposalVoteProgressAgainstPercentage)
+          cy.get(proposalVoteProgressAgainstPercentage)
             .contains('0.00%')
             .and('be.visible');
           // 3001-VOTE-065
-          cy.getByTestId(changeVoteButton).should('be.visible').click();
+          cy.get(changeVoteButton).should('be.visible').click();
           voteForProposal('for');
-          cy.getByTestId(proposalVoteProgressForTokens)
+          cy.get(proposalVoteProgressForTokens)
             .contains(tokensRequiredToAchieveResult)
             .and('be.visible');
-          cy.getByTestId(proposalVoteProgressAgainstTokens)
+          cy.get(proposalVoteProgressAgainstTokens)
             .contains('0.00')
             .and('be.visible');
           cy.getByTestId(voteBreakdownToggle).click();
@@ -307,36 +293,5 @@ describe(
             .and('be.visible');
         });
     });
-
-    it('Able to vote for proposal twice by switching public key', function () {
-      ensureSpecifiedUnstakedTokensAreAssociated('1');
-      createRawProposal();
-      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
-        );
-        voteForProposal('for');
-        cy.contains('You voted: For').should('be.visible');
-        ethereumWalletConnect();
-        switchVegaWalletPubKey();
-        stakingPageAssociateTokens('2');
-        navigateTo(navigation.proposals);
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
-        );
-        cy.getByTestId('you-voted').should('not.exist');
-        voteForProposal('against');
-        cy.contains('You voted: Against').should('be.visible');
-        switchVegaWalletPubKey();
-        cy.getByTestId(proposalVoteProgressForTokens).should(
-          'contain.text',
-          '1.00'
-        );
-        // Checking vote status for different public keys is displayed correctly
-        cy.contains('You voted: For').should('be.visible');
-      });
-      switchVegaWalletPubKey();
-      stakingPageDisassociateAllTokens();
-    });
   }
 );

apps/governance-e2e/src/integration/flow/proposal-enacted.cy.ts

@@ -14,18 +14,17 @@ 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-functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';
 
 const proposalListItem = '[data-testid="proposals-list-item"]';
-const closedProposals = 'closed-proposals';
+const closedProposals = '[data-testid="closed-proposals"]';
-const proposalStatus = 'proposal-status';
+const proposalStatus = '[data-testid="proposal-status"]';
-const viewProposalButton = 'view-proposal-btn';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const votesTable = 'votes-table';
+const votesTable = '[data-testid="votes-table"]';
-const openProposals = 'open-proposals';
+const openProposals = '[data-testid="open-proposals"]';
 const proposalVoteProgressForPercentage =
-  'vote-progress-indicator-percentage-for';
+  '[data-testid="vote-progress-indicator-percentage-for"]';
 const proposalTimeout = { timeout: 8000 };
 
 context(
@@ -44,7 +43,6 @@ context(
       waitForSpinner();
       cy.connectVegaWallet();
       ethereumWalletConnect();
-      ensureSpecifiedUnstakedTokensAreAssociated('1');
       navigateTo(navigation.proposals);
     });
 
@@ -55,18 +53,18 @@ context(
       cy.createMarket();
       cy.reload();
       waitForSpinner();
-      cy.getByTestId(closedProposals).within(() => {
+      cy.get(closedProposals).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
           .within(() => {
-            cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
+            cy.get(proposalStatus).should('have.text', 'Enacted');
-            cy.getByTestId(viewProposalButton).click();
+            cy.get(viewProposalButton).click();
           });
       });
       cy.getByTestId('proposal-type').should('have.text', 'New market');
-      cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
+      cy.get(proposalStatus).should('have.text', 'Enacted');
-      cy.getByTestId(votesTable).within(() => {
+      cy.get(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
       });
@@ -81,27 +79,21 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.getByTestId(openProposals).within(() => {
+      cy.get(openProposals).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
-          .within(() => cy.getByTestId(viewProposalButton).click());
+          .within(() => cy.get(viewProposalButton).click());
       });
-      cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus).should('have.text', 'Open');
       voteForProposal('for');
-      cy.getByTestId(proposalStatus, proposalTimeout)
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Passed');
-        .should('have.text', 'Passed')
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
-        .then(() => {
+      cy.get(votesTable).within(() => {
-          cy.getByTestId(proposalStatus, proposalTimeout).should(
-            'have.text',
-            'Enacted'
-          );
-        });
-      cy.getByTestId(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
       });
-      cy.getByTestId(proposalVoteProgressForPercentage)
+      cy.get(proposalVoteProgressForPercentage)
         .contains('100.00%')
         .and('be.visible');
     });
@@ -115,18 +107,15 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.getByTestId(openProposals, { timeout: 6000 }).within(() => {
+      cy.get(openProposals, { timeout: 6000 }).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
-          .within(() => cy.getByTestId(viewProposalButton).click());
+          .within(() => cy.get(viewProposalButton).click());
       });
-      cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus).should('have.text', 'Open');
       voteForProposal('for');
-      cy.getByTestId(proposalStatus, proposalTimeout).should(
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
-        'have.text',
-        'Enacted'
-      );
     });
 
     // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -137,17 +126,14 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.getByTestId(openProposals).within(() => {
+      cy.get(openProposals).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
-          .within(() => cy.getByTestId(viewProposalButton).click());
+          .within(() => cy.get(viewProposalButton).click());
       });
-      cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus).should('have.text', 'Open');
-      cy.getByTestId(proposalStatus, proposalTimeout).should(
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Declined');
-        'have.text',
-        'Declined'
-      );
       getProposalInformationFromTable('Rejection reason')
         .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
         .and('be.visible');

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

@@ -11,6 +11,7 @@ import {
   governanceProposalType,
   submitUniqueRawProposal,
   voteForProposal,
+  waitForProposalSubmitted,
   waitForProposalSync,
 } from '../../support/governance.functions';
 
@@ -32,23 +33,28 @@ import {
 import {
   vegaWalletSetSpecifiedApprovalAmount,
   vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
 
-const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
+const vegaWalletStakedBalances =
-const vegaWalletAssociatedBalance = 'associated-amount';
+  '[data-testid="vega-wallet-balance-staked-validators"]';
-const vegaWalletNameElement = 'wallet-name';
+const vegaWalletAssociatedBalance = '[data-testid="associated-amount"]';
-const vegaWallet = 'vega-wallet';
+const vegaWalletNameElement = '[data-testid="wallet-name"]';
-const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
+const vegaWallet = '[data-testid="vega-wallet"]';
-const newProposalSubmitButton = 'proposal-submit';
+const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
-const viewProposalButton = 'view-proposal-btn';
+const newProposalSubmitButton = '[data-testid="proposal-submit"]';
-const rawProposalData = 'proposal-data';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const voteButtons = 'vote-buttons';
+const rawProposalData = '[data-testid="proposal-data"]';
+const minVoteButton = '[data-testid="min-vote"]';
+const maxVoteButton = '[data-testid="max-vote"]';
+const voteButtons = '[data-testid="vote-buttons"]';
+const votingDate = '[data-testid="voting-date"]';
+const voteTwoMinExtraNote = '[data-testid="voting-2-mins-extra"]';
 const rejectProposalsLink = '[href="/proposals/rejected"]';
-const feedbackError = 'Error';
+const feedbackError = '[data-testid="Error"]';
-const noOpenProposals = 'no-open-proposals';
+const noOpenProposals = '[data-testid="no-open-proposals"]';
-const noClosedProposals = 'no-closed-proposals';
+const noClosedProposals = '[data-testid="no-closed-proposals"]';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
@@ -92,15 +98,16 @@ context(
     // Test can only pass if run before other proposal tests.
     it.skip('Should be able to see that no proposals exist', function () {
       // 3001-VOTE-003
-      cy.getByTestId(noOpenProposals)
+      cy.get(noOpenProposals)
         .should('be.visible')
         .and('have.text', 'There are no open or yet to enact proposals');
-      cy.getByTestId(noClosedProposals)
+      cy.get(noClosedProposals)
         .should('be.visible')
         .and('have.text', 'There are no enacted or rejected proposals');
     });
 
-    // 3002-PROP-002 3002-PROP-003 3001-VOTE-012 3007-PNE-020 3004-PMAC-004 3005-PASN-004 3008-PFRO-016 3003-PMAN-004
+    // 3002-PROP-002
+    // 3002-PROP-003
     it('Proposal form - shows how many vega tokens are required to make a proposal', function () {
       // 3002-PROP-005
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
@@ -109,14 +116,23 @@ context(
       ).should('be.visible');
     });
 
-    // 3002-PROP-011 3008-PFRO-005
+    // Skipping as currently unable to propose using forms other than raw
-    it('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
+    // 3002-PROP-011
-      ensureSpecifiedUnstakedTokensAreAssociated('1');
+    it.skip('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
-      verifyUnstakedBalance(1);
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
-      createRawProposal();
+      cy.get(minVoteButton).should('be.visible'); // 3002-PROP-008
+      cy.get(maxVoteButton).should('be.visible');
+      cy.get(votingDate).should('not.be.empty');
+      cy.get(voteTwoMinExtraNote).should(
+        'contain.text',
+        'we add 2 minutes of extra time'
+      );
+      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
+      // 3002-PROP-012
+      // 3002-PROP-016
+      waitForProposalSubmitted();
     });
 
-    // 3008-PFRO-002 3008-PFRO-004
     it('Able to submit a valid freeform proposal - with minimum required tokens associated - but also staked', function () {
       ensureSpecifiedUnstakedTokensAreAssociated('2');
       verifyUnstakedBalance(2);
@@ -125,22 +141,23 @@ context(
       stakingValidatorPageAddStake('2');
       closeStakingDialog();
 
-      cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+      cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
-        'contain',
-        '2'
-      );
       createRawProposal();
     });
 
-    it('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
+    it.skip('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       enterUniqueFreeFormProposalBody('0.1', generateFreeFormProposalTitle());
+
+      cy.contains('Awaiting network confirmation', epochTimeout).should(
+        'not.exist'
+      );
       cy.get('input:invalid')
         .invoke('prop', 'validationMessage')
         .should('equal', 'Value must be greater than or equal to 1.');
     });
 
-    it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
+    it.skip('Creating a proposal - proposal rejected - when closing time later than system default', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       enterUniqueFreeFormProposalBody(
         '100000',
@@ -170,7 +187,7 @@ context(
         getProposalFromTitle(rawProposal.rationale.title).within(() => {
           cy.contains('Rejected').should('be.visible');
           cy.contains('Close time too late').should('be.visible');
-          cy.getByTestId(viewProposalButton).click();
+          cy.get(viewProposalButton).click();
         });
       });
       cy.getByTestId('proposal-status').should('have.text', 'Rejected');
@@ -187,14 +204,14 @@ context(
       const errorMsg =
         'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)';
       vegaWalletTeardown();
-      cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).contains(
+      cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
         '0.00',
         txTimeout
       );
       goToMakeNewProposal(governanceProposalType.RAW);
       enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
       closeDialog();
     });
 
@@ -207,7 +224,7 @@ context(
       goToMakeNewProposal(governanceProposalType.RAW);
       enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
       closeDialog();
     });
 
@@ -223,17 +240,17 @@ context(
           createTenDigitUnixTimeStampForSpecifiedDays(8);
         freeformProposal.unexpected = `i shouldn't be here`;
         const proposalPayload = JSON.stringify(freeformProposal);
-        cy.getByTestId(rawProposalData).type(proposalPayload, {
+        cy.get(rawProposalData).type(proposalPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
 
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
       closeDialog();
-      cy.getByTestId(rawProposalData)
+      cy.get(rawProposalData)
         .invoke('val')
         .should('contain', "i shouldn't be here");
     });
@@ -251,32 +268,18 @@ context(
         rawProposal.terms.unexpectedField = `i shouldn't be here`;
         const proposalPayload = JSON.stringify(rawProposal);
 
-        cy.getByTestId(rawProposalData).type(proposalPayload, {
+        cy.get(rawProposalData).type(proposalPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
 
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.getByTestId(feedbackError).should('have.text', errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
       closeDialog();
     });
 
-    // 3007-PNE-022 3007-PNE-023 3004-PMAC-006 3004-PMAC-007 3005-PASN-006 3005-PASN-007
-    // 3006-PASC-006 3006-PASC-007 3008-PFRO-018 3008-PFRO-019 3003-PMAN-006 3003-PMAN-007
-    it('Unable to submit proposal without valid json', function () {
-      goToMakeNewProposal(governanceProposalType.RAW);
-      cy.getByTestId(newProposalSubmitButton).click();
-      cy.getByTestId('input-error-text').should('have.text', 'Required');
-      cy.getByTestId(rawProposalData).type('Not a valid json string');
-      cy.getByTestId(newProposalSubmitButton).click();
-      cy.getByTestId('input-error-text').should(
-        'have.text',
-        'Must be valid JSON'
-      );
-    });
-
     // 1005-PROP-009
     it('Unable to vote on a freeform proposal - when some but not enough vega associated', function () {
       const proposalTitle = generateFreeFormProposalTitle();
@@ -285,22 +288,22 @@ context(
       submitUniqueRawProposal({ proposalTitle: proposalTitle });
       ethereumWalletConnect();
       stakingPageDisassociateTokens('0.0001');
-      cy.getByTestId(vegaWallet)
+      cy.get(vegaWallet)
         .first()
         .within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.9999'
           );
         });
       navigateTo(navigation.proposals);
       getProposalFromTitle(proposalTitle).within(() =>
-        cy.getByTestId(viewProposalButton).click()
+        cy.get(viewProposalButton).click()
       );
       cy.contains('Vote breakdown').should('be.visible', {
         timeout: 10000,
       });
-      cy.getByTestId(voteButtons).should('not.exist');
+      cy.get(voteButtons).should('not.exist');
       cy.getByTestId('min-proposal-requirements').should(
         'have.text',
         `You must have at least ${this.minVoterBalance} VEGA associated to vote on this proposal`
@@ -313,20 +316,20 @@ context(
       cy.get('[data-testid="disconnect"]').click();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.getByTestId(viewProposalButton).click()
+          cy.get(viewProposalButton).click()
         );
       });
       // 3001-VOTE-075
       // 3001-VOTE-076
-      cy.getByTestId(connectToVegaWalletButton)
+      cy.get(connectToVegaWalletButton)
         .should('be.visible')
         .and('have.text', 'Connect Vega wallet')
         .click();
       cy.getByTestId('connector-jsonRpc').click();
-      cy.getByTestId(vegaWalletNameElement).should('be.visible');
+      cy.get(vegaWalletNameElement).should('be.visible');
-      cy.getByTestId(connectToVegaWalletButton).should('not.exist');
+      cy.get(connectToVegaWalletButton).should('not.exist');
       // 3001-VOTE-100
-      cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).contains(
+      cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
         '1.00',
         txTimeout
       );

apps/governance-e2e/src/integration/flow/proposal-forms.cy.ts

@@ -1,68 +1,64 @@
 import {
   closeDialog,
-  dissociateFromSecondWalletKey,
   navigateTo,
   navigation,
   turnTelemetryOff,
   waitForSpinner,
 } from '../../support/common.functions';
-import {
-  getDownloadedProposalJsonPath,
-  getProposalFromTitle,
-  submitUniqueRawProposal,
-} from '../../support/governance.functions';
 import {
   getProposalInformationFromTable,
   goToMakeNewProposal,
   governanceProposalType,
   voteForProposal,
+  waitForProposalSubmitted,
 } from '../../support/governance.functions';
-import {
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
-  ensureSpecifiedUnstakedTokensAreAssociated,
-  stakingPageAssociateTokens,
-  stakingPageDisassociateAllTokens,
-} from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
-  switchVegaWalletPubKey,
-  vegaWalletFaucetAssetsWithoutCheck,
   vegaWalletSetSpecifiedApprovalAmount,
   vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
 
 const proposalListItem = '[data-testid="proposals-list-item"]';
-const openProposals = 'open-proposals';
+const openProposals = '[data-testid="open-proposals"]';
-const proposalType = 'proposal-type';
+const proposalType = '[data-testid="proposal-type"]';
-const proposalDetails = 'proposal-details';
+const proposalDetails = '[data-testid="proposal-details"]';
-const newProposalSubmitButton = 'proposal-submit';
+const newProposalSubmitButton = '[data-testid="proposal-submit"]';
-const proposalVoteDeadline = 'proposal-vote-deadline';
+const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
-const proposalParameterSelect = 'proposal-parameter-select';
+const proposalValidationDeadline =
-const proposalMarketSelect = 'proposal-market-select';
+  '[data-testid="proposal-validation-deadline"]';
-const newProposalTitle = 'proposal-title';
+const proposalParameterSelect = '[data-testid="proposal-parameter-select"]';
-const newProposalDescription = 'proposal-description';
+const proposalMarketSelect = '[data-testid="proposal-market-select"]';
-const newProposalTerms = 'proposal-terms';
+const newProposalTitle = '[data-testid="proposal-title"]';
-const newProposedParameterValue = 'selected-proposal-param-new-value';
+const newProposalDescription = '[data-testid="proposal-description"]';
-const minVoteDeadline = 'min-vote';
+const newProposalTerms = '[data-testid="proposal-terms"]';
-const maxVoteDeadline = 'max-vote';
+const currentParameterValue =
-const minValidationDeadline = 'min-validation';
+  '[data-testid="selected-proposal-param-current-value"]';
-const minEnactDeadline = 'min-enactment';
+const newProposedParameterValue =
-const maxEnactDeadline = 'max-enactment';
+  '[data-testid="selected-proposal-param-new-value"]';
-const inputError = 'input-error-text';
+const minVoteDeadline = '[data-testid="min-vote"]';
-const enactmentDeadlineError = 'enactment-before-voting-deadline';
+const maxVoteDeadline = '[data-testid="max-vote"]';
-const proposalDownloadBtn = 'proposal-download-json';
+const minValidationDeadline = '[data-testid="min-validation"]';
+const minEnactDeadline = '[data-testid="min-enactment"]';
+const maxEnactDeadline = '[data-testid="max-enactment"]';
+const inputError = '[data-testid="input-error-text"]';
+const enactmentDeadlineError =
+  '[data-testid="enactment-before-voting-deadline"]';
+const proposalDownloadBtn = '[data-testid="proposal-download-json"]';
 const feedbackError = '[data-testid="Error"]';
 const viewProposalBtn = 'view-proposal-btn';
 const liquidityVoteStatus = 'liquidity-votes-status';
 const tokenVoteStatus = 'token-votes-status';
-const proposalJsonToggle = 'proposal-json-toggle';
+const proposalTermsSection = 'proposal';
-const proposalJsonSection = 'proposal-json';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const fUSDCId =
   '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
+const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
 // 3001-VOTE-007
-context(
+context.skip(
   'Governance flow - form validations for different governance proposals',
   { tags: '@slow' },
   function () {
@@ -83,98 +79,94 @@ context(
       navigateTo(navigation.proposals);
     });
 
+    it('Able to submit valid update network parameter proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
+      // 3002-PROP-006
+      cy.get(newProposalTitle).type('Test update network parameter proposal');
+      // 3002-PROP-007
+      cy.get(newProposalDescription).type('E2E test for proposals');
+
+      cy.get(proposalParameterSelect).find('option').should('have.length', 117);
+      cy.get(proposalParameterSelect).select(
+        // 3007-PNEC-002
+        'governance_proposal_asset_minEnact'
+      );
+      cy.get(currentParameterValue).should('have.value', '2s');
+      cy.get(newProposedParameterValue).type('5s'); // 3007-PNEC-003
+      cy.get(newProposalSubmitButton).should('be.visible').click();
+      waitForProposalSubmitted();
+    });
+
     it('Unable to submit network parameter with missing/invalid fields', function () {
       navigateTo(navigation.proposals);
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.getByTestId(proposalDownloadBtn).click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
+      cy.get(inputError).should('have.length', 3);
-      cy.getByTestId(newProposalTitle).type(
+      cy.get(newProposalTitle).type(
         'Invalid update network parameter proposal'
       );
-      cy.getByTestId(newProposalDescription).type(
+      cy.get(newProposalDescription).type('E2E invalid test for proposals');
-        'E2E invalid test for proposals'
+      cy.get(proposalParameterSelect).select(
-      );
-      cy.getByTestId(proposalParameterSelect).select(
         'spam_protection_proposal_min_tokens'
       );
-      cy.getByTestId(newProposedParameterValue).type('0');
+      cy.get(newProposedParameterValue).type('0');
-      cy.getByTestId(proposalVoteDeadline).clear().type('0');
+      cy.get(proposalVoteDeadline).clear().type('0');
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).click();
-        .click()
+      cy.contains('Awaiting network confirmation', epochTimeout).should(
-        .then(() => {
+        'not.exist'
-          cy.wrap(
+      );
-            getDownloadedProposalJsonPath('vega-network-param-proposal-')
+      cy.get(proposalVoteDeadline).clear().type('9000');
-          ).then((filePath) => {
+      cy.get(newProposalSubmitButton).click();
-            goToMakeNewProposal(governanceProposalType.RAW);
+      cy.contains('Awaiting network confirmation', epochTimeout).should(
-            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
+        'not.exist'
-          });
+      );
-        });
-      cy.getByTestId(newProposalSubmitButton).click();
-      validateDialogContentMsg('PROPOSAL_ERROR_CLOSE_TIME_TOO_SOON');
     });
 
-    // 3007-PNEC-001 3007-PNEC-003
+    it('Able to download network param proposal json', function () {
-    it('Able to download and submit network param proposal', function () {
+      const downloadFolder = './cypress/downloads/';
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      // 3007-PNEC-006
+      cy.log('Download proposal file');
-      cy.getByTestId(newProposalTitle)
+      cy.get(proposalDownloadBtn)
-        .siblings()
-        .should('contain.text', '(100 characters or less)');
-      // 3007-PNEC-004 3007-PNEC-005
-      cy.getByTestId(newProposalTitle).type(
-        'Test update network parameter proposal'
-      );
-      // 3007-PNEC-009
-      cy.getByTestId(newProposalDescription)
-        .siblings()
-        .should('contain.text', '(20,000 characters or less)');
-      // 3007-PNEC-007 3007-PNEC-008
-      cy.getByTestId(newProposalDescription).type(
-        'E2E test for downloading proposals'
-      );
-      // 3007-PNEC-010
-      cy.getByTestId(proposalParameterSelect).select(
-        'governance_proposal_asset_minClose'
-      );
-      // 3007-PNEC-011
-      cy.getByTestId(newProposedParameterValue).type('10s');
-      // 3007-PNEC-012
-      cy.getByTestId(proposalVoteDeadline).clear().type('2');
-      // 3007-PNEC-013 3007-PNEC-014
-      cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
-      // 3007-PNEC-015
-      cy.getByTestId(maxEnactDeadline).click();
-      // 3007-PNEC-016
-      cy.getByTestId('enactment-date').invoke('text').should('not.be.empty');
-      // 3007-PNEC-017
-      cy.contains(
-        'Time till enactment (must be equal to or after vote close)'
-      ).should('be.visible');
-      // 3007-PNE-018
-      cy.log('Download updated proposal file');
-      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
-          cy.wrap(
+          const filename =
-            getDownloadedProposalJsonPath('vega-network-param-proposal-')
+            downloadFolder +
-          ).then((filePath) => {
+            'vega-network-param-proposal-' +
-            cy.readFile(String(filePath), { timeout: 14000 }).then(
+            getFormattedTime() +
-              (jsonFile) => {
+            '.json';
-                cy.wrap(jsonFile)
+          cy.readFile(filename, proposalTimeout)
-                  .its('rationale.description')
+            .its('terms.updateNetworkParameter')
-                  .should('eq', 'E2E test for downloading proposals');
+            .should('exist');
-                cy.wrap(jsonFile)
+        });
-                  .its('terms.updateNetworkParameter.changes.key')
+
-                  .should('eq', 'governance.proposal.asset.minClose');
+      cy.get(newProposalDescription).type('E2E test for downloading proposals');
-                cy.wrap(jsonFile)
+      cy.get(proposalParameterSelect).select(
-                  .its('terms.updateNetworkParameter.changes.value')
+        'governance_proposal_asset_minClose'
-                  .should('eq', '10s');
+      );
-              }
+      cy.get(newProposedParameterValue).type('10s');
-            );
+
-            // 3007-PNE-019
+      cy.log('Download updated proposal file');
-            goToMakeNewProposal(governanceProposalType.RAW);
+      cy.get(proposalDownloadBtn)
-            submitUniqueRawProposal({ proposalBody: filePath });
+        .should('be.visible')
+        .click()
+        .then(() => {
+          const filename =
+            downloadFolder +
+            'vega-network-param-proposal-' +
+            getFormattedTime() +
+            '.json';
+          cy.get(proposalDownloadBtn).should('be.visible').click();
+          cy.readFile(filename, proposalTimeout).then((jsonFile) => {
+            cy.wrap(jsonFile)
+              .its('rationale.description')
+              .should('eq', 'E2E test for downloading proposals');
+            cy.wrap(jsonFile)
+              .its('terms.updateNetworkParameter.changes.key')
+              .should('eq', 'governance.proposal.asset.minClose');
+            cy.wrap(jsonFile)
+              .its('terms.updateNetworkParameter.changes.value')
+              .should('eq', '10s');
           });
         });
     });
@@ -182,153 +174,86 @@ context(
     it('Unable to submit network parameter proposal with vote deadline above enactment deadline', function () {
       navigateTo(navigation.proposals);
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.getByTestId(newProposalTitle).type(
+      cy.get(newProposalTitle).type('Test update network parameter proposal');
-        'Test update network parameter proposal'
+      cy.get(newProposalDescription).type('invalid deadlines');
-      );
+      cy.get(proposalParameterSelect).select(
-      cy.getByTestId(newProposalDescription).type('invalid deadlines');
-      cy.getByTestId(proposalParameterSelect).select(
         'spam_protection_proposal_min_tokens'
       );
-      cy.getByTestId(newProposedParameterValue).type('0');
+      cy.get(newProposedParameterValue).type('0');
-      cy.getByTestId(proposalVoteDeadline).clear().type('0');
+      cy.get(proposalVoteDeadline).clear().type('0');
-      cy.getByTestId(maxVoteDeadline).click();
+      cy.get(maxVoteDeadline).click();
-      cy.getByTestId(enactmentDeadlineError).should(
+      cy.get(enactmentDeadlineError).should(
         'have.text',
-        'The proposal will fail if enactment is earlier than the voting deadline'
+        'Proposal will fail if enactment is earlier than the voting deadline'
       );
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).click();
-        .should('be.visible')
+      cy.get(feedbackError).should(
-        .click()
+        'have.text',
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-network-param-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
-          });
-        });
-      cy.getByTestId(newProposalSubmitButton).click();
-      validateFeedBackMsg(
         'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
       );
+      closeDialog();
+      cy.get(minVoteDeadline).click();
+      cy.get(enactmentDeadlineError).should('not.exist');
     });
 
     // 3003-PMAN-001
-    it(
+    it('Able to submit valid new market proposal', function () {
-      'Able to submit valid new market proposal',
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      { tags: '@smoke' },
+      cy.get(newProposalTitle).type('Test new market proposal');
-      function () {
+      cy.get(newProposalDescription).type('E2E test for proposals');
-        const proposalTitle = 'Test new market proposal';
+      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
-        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+        const newMarketPayload = JSON.stringify(newMarketProposal);
-        cy.getByTestId(newProposalTitle).type('Test new market proposal');
+        cy.get(newProposalTerms).type(newMarketPayload, {
-        cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+          parseSpecialCharSequences: false,
-        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
+          delay: 2,
-          const newMarketPayload = JSON.stringify(newMarketProposal);
-          cy.getByTestId(newProposalTerms).type(newMarketPayload, {
-            parseSpecialCharSequences: false,
-            delay: 2,
-          });
         });
-        cy.getByTestId(proposalDownloadBtn)
+      });
-          .should('be.visible')
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-          .click()
+      waitForProposalSubmitted();
-          .then(() => {
+    });
-            cy.wrap(
-              getDownloadedProposalJsonPath('vega-new-market-proposal-')
-            ).then((filePath) => {
-              goToMakeNewProposal(governanceProposalType.RAW);
-              submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
-            });
-          });
-        navigateTo(navigation.proposals);
-        getProposalFromTitle(proposalTitle).within(() =>
-          cy.getByTestId('view-proposal-btn').click()
-        );
-        cy.getByTestId('proposal-market-data').within(() => {
-          cy.getByTestId('proposal-market-data-toggle').click();
-          cy.contains('Key details').click();
-          getMarketProposalDetailsFromTable('Name').should(
-            'have.text',
-            'Token test market'
-          );
-          cy.contains('Settlement asset').click();
-          // Settlement asset symbol
-          cy.getByTestId('3_value').should('have.text', 'fBTC');
-          cy.contains('Oracle').click();
-          cy.getByTestId('oracle-spec-links').should('have.attr', 'href');
-        });
-      }
-    );
 
     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';
 
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
+      cy.get(inputError).should('have.length', 3);
-      cy.getByTestId(newProposalTitle).type('Test new market proposal');
+      cy.get(newProposalTitle).type('Test new market proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/new-market').then((newMarketProposal) => {
         newMarketProposal.invalid = 'I am an invalid field';
         const newMarketPayload = JSON.stringify(newMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newMarketPayload, {
+        cy.get(newProposalTerms).type(newMarketPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-        .should('be.visible')
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-new-market-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
-          });
-        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      validateFeedBackMsg(errorMsg);
+      cy.get(feedbackError).should('have.text', errorMsg);
     });
 
     // Will fail if run after 'Able to submit update market proposal and vote for proposal'
     // 3002-PROP-022
     it('Unable to submit update market proposal without equity-like share in the market', function () {
-      switchVegaWalletPubKey();
-      stakingPageAssociateTokens('1');
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type(
+      cy.get(newProposalTitle).type('Test update market proposal - rejected');
-        'Test update market proposal - rejected'
+      cy.get(newProposalDescription).type('E2E test for proposals');
-      );
+      cy.get(proposalMarketSelect).select('Test market 1');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-        .should('be.visible')
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-update-market-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
-          });
-        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
-      validateDialogContentMsg('PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
+      cy.getByTestId('dialog-content')
-      closeDialog();
+        .find('p')
-      ethereumWalletConnect();
+        .should('have.text', 'PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
-      stakingPageDisassociateAllTokens();
+      ensureSpecifiedUnstakedTokensAreAssociated('1');
-      switchVegaWalletPubKey();
     });
 
     // 3002-PROP-020
@@ -340,37 +265,25 @@ context(
         vegaWalletPublicKey
       );
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type(
+      cy.get(newProposalTitle).type('Test update market proposal - rejected');
-        'Test update market proposal - rejected'
+      cy.get(newProposalDescription).type('E2E test for proposals');
-      );
+      cy.get(proposalMarketSelect).select('Test market 1');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-        .should('be.visible')
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-update-market-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath, submit: false });
-          });
-        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      validateFeedBackMsg(
+      cy.get(feedbackError).should(
+        'have.text',
         'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)'
       );
     });
 
-    // 3001-VOTE-092 3004-PMAC-001 3004-PMAC-003
+    // 3001-VOTE-092 3004-PMAC-001
     it('Able to submit update market proposal and vote for proposal', function () {
       vegaWalletFaucetAssetsWithoutCheck(
         fUSDCId,
@@ -378,9 +291,9 @@ context(
         vegaWalletPublicKey
       );
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type('Test update market proposal');
+      cy.get(newProposalTitle).type('Test update market proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
+      cy.get(proposalMarketSelect).select('Test market 1');
       cy.get('[data-testid="update-market-details"]').within(() => {
         cy.get('dd').eq(0).should('have.text', 'Test market 1');
         cy.get('dd').eq(1).should('have.text', 'TEST.24h');
@@ -395,25 +308,16 @@ context(
       });
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-        .should('be.visible')
+      waitForProposalSubmitted();
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-update-market-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath });
-          });
-        });
       navigateTo(navigation.proposals);
       cy.get('@EnactedMarketId').then((marketId) => {
-        cy.contains(String(marketId).slice(0, 6))
+        cy.contains(String(marketId))
           .parentsUntil(proposalListItem)
           .last()
           .within(() => {
@@ -437,45 +341,46 @@ context(
         'contain.text',
         'Currently expected to pass'
       );
-      cy.getByTestId('vote-breakdown-toggle').click();
       getProposalInformationFromTable('Expected to pass')
         .contains('👍 by token vote')
         .should('be.visible');
     });
 
-    // 3001-VOTE-026 3001-VOTE-027 3001-VOTE-028 3001-VOTE-095 3001-VOTE-096 3005-PASN-001
+    // 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.getByTestId(newProposalTitle).type(proposalTitle);
+      cy.get(newProposalTitle).type(proposalTitle);
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/new-asset').then((newAssetProposal) => {
         const newAssetPayload = JSON.stringify(newAssetProposal);
-        cy.getByTestId(newProposalTerms).type(newAssetPayload, {
+        cy.get(newProposalTerms).type(newAssetPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.getByTestId(minVoteDeadline).click();
+      cy.get(minVoteDeadline).click();
-      cy.getByTestId(minValidationDeadline).click();
+      cy.get(minValidationDeadline).click();
-      cy.getByTestId(minEnactDeadline).click();
+      cy.get(minEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-        .should('be.visible')
+      cy.contains('Awaiting network confirmation', epochTimeout).should(
-        .click()
+        'be.visible'
-        .then(() => {
+      );
-          cy.wrap(
+      cy.contains('Proposal waiting for node vote', proposalTimeout).should(
-            getDownloadedProposalJsonPath('vega-new-asset-proposal-')
+        'be.visible'
-          ).then((filePath) => {
+      );
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath, submit: false }); // 3005-PASN-003
-          });
-        });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       closeDialog();
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').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');
-      validateDialogContentMsg('PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE');
+      cy.getByTestId('dialog-content')
+        .last()
+        .within(() => {
+          cy.get('p').should(
+            'have.text',
+            'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE'
+          );
+        });
       closeDialog();
       navigateTo(navigation.proposals);
       cy.contains(proposalTitle)
@@ -484,8 +389,7 @@ context(
         .within(() => {
           cy.getByTestId(viewProposalBtn).click();
         });
-      cy.getByTestId(proposalJsonToggle).click();
+      cy.getByTestId(proposalTermsSection).within(() => {
-      cy.getByTestId(proposalJsonSection).within(() => {
         cy.contains('USDT Coin').should('be.visible');
         cy.contains('USDT').should('be.visible');
       });
@@ -493,8 +397,15 @@ context(
 
     it('Unable to submit new asset proposal with missing/invalid fields', function () {
       goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
+      cy.get(inputError).should('have.length', 3);
+      cy.get(newProposalTitle).type('Invalid new asset proposal');
+      cy.get(newProposalDescription).type('Invalid E2E test for proposals');
+      cy.get(proposalValidationDeadline).clear().type('2');
+      cy.get(newProposalSubmitButton).click();
+      cy.contains('Awaiting network confirmation', epochTimeout).should(
+        'not.exist'
+      );
     });
 
     it('Able to submit update asset proposal using min deadline', function () {
@@ -503,30 +414,18 @@ context(
 
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
-      cy.getByTestId(minVoteDeadline).click();
+      cy.get(minVoteDeadline).click();
-      cy.getByTestId(minEnactDeadline).click();
+      cy.get(minEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-        .should('be.visible')
+      waitForProposalSubmitted();
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-update-asset-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath });
-          });
-        });
       navigateTo(navigation.proposals);
-      cy.getByTestId(openProposals).within(() => {
+      cy.get(openProposals).within(() => {
-        cy.getByTestId(proposalType)
+        cy.get(proposalType)
           .contains('Update asset')
           .parentsUntil(proposalListItem)
           .last()
           .within(() => {
-            cy.getByTestId(proposalDetails).should(
+            cy.get(proposalDetails).should('contain.text', assetId); // 3001-VOTE-029
-              'contain.text',
-              assetId.slice(0, 6)
-            ); // 3001-VOTE-029
             cy.getByTestId(viewProposalBtn).click();
           });
       });
@@ -534,115 +433,49 @@ context(
         .invoke('text')
         .should('not.be.empty');
       // 3001-VOTE-030 3001-VOTE-031
-      cy.getByTestId(proposalJsonToggle).click();
+      cy.getByTestId(proposalTermsSection).within(() => {
-      cy.getByTestId(proposalJsonSection).within(() => {
+        cy.contains('UpdateAsset').should('be.visible');
-        cy.contains(assetId).should('be.visible');
+        cy.contains('UpdateERC20').should('be.visible');
-        cy.contains('lifetimeLimit').should('be.visible');
+        cy.contains('"lifetimeLimit": "10"').should('be.visible');
-        cy.contains('10').should('be.visible');
       });
     });
 
-    // 3006-PASC-001 3006-PASC-003
     it('Able to submit update asset proposal using max deadline', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
-      cy.getByTestId(maxVoteDeadline).click();
+      cy.get(maxVoteDeadline).click();
-      cy.getByTestId(maxEnactDeadline).click();
+      cy.get(maxEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-        .should('be.visible')
+      waitForProposalSubmitted();
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-update-asset-proposal-')
-          ).then((filePath) => {
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath });
-          });
-        });
     });
 
     it('Unable to submit edit asset proposal with missing/invalid fields', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
+      cy.get(inputError).should('have.length', 3);
     });
 
-    it('Able to download and submit freeform proposal', function () {
+    function getFormattedTime() {
-      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      const now = new Date();
-      // 3008-PFRO-006
+      const day = now.getDate().toString().padStart(2, '0');
-      cy.getByTestId(newProposalTitle)
+      const month = now.toLocaleString('en-US', { month: 'short' });
-        .siblings()
+      const year = now.getFullYear().toString();
-        .should('contain.text', '(100 characters or less)'); // 3008-PFRO-007
+      const hours = now.getHours().toString().padStart(2, '0');
-      // 3008-PFRO-005
+      const minutes = now.getMinutes().toString().padStart(2, '0');
-      cy.getByTestId(newProposalTitle).type('Test freeform proposal form');
-      // 3008-PFRO-009
-      cy.getByTestId(newProposalDescription)
-        .siblings()
-        .should('contain.text', '(20,000 characters or less)'); // 3008-PFRO-010
-      // 3008-PFRO-008 3002-PROP-012 3002-PROP-016
-      cy.getByTestId(newProposalDescription).type(
-        'E2E test for downloading freeform proposal'
-      );
-      // 3008-PFRO-012
-      cy.getByTestId(minVoteDeadline).should('exist'); // 3002-PROP-008
-      cy.getByTestId(maxVoteDeadline).should('exist');
-      // 3008-PFRO-011
-      cy.getByTestId(proposalVoteDeadline).clear().type('2');
-      // 3008-PFRO-013 3008-PFRO-014
-      cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
-      // 3008-PFRO-015
-      cy.log('Download updated proposal file');
-      cy.getByTestId(proposalDownloadBtn)
-        .should('be.visible')
-        .click()
-        .then(() => {
-          cy.wrap(
-            getDownloadedProposalJsonPath('vega-freeform-proposal-')
-          ).then((filePath) => {
-            // 3008-PFRO-019
-            goToMakeNewProposal(governanceProposalType.RAW);
-            submitUniqueRawProposal({ proposalBody: filePath });
-          });
-        });
-    });
 
-    after('Disassociate from second wallet key if present', function () {
+      return `${day}-${month}-${year}-${hours}-${minutes}`;
-      cy.reload();
-      waitForSpinner();
-      ethereumWalletConnect();
-      dissociateFromSecondWalletKey();
-    });
-
-    function validateDialogContentMsg(expectedMsg: string) {
-      cy.getByTestId('dialog-content')
-        .last()
-        .within(() => {
-          cy.get('p').should('have.text', expectedMsg);
-        });
-    }
-
-    function validateFeedBackMsg(expectedMsg: string) {
-      cy.get(feedbackError).should('have.text', expectedMsg);
     }
 
     function enterUpdateAssetProposalDetails() {
-      cy.getByTestId(newProposalTitle).type('Test update asset proposal');
+      cy.get(newProposalTitle).type('Test update asset proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/update-asset').then((newAssetProposal) => {
         const newAssetPayload = JSON.stringify(newAssetProposal);
-        cy.getByTestId(newProposalTerms).type(newAssetPayload, {
+        cy.get(newProposalTerms).type(newAssetPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
     }
-
-    function getMarketProposalDetailsFromTable(heading: string) {
-      return cy
-        .getByTestId('key-value-table-row')
-        .contains(heading)
-        .parent()
-        .siblings();
-    }
   }
 );

apps/governance-e2e/src/integration/flow/proposal-list.cy.ts

@@ -21,15 +21,15 @@ import {
 } from '../../support/governance.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';
 
 const proposalListItem = 'proposals-list-item';
-const openProposals = 'open-proposals';
+const openProposals = '[data-testid="open-proposals"]';
 const voteStatus = 'vote-status';
 const proposalType = 'proposal-type';
 const proposalStatus = 'proposal-status';
-const proposalClosingDate = 'vote-details';
+const proposalClosingDate = '[data-testid="vote-details"]';
-const viewProposalButton = 'view-proposal-btn';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const voteBreakDownToggle = 'vote-breakdown-toggle';
 
 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
@@ -62,13 +62,13 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     }
 
     navigateTo(navigation.proposals);
-    cy.getByTestId(openProposals).within(() => {
+    cy.get(openProposals).within(() => {
-      cy.getByTestId(proposalClosingDate)
+      cy.get(proposalClosingDate)
         .first()
         .invoke('text')
         .should('match', /days|minutes/);
-      cy.getByTestId(proposalClosingDate).should('contain.text', 'months');
+      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.getByTestId(proposalClosingDate).last().should('contain.text', 'year');
+      cy.get(proposalClosingDate).last().should('contain.text', 'year');
     });
   });
 
@@ -77,7 +77,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     const proposalTitle = generateFreeFormProposalTitle();
 
     submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    cy.get('[data-testid="proposal-filter-toggle"]').click();
+    cy.get('[data-testid="set-proposals-filter-visible"]').click();
     cy.get('[data-testid="filter-input"]').type(proposerId);
     // cy.get(`#${proposalId}`).should('contain', proposalId);
     cy.contains(proposalTitle).should('be.visible');
@@ -86,12 +86,11 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
   });
 
   it('Newly created proposals list - shows title and portion of summary', function () {
-    const proposalPath = 'src/fixtures/proposals/new-market-raw.json';
+    const proposalPath = '/proposals/new-market-raw.json';
-    const proposalTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
+    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
     submitUniqueRawProposal({
       proposalBody: proposalPath,
-      enactmentTimestamp: proposalTimestamp,
+      enactmentTimestamp: enactmentTimestamp,
-      closingTimestamp: proposalTimestamp,
     }); // 3001-VOTE-052
     // 3001-VOTE-008
     // 3001-VOTE-034
@@ -106,7 +105,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     createRawProposal(this.minProposerBalance);
     cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
       getProposalFromTitle(rawProposal.rationale.title).within(() => {
-        cy.getByTestId(viewProposalButton).should('be.visible');
+        cy.get(viewProposalButton).should('be.visible');
         cy.getByTestId(proposalType).should('have.text', 'Freeform');
         cy.getByTestId(proposalStatus).should('have.text', 'Open');
       });
@@ -124,13 +123,13 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
         'have.text',
         'Participation not reached'
       );
-      cy.getByTestId(viewProposalButton).click();
+      cy.get(viewProposalButton).click();
     });
     voteForProposal('for');
     navigateTo(navigation.proposals);
     getProposalFromTitle(proposalTitle).within(() => {
       cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
-      cy.getByTestId(viewProposalButton).click();
+      cy.get(viewProposalButton).click();
     });
     cy.getByTestId(voteBreakDownToggle).click();
     getProposalInformationFromTable('Token participation met')

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

@@ -7,6 +7,7 @@ import {
 import {
   clickOnValidatorFromList,
   closeStakingDialog,
+  stakingPageAssociateTokens,
   stakingValidatorPageAddStake,
   waitForBeginningOfEpoch,
 } from '../../support/staking.functions';
@@ -14,10 +15,11 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
   depositAsset,
   vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
 
 const vegaAssetAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de';
-const vegaWalletUnstakedBalance = 'vega-wallet-balance-unstaked';
+const vegaWalletUnstakedBalance =
+  '[data-testid="vega-wallet-balance-unstaked"]';
 const rewardsTable = 'epoch-total-rewards-table';
 const txTimeout = Cypress.env('txTimeout');
 const rewardsTimeOut = { timeout: 60000 };
@@ -28,22 +30,20 @@ context('rewards - flow', { tags: '@slow' }, function () {
     turnTelemetryOff();
     cy.visit('/');
     waitForSpinner();
+    depositAsset(vegaAssetAddress, '1000', 18);
+    cy.validatorsSelfDelegate();
     ethereumWalletConnect();
     cy.connectVegaWallet();
-    depositAsset(vegaAssetAddress, '1000', 18);
+    cy.VegaWalletTopUpRewardsPool(30, 200);
-    cy.getByTestId('currency-title', txTimeout).should(
-      'contain.text',
-      'Collateral'
-    );
-    vegaWalletTeardown();
-    cy.associateTokensToVegaWallet('6000');
     navigateTo(navigation.validators);
-    cy.VegaWalletTopUpRewardsPool();
+    vegaWalletTeardown();
-    cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
+    stakingPageAssociateTokens('6000');
+    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
       'contain',
       '6,000.0',
       txTimeout
     );
+    cy.get('button').contains('Select a validator to nominate').click();
     clickOnValidatorFromList(0);
     stakingValidatorPageAddStake('3000');
     closeStakingDialog();

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

@@ -4,6 +4,7 @@ import {
   verifyStakedBalance,
   verifyEthWalletTotalAssociatedBalance,
   verifyEthWalletAssociatedBalance,
+  waitForSpinner,
   navigateTo,
   navigation,
   turnTelemetryOff,
@@ -24,7 +25,7 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
   vegaWalletSetSpecifiedApprovalAmount,
   vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
 const stakeValidatorListTotalStake = 'total-stake';
 const stakeValidatorListTotalShare = 'total-stake-share';
 const stakeValidatorListStakePercentage = 'stake-percentage';
@@ -53,11 +54,12 @@ context(
   'Staking Tab - with eth and vega wallets connected',
   { tags: '@slow' },
   function () {
-    // 1002-STKE-002, 1002-STKE-032
+    // 2001-STKE-002, 2001-STKE-032
     before('visit staking tab and connect vega wallet', function () {
       cy.visit('/');
       ethereumWalletConnect();
-      cy.connectVegaWallet();
+      // this is a workaround for #2422 which can be removed once issue is resolved
+      cy.associateTokensToVegaWallet('4');
       vegaWalletSetSpecifiedApprovalAmount('1000');
     });
 
@@ -67,48 +69,33 @@ context(
         function () {
           cy.clearLocalStorage();
           turnTelemetryOff();
-          // Go to homepage to allow wallet teardown without epoch timer refreshing page
+          cy.reload();
-          navigateTo(navigation.home);
+          waitForSpinner();
-          vegaWalletTeardown();
+          cy.connectVegaWallet();
+          ethereumWalletConnect();
           navigateTo(navigation.validators);
         }
       );
 
-      // 1002-STKE-035 1002-STKE-036
-      it('Unable to stake against a validator with less than minimum and more than associated amount', function () {
-        ensureSpecifiedUnstakedTokensAreAssociated('3');
-        verifyUnstakedBalance(3.0);
-        verifyEthWalletTotalAssociatedBalance('3.0');
-        verifyEthWalletAssociatedBalance('3.0');
-        cy.get('button').contains('Select a validator to nominate').click();
-        clickOnValidatorFromList(0);
-        cy.getByTestId(stakeAddStakeRadioButton, epochTimeout).click({
-          force: true,
-        });
-        cy.getByTestId(stakeTokenAmountInputBox).type('0.001');
-        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
-        cy.getByTestId(stakeTokenAmountInputBox).clear().type('4');
-        cy.getByTestId(stakeTokenSubmitButton).should('be.disabled');
-      });
       it('Able to stake against a validator - using vega from wallet', function () {
         ensureSpecifiedUnstakedTokensAreAssociated('3');
         verifyUnstakedBalance(3.0);
         verifyEthWalletTotalAssociatedBalance('3.0');
         verifyEthWalletAssociatedBalance('3.0');
         cy.get('button').contains('Select a validator to nominate').click();
-        // 1002-STKE-031
+        // 2001-STKE-031
         clickOnValidatorFromList(0);
-        // 1002-STKE-033, 1002-STKE-034, 1002-STKE-037
+        // 2001-STKE-033, 2001-STKE-034, 2001-STKE-037
         stakingValidatorPageAddStake('2');
         verifyUnstakedBalance(1.0);
-        // 1002-STKE-039
+        // 2001-STKE-039
         verifyStakedBalance(2.0);
-        verifyNextEpochValue(2.0); // 1002-STKE-016 1002-STKE-038
+        verifyNextEpochValue(2.0); // 2001-STKE-016 2001-STKE-038
-        verifyThisEpochValue(2.0); // 1002-STKE-013
+        verifyThisEpochValue(2.0); // 2001-STKE-013
         closeStakingDialog();
         navigateTo(navigation.validators);
 
-        // 2002-SINC-007 1002-STKE-015 1002-STKE-017 1002-STKE-052
+        // 2002-SINC-007
         validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
       });
 
@@ -122,12 +109,10 @@ context(
         cy.getByTestId(userStake, epochTimeout)
           .first()
           .should('have.text', '2.00');
-        waitForBeginningOfEpoch();
         cy.getByTestId('total-stake').first().realHover();
         cy.getByTestId('staked-by-user-tooltip')
           .first()
           .should('have.text', 'Staked by me: 2.00');
-        waitForBeginningOfEpoch();
         cy.getByTestId('total-pending-stake').first().realHover();
         cy.getByTestId('pending-user-stake-tooltip')
           .first()
@@ -232,7 +217,7 @@ context(
           });
       });
 
-      // 1002-STKE-041 1002-STKE-053
+      // 2001-STKE-041
       it(
         'Able to remove part of a stake against a validator',
         { tags: '@smoke' },
@@ -245,11 +230,11 @@ context(
           verifyUnstakedBalance(1.0);
           closeStakingDialog();
           navigateTo(navigation.validators);
-          // 1002-STKE-040
+          // 2001-STKE-040
           clickOnValidatorFromList(0);
-          // 1002-STKE-044, 1002-STKE-048
+          // 2001-STKE-044, 2001-STKE-048
           stakingValidatorPageRemoveStake('1');
-          // 1002-STKE-049
+          // 2001-STKE-049
           verifyNextEpochValue(2.0);
           verifyUnstakedBalance(2.0);
           verifyStakedBalance(2.0);
@@ -269,7 +254,7 @@ context(
         }
       );
 
-      // 1002-STKE-045
+      // 2001-STKE-045
       it('Able to remove a full stake against a validator', function () {
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
@@ -317,7 +302,6 @@ context(
           .and('be.visible');
       });
 
-      // 1002-STKE-046 1002-STKE-047
       it('Unable to remove a stake greater than staked amount next epoch for a validator', function () {
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
@@ -395,10 +379,6 @@ context(
       });
 
       it('Disassociating some tokens - prioritizes unstaked tokens', function () {
-        vegaWalletSetSpecifiedApprovalAmount('1000');
-        cy.reload();
-        ethereumWalletConnect();
-        cy.connectVegaWallet();
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -421,7 +401,7 @@ context(
       });
 
       it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -435,7 +415,7 @@ context(
       });
 
       it('Associating vesting contract tokens - when some already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('3', { type: 'contract' });
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -449,7 +429,7 @@ context(
       });
 
       it('Associating vesting contract tokens - when wallet tokens already staked - auto stakes tokens to staked validator', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('3', { type: 'wallet' });
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -463,7 +443,7 @@ context(
       });
 
       it('Associating tokens - with multiple validators already staked - auto stakes to staked validators - abiding by existing stake ratio', function () {
-        // 1002-STKE-004
+        // 2001-STKE-004
         stakingPageAssociateTokens('6');
         verifyUnstakedBalance(6.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -504,6 +484,10 @@ context(
         );
       });
 
+      afterEach('Teardown Wallet', function () {
+        vegaWalletTeardown();
+      });
+
       function verifyNextEpochValue(amount: number) {
         cy.getByTestId('stake-next-epoch', epochTimeout)
           .contains(amount, epochTimeout)
@@ -511,7 +495,7 @@ context(
       }
 
       function verifyThisEpochValue(amount: number) {
-        cy.getByTestId('stake-this-epoch', epochTimeout) // 1002-STKE-013
+        cy.getByTestId('stake-this-epoch', epochTimeout) // 2001-STKE-013
           .contains(amount, epochTimeout)
           .should('be.visible');
       }

apps/governance-e2e/src/integration/flow/token-association-flow.cy.ts

@@ -14,31 +14,31 @@ import {
 } from '../../support/staking.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import {
-  switchVegaWalletPubKey,
   vegaWalletAssociate,
   vegaWalletDisassociate,
   vegaWalletSetSpecifiedApprovalAmount,
   vegaWalletTeardown,
-} from '../../support/wallet-functions';
+} from '../../support/wallet-teardown.functions';
 
-const ethWalletContainer = 'ethereum-wallet';
+const ethWalletContainer = '[data-testid="ethereum-wallet"]';
-const vegaWalletAssociatedBalance = 'currency-value';
+const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
-const vegaWalletUnstakedBalance = 'vega-wallet-balance-unstaked';
+const vegaWalletUnstakedBalance =
-const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
+  '[data-testid="vega-wallet-balance-unstaked"]';
-const associateWalletRadioButton = 'associate-radio-wallet';
-const tokenAmountInputBox = 'token-amount-input';
-const tokenSubmitButton = 'token-input-submit-button';
-const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
-const vestingContractSection = 'vega-in-vesting-contract';
-const vegaInWalletSection = 'vega-in-wallet';
-const connectedVegaKey = 'connected-vega-key';
-const associatedKey = 'associated-key';
-const associatedAmount = 'associated-amount';
-const associateCompleteText = 'transaction-complete-body';
-const disassociationWarning = 'disassociation-warning';
-const vegaWallet = 'aside [data-testid="vega-wallet"]';
-const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
 const txTimeout = Cypress.env('txTimeout');
+const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
+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 vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
+const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
+const connectedVegaKey = '[data-testid="connected-vega-key"]';
+const associatedKey = '[data-testid="associated-key"]';
+const associatedAmount = '[data-testid="associated-amount"]';
+const associateCompleteText = '[data-testid="transaction-complete-body"]';
+const disassociationWarning = '[data-testid="disassociation-warning"]';
+const vegaWallet = '[data-testid="vega-wallet"]';
 
 context(
   'Token association flow - with eth and vega wallets connected',
@@ -64,41 +64,46 @@ context(
         }
       );
 
-      it(
+      it('Able to associate tokens - from wallet', function () {
-        'Able to associate tokens - from wallet',
+        //1004-ASSO-003
-        { tags: '@smoke' },
+        //1004-ASSO-005
-        function () {
+        //1004-ASSO-009
-          //1004-ASSO-003
+        //1004-ASSO-030
-          //1004-ASSO-005
+        //1004-ASSO-012
-          //1004-ASSO-009
+        //1004-ASSO-013
-          //1004-ASSO-030
+        //1004-ASSO-014
-          //1004-ASSO-012
+        //1004-ASSO-015
-          //1004-ASSO-013
+        //1004-ASSO-030
-          //1004-ASSO-014
+        //0005-ETXN-006
-          //1004-ASSO-015
+        //0005-ETXN-003
-          //1004-ASSO-030
+        //0005-ETXN-005
-          //0005-ETXN-006
+        stakingPageAssociateTokens('2', { skipConfirmation: true });
-          //0005-ETXN-003
+
-          //0005-ETXN-005
+        cy.getByTestId('currency-title', txTimeout).should(
-          stakingPageAssociateTokens('2', { skipConfirmation: true });
+          'have.length.above',
-          validateWalletCurrency('Associated', '0.00');
+          6
-          validateWalletCurrency('Pending association', '2.00');
+        );
-          validateWalletCurrency('Total associated after pending', '2.00');
+        validateWalletCurrency('Associated', '0.00');
-          // 0005-ETXN-002
+        validateWalletCurrency('Pending association', '2.00');
-          verifyEthWalletAssociatedBalance('2.0');
+        validateWalletCurrency('Total associated after pending', '2.00');
-          verifyEthWalletTotalAssociatedBalance('2.0');
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
-          cy.get(vegaWallet).within(() => {
+
-            cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+        // 0005-ETXN-002
+        verifyEthWalletAssociatedBalance('2.0');
+
+        verifyEthWalletTotalAssociatedBalance('2.0');
+
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
               'contain',
               2.0
             );
           });
-          cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
+
-            'contain',
+        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
-            2.0
+      });
-          );
-        }
-      );
 
       it('Able to disassociate all associated tokens - manually', function () {
         // 1004-ASSO-025
@@ -111,11 +116,15 @@ context(
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('6,002.00');
         cy.get('button').contains('Select a validator to nominate').click();
-        cy.getByTestId('epoch-countdown').should('be.visible');
         stakingPageDisassociateTokens('2');
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         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.get(
           '[data-testid="eth-wallet-associated-balances"]:visible',
           txTimeout
@@ -128,32 +137,38 @@ context(
         stakingPageAssociateTokens('1001', { approve: true });
         verifyEthWalletAssociatedBalance('1,001.00');
         verifyEthWalletTotalAssociatedBalance('7,001.00');
-        cy.get(vegaWallet).within(() => {
+        cy.get(vegaWallet)
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          .last()
-            'contain',
+          .within(() => {
-            '1,001.00'
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          );
+              'contain',
-        });
+              '1,001.00'
+            );
+          });
       });
 
       it('Able to disassociate a partial amount of tokens currently associated', function () {
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet).within(() => {
+        cy.get(vegaWallet)
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          .first()
-            'contain',
+          .within(() => {
-            2.0
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          );
+              'contain',
-        });
+              2.0
+            );
+          });
+
         cy.get('button').contains('Select a validator to nominate').click();
-        cy.getByTestId('epoch-countdown').should('be.visible');
         stakingPageDisassociateTokens('1');
         verifyEthWalletAssociatedBalance('1.0');
-        cy.get(vegaWallet).within(() => {
+        cy.get(vegaWallet)
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          .first()
-            'contain',
+          .within(() => {
-            1.0
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          );
+              'contain',
-        });
+              1.0
+            );
+          });
       });
 
       it('Able to disassociate all tokens - using max', function () {
@@ -161,37 +176,40 @@ context(
         const warningText =
           'Warning: Any tokens that have been nominated to a node will sacrifice rewards they are due for the current epoch. If you do not wish to sacrifice these, you should remove stake from a node at the end of an epoch before disassociation.';
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet).within(() => {
+        cy.get(vegaWallet)
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          .first()
-            'contain',
+          .within(() => {
-            2.0
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          );
+              'contain',
-        });
+              2.0
+            );
+          });
         cy.get('button').contains('Select a validator to nominate').click();
-        cy.getByTestId('epoch-countdown').should('be.visible');
         cy.get(ethWalletDissociateButton).click();
-        cy.getByTestId(disassociationWarning).should('contain', warningText);
+        cy.get(disassociationWarning).should('contain', warningText);
         stakingPageDisassociateAllTokens();
-        cy.getByTestId(ethWalletContainer)
+        cy.get(ethWalletContainer)
           .first()
           .within(() => {
             cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
               'not.exist'
             );
           });
-        cy.getByTestId(ethWalletContainer)
+        cy.get(ethWalletContainer)
           .first()
           .within(() => {
             cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
               'not.exist'
             );
           });
-        cy.get(vegaWallet).within(() => {
+        cy.get(vegaWallet)
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          .first()
-            'contain',
+          .within(() => {
-            0.0
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          );
+              'contain',
-        });
+              0.0
+            );
+          });
       });
 
       it('Able to associate and disassociate vesting contract tokens', function () {
@@ -206,28 +224,38 @@ context(
           type: 'contract',
           skipConfirmation: true,
         });
+
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         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);
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
-        cy.get(vegaWallet).within(() => {
+        cy.get(vegaWallet)
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          .first()
-            'contain',
+          .within(() => {
-            2.0
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          );
+              'contain',
-        });
+              2.0
-        cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
+            );
-          'contain',
+          });
-          2.0
+        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
-        );
         stakingPageDisassociateTokens('1', {
           type: 'contract',
           skipConfirmation: true,
         });
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         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);
         verifyEthWalletAssociatedBalance('1.0');
         verifyEthWalletTotalAssociatedBalance('1.0');
       });
@@ -239,57 +267,62 @@ context(
         // 1004-ASSO-022
         stakingPageAssociateTokens('21', { type: 'wallet' });
         cy.get('button').contains('Select a validator to nominate').click();
-        cy.getByTestId('epoch-countdown').should('be.visible');
         stakingPageAssociateTokens('37', { type: 'contract' });
-        cy.getByTestId(vestingContractSection)
+        cy.get(vestingContractSection)
           .first()
           .within(() => {
-            cy.getByTestId(associatedKey).should(
+            cy.get(associatedKey).should(
               'contain',
               Cypress.env('vegaWalletPublicKeyShort')
             );
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 37);
+            cy.get(associatedAmount, txTimeout).should('contain', 37);
           });
-        cy.getByTestId(vegaInWalletSection)
+        cy.get(vegaInWalletSection)
           .first()
           .within(() => {
-            cy.getByTestId(associatedKey).should(
+            cy.get(associatedKey).should(
               'contain',
               Cypress.env('vegaWalletPublicKeyShort')
             );
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 21);
+            cy.get(associatedAmount, txTimeout).should('contain', 21);
+          });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              58
+            );
           });
-        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            58
-          );
-        });
         stakingPageDisassociateTokens('6', { type: 'contract' });
-        cy.getByTestId(vestingContractSection)
+        cy.get(vestingContractSection)
           .first()
           .within(() => {
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 31);
+            cy.get(associatedAmount, txTimeout).should('contain', 31);
+          });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              52
+            );
           });
-        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            52
-          );
-        });
         navigateTo(navigation.validators);
         stakingPageDisassociateTokens('9', { type: 'wallet' });
-        cy.getByTestId(vegaInWalletSection)
+        cy.get(vegaInWalletSection)
           .first()
           .within(() => {
-            cy.getByTestId(associatedAmount, txTimeout).should('contain', 12);
+            cy.get(associatedAmount, txTimeout).should('contain', 12);
+          });
+        cy.get(vegaWallet)
+          .first()
+          .within(() => {
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+              'contain',
+              43
+            );
           });
-        cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            43
-          );
-        });
       });
 
       it('Not able to associate more tokens than owned', function () {
@@ -297,18 +330,23 @@ context(
         // 1004-ASSO-010
         // No warning visible as described in AC, but the button is disabled
         cy.get(ethWalletAssociateButton).click();
-        cy.getByTestId(associateWalletRadioButton, { timeout: 30000 }).click();
+        cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
-        cy.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
+        cy.get(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
-        cy.getByTestId(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
+        cy.get(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
-        cy.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled');
+        cy.get(tokenSubmitButton, txTimeout).should('be.disabled');
       });
 
       // 1004-ASSO-004
       it('Pending association outside of app is shown', function () {
         vegaWalletAssociate('2');
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         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);
         validateWalletCurrency('Associated', '2.00');
       });
 
@@ -317,33 +355,41 @@ context(
         cy.wrap(validateWalletCurrency('Associated', '2.00')).then(() => {
           vegaWalletDisassociate('2');
         });
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         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);
         validateWalletCurrency('Associated', '0.00');
       });
 
       it('Able to associate tokens to different public key of connected vega wallet', function () {
         cy.get(ethWalletAssociateButton).click();
-        cy.getByTestId(associateWalletRadioButton).click();
+        cy.get(associateWalletRadioButton).click();
-        cy.getByTestId(connectedVegaKey).should(
+        cy.get(connectedVegaKey).should(
           'have.text',
           Cypress.env('vegaWalletPublicKey')
         );
 
-        switchVegaWalletPubKey();
+        cy.get('[data-testid="manage-vega-wallet"]:visible').click();
-        cy.getByTestId(connectedVegaKey).should(
+        cy.get('[data-testid="select-keypair-button"]').eq(0).click();
+        cy.get(connectedVegaKey).should(
           'have.text',
           Cypress.env('vegaWalletPublicKey2')
         );
         stakingPageAssociateTokens('2');
-        cy.get(vegaWallet).within(() => {
+        cy.get(vegaWallet)
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          .first()
-            'contain',
+          .within(() => {
-            2.0
+            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-          );
+              'contain',
-        });
+              2.0
-        cy.getByTestId(associateCompleteText).should(
+            );
+          });
+        cy.get(associateCompleteText).should(
           'have.text',
           `Vega key ${Cypress.env(
             'vegaWalletPublicKey2Short'

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

@@ -5,7 +5,7 @@ import {
   waitForSpinner,
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
-import { depositAsset } from '../../support/wallet-functions';
+import { depositAsset } from '../../support/wallet-teardown.functions';
 
 const withdraw = 'withdraw';
 const withdrawalForm = 'withdraw-form';
@@ -15,7 +15,13 @@ const balanceAvailable = 'BALANCE_AVAILABLE_value';
 const withdrawalThreshold = 'WITHDRAWAL_THRESHOLD_value';
 const delayTime = 'DELAY_TIME_value';
 const submitWithdrawalButton = 'submit-withdrawal';
+const dialogTitle = 'dialog-title';
 const dialogClose = 'dialog-close';
+const txExplorerLink = 'tx-block-explorer';
+const withdrawalAssetSymbol = 'withdrawal-asset-symbol';
+const withdrawalAmount = 'withdrawal-amount';
+const withdrawalRecipient = 'withdrawal-recipient';
+const withdrawFundsButton = 'withdraw-funds';
 const completeWithdrawalButton = 'complete-withdrawal';
 const tableTxHash = '[col-id="txHash"]';
 const tableAssetSymbol = '[col-id="asset.symbol"]';
@@ -24,16 +30,14 @@ const tableReceiverAddress = '[col-id="details.receiverAddress"]';
 const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
 const tableWithdrawnStatus = '[col-id="status"]';
 const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
-const toast = 'toast';
+const toastContent = 'toast-content';
 const toastPanel = 'toast-panel';
-const toastClose = 'toast-close';
-const withdrawalDialogContent = 'dialog-content';
-const toastCompleteWithdrawal = 'toast-complete-withdrawal';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
 const usdtSelectValue =
   '993ed98f4f770d91a796faab1738551193ba45c62341d20597df70fea6704ede';
+const truncatedWithdrawalEthAddress = '0xEe7D…22d94F';
 const formValidationError = 'input-error-text';
 const txTimeout = Cypress.env('txTimeout');
 
@@ -55,10 +59,6 @@ context(
       navigateTo(navigation.withdraw);
       cy.connectVegaWallet();
       ethereumWalletConnect();
-      cy.getByTestId('currency-title', txTimeout).should(
-        'contain.text',
-        usdtName
-      );
     });
 
     it('Able to open withdrawal form with vega wallet connected', function () {
@@ -73,10 +73,7 @@ context(
     it('Unable to submit withdrawal with invalid fields', function () {
       cy.getByTestId(withdraw).should('be.visible').click();
       cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
+        cy.get('select').select(usdtSelectValue, { force: true });
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(submitWithdrawalButton).click();
         cy.getByTestId(formValidationError).should('have.length', 1);
@@ -96,75 +93,62 @@ context(
       });
     });
 
-    it(
+    it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
-      'Able to withdraw asset: -eth wallet connected -withdraw funds button',
+      // fill in withdrawal form
-      { tags: '@smoke' },
+      cy.getByTestId(withdraw).should('be.visible').click();
-      function () {
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        // fill in withdrawal form
+        cy.get('select').select(usdtSelectValue, { force: true });
-        cy.getByTestId(withdraw).should('be.visible').click();
+        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-        cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+        cy.getByTestId(withdrawalThreshold).should(
-          cy.getByTestId('select-asset').click();
+          'have.text',
-          cy.get('select')
+          '100,000.00000T'
-            .select(usdtSelectValue, { force: true })
+        );
-            .should('have.value', usdtSelectValue);
+        cy.getByTestId(delayTime).should('have.text', 'None');
-          cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+        cy.getByTestId(amountInput).click().type('120');
-          cy.getByTestId(withdrawalThreshold).should(
+        cy.getByTestId(submitWithdrawalButton).click();
-            'have.text',
+      });
-            '100,000.00000T'
+
-          );
+      cy.contains('Awaiting network confirmation').should('be.visible');
-          cy.getByTestId(delayTime).should('have.text', 'None');
+      // assert withdrawal request
-          cy.getByTestId(amountInput).click().type('120');
+      cy.getByTestId(dialogTitle, txTimeout).should(
-          cy.getByTestId(submitWithdrawalButton).click();
+        'have.text',
+        'Transaction complete'
+      );
+      cy.getByTestId(txExplorerLink)
+        .should('have.attr', 'href')
+        .and('contain', '/txs/');
+      cy.getByTestId(withdrawalAssetSymbol).should('have.text', usdcSymbol);
+      cy.getByTestId(withdrawalAmount).should('have.text', '120.00');
+      cy.getByTestId(withdrawalRecipient)
+        .should('have.text', truncatedWithdrawalEthAddress)
+        .and('have.attr', 'href')
+        .and('contain', `/address/${Cypress.env('ethWalletPublicKey')}`);
+      cy.getByTestId(withdrawFundsButton).click();
+      // withdrawal complete
+      cy.getByTestId(dialogTitle, txTimeout).should(
+        'have.text',
+        'Withdraw asset complete'
+      );
+      cy.getByTestId(dialogClose).click();
+      // withdrawal history for complete withdrawal displayed
+      cy.get(tableWithdrawnStatus)
+        .eq(1, txTimeout)
+        .should('have.text', 'Completed')
+        .parent()
+        .within(() => {
+          cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
+          cy.get(tableAmount).should('have.text', '120.00');
+          cy.get(tableReceiverAddress)
+            .find('a')
+            .should('have.attr', 'href')
+            .and('contain', 'https://sepolia.etherscan.io/address/');
+          cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
+          cy.get(tableTxHash)
+            .find('a')
+            .should('have.attr', 'href')
+            .and('contain', 'https://sepolia.etherscan.io/tx/');
         });
-        // assert withdrawal request
+    });
-        cy.getByTestId(toast)
-          .first(txTimeout)
-          .should('contain.text', 'Funds unlocked')
-          .within(() => {
-            cy.getByTestId('external-link').should('exist');
-            cy.getByTestId(toastPanel).should(
-              'contain.text',
-              'Withdraw 120.00 tUSDC'
-            );
-            cy.getByTestId(toastCompleteWithdrawal).click();
-            cy.getByTestId(toastClose).click();
-          });
-        // withdrawal complete
-        cy.getByTestId(toast)
-          .first(txTimeout)
-          .should('contain.text', 'The withdrawal has been approved.')
-          .within(() => {
-            cy.getByTestId(toastPanel).should(
-              'contain.text',
-              'Withdraw 120.00 tUSDC'
-            );
-          });
-        cy.getByTestId(toast)
-          .last(txTimeout)
-          .should('contain.text', 'Transaction confirmed')
-          .within(() => {
-            cy.getByTestId('external-link').should('exist');
-          });
-        // withdrawal history for complete withdrawal displayed
-        cy.get(tableWithdrawnStatus)
-          .eq(1, txTimeout)
-          .should('have.text', 'Completed')
-          .parent()
-          .within(() => {
-            cy.get(tableAssetSymbol).should('have.text', usdcSymbol);
-            cy.get(tableAmount).should('have.text', '120.00');
-            cy.get(tableReceiverAddress)
-              .find('a')
-              .should('have.attr', 'href')
-              .and('contain', 'https://sepolia.etherscan.io/address/');
-            cy.get(tableWithdrawnTimeStamp).should('not.be.empty');
-            cy.get(tableTxHash)
-              .find('a')
-              .should('have.attr', 'href')
-              .and('contain', 'https://sepolia.etherscan.io/tx/');
-          });
-      }
-    );
 
     it('Able to withdraw asset: -eth wallet not connected', function () {
       const ethWalletAddress = Cypress.env('ethWalletPublicKey');
@@ -173,10 +157,7 @@ context(
       // fill in withdrawal form
       cy.getByTestId(withdraw).should('be.visible').click();
       cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
+        cy.get('select').select(usdtSelectValue, { force: true });
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
         cy.getByTestId(ethAddressInput).should('be.empty');
         cy.getByTestId(amountInput).click().type('110');
         cy.getByTestId(submitWithdrawalButton).click();
@@ -187,17 +168,13 @@ context(
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId(toast)
+      cy.contains('Awaiting network confirmation').should('be.visible');
-        .first(txTimeout)
+      // assert withdrawal request
-        .should('contain.text', 'Funds unlocked')
+      cy.getByTestId(dialogTitle, txTimeout).should(
-        .within(() => {
+        'have.text',
-          cy.getByTestId('external-link').should('exist');
+        'Transaction complete'
-          cy.getByTestId(toastPanel).should(
+      );
-            'contain.text',
+      cy.getByTestId(dialogClose).click();
-            'Withdraw 110.00 tUSDC'
-          );
-          cy.getByTestId(toastClose).click();
-        });
       cy.get(tableTxHash)
         .eq(1)
         .should('have.text', 'Complete withdrawal')
@@ -212,78 +189,28 @@ context(
           cy.get(tableCreatedTimeStamp).should('not.be.empty');
         });
       ethereumWalletConnect();
-      cy.getByTestId(completeWithdrawalButton).first().click();
+      cy.getByTestId(completeWithdrawalButton).click();
-      cy.getByTestId(toast)
+      cy.getByTestId(toastContent)
-        .last(txTimeout)
+        .last()
         .should('contain.text', 'Awaiting confirmation')
         .within(() => {
           cy.getByTestId('external-link').should('exist');
         });
-      cy.getByTestId(toast)
+      cy.getByTestId(toastContent)
-        .first(txTimeout)
+        .first()
         .should('contain.text', 'The withdrawal has been approved.')
         .within(() => {
           cy.getByTestId(toastPanel).should('contain.text', '110.00', 'tUSDC');
         });
-      cy.getByTestId(toast)
+      cy.getByTestId(toastContent)
-        .last(txTimeout)
+        .last()
         .should('contain.text', 'Transaction confirmed')
         .within(() => {
           cy.getByTestId('external-link').should('exist');
         });
     });
 
-    it('Should be able to see withdrawal details from toast', function () {
+    it('Unable to withdraw asset on pub key view', function () {
-      cy.getByTestId(withdraw).click();
-      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
-        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-        cy.getByTestId(withdrawalThreshold).should(
-          'have.text',
-          '100,000.00000T'
-        );
-        cy.getByTestId(amountInput).click().type('50');
-        cy.getByTestId(submitWithdrawalButton).click();
-      });
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'Funds unlocked')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 50.00 tUSDC'
-          );
-          cy.contains('save your withdrawal details').click();
-        });
-      cy.getByTestId(withdrawalDialogContent)
-        .last()
-        .within(() => {
-          cy.getByTestId('assetSource_value').should(
-            'have.text',
-            '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0'
-          );
-          cy.getByTestId('amount_value').should('have.text', '5000000');
-          cy.getByTestId('nonce_value').invoke('text').should('not.be.empty');
-          cy.getByTestId('signatures_value')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('targetAddress_value').should(
-            'have.text',
-            Cypress.env('ethWalletPublicKey')
-          );
-          cy.getByTestId('creation_value')
-            .invoke('text')
-            .should('not.be.empty');
-        });
-      cy.getByTestId(dialogClose).click();
-    });
-
-    // Skipping test due to bug #3882
-    it.skip('Unable to withdraw asset on pub key view', function () {
       const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
       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.`;
 
@@ -294,17 +221,13 @@ context(
       cy.connectPublicKey(vegaWalletPubKey);
       cy.getByTestId(withdraw).should('be.visible').click();
       cy.getByTestId(withdrawalForm, txTimeout).within(() => {
-        cy.getByTestId('select-asset').click();
+        cy.get('select').select(usdtSelectValue, { force: true });
-        cy.get('select')
-          .select(usdtSelectValue, { force: true })
-          .should('have.value', usdtSelectValue);
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(amountInput).click().type('100');
-        cy.pause();
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId(withdrawalDialogContent)
+      cy.getByTestId('dialog-content')
         .last()
         .within(() => {
           cy.get('h1').should('have.text', 'Transaction failed');

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

@@ -10,10 +10,10 @@ import {
 } from '../../support/governance.functions';
 import { mockNetworkUpgradeProposal } from '../../support/proposal.functions';
 
-const proposalDocsLink = 'proposal-docs-link';
+const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
-const proposalDocumentationLink = 'proposal-documentation-link';
+const newProposalLink = '[data-testid="new-proposal-link"]';
-const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
 const governanceDocsUrl = 'https://vega.xyz/governance';
+const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
 
 context(
   'Governance Page - verify elements on page',
@@ -32,17 +32,9 @@ context(
       verifyPageHeader('Proposals');
     });
 
-    // 3002-PROP-023 3004-PMAC-002 3005-PASN-002 3006-PASC-002 3007-PNEC-002 3008-PFRO-003
-    it('should have button for link to more information on proposals', function () {
-      const proposalsUrl = 'https://docs.vega.xyz/mainnet/tutorials/proposals';
-      cy.getByTestId('new-proposal-link')
-        .find('a')
-        .should('have.attr', 'href', proposalsUrl);
-    });
-
     it('should be able to see a working link for - find out more about Vega governance', function () {
       // 3001-VOTE-001
-      cy.getByTestId(proposalDocumentationLink)
+      cy.get(proposalDocumentationLink)
         .should('be.visible')
         .and('have.text', 'Find out more about Vega governance')
         .and('have.attr', 'href')
@@ -62,63 +54,18 @@ context(
         });
     });
 
-    // 3007-PNE-021
+    it.skip('should be able to see button for - new proposal', function () {
-    it('should have documentation links for network parameter 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.skip('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.getByTestId(proposalDocsLink)
+      cy.get(connectToVegaWalletButton)
-        .find('a')
-        .should('have.attr', 'href')
-        .and('contain', '/tutorials/proposals/network-parameter-proposal');
-    });
-
-    // 3003-PMAN-002 3003-PMAN-005
-    it('should have documentation links for new market proposal', function () {
-      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.getByTestId(proposalDocsLink)
-        .find('a')
-        .should('have.attr', 'href')
-        .and('contain', '/tutorials/proposals/new-market-proposal');
-    });
-
-    // 3004-PMAC-005
-    it('should have documentation links for update market proposal', function () {
-      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(proposalDocsLink)
-        .find('a')
-        .should('have.attr', 'href')
-        .and('contain', '/tutorials/proposals/update-market-proposal');
-    });
-
-    // 3005-PASN-002 005-PASN-005
-    it('should have documentation links for new asset proposal', function () {
-      goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.getByTestId(proposalDocsLink)
-        .find('a')
-        .should('have.attr', 'href')
-        .and('contain', '/tutorials/proposals/new-asset-proposal');
-    });
-
-    // 3006-PASC-002 3006-PASC-005
-    it('should have documentation links for update asset proposal', function () {
-      goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.getByTestId(proposalDocsLink)
-        .find('a')
-        .should('have.attr', 'href')
-        .and('contain', '/tutorials/proposals/update-asset-proposal');
-    });
-
-    // 3008-PFRO-003 3008-PFRO-017
-    it('should have documentation links for freeform proposal', function () {
-      goToMakeNewProposal(governanceProposalType.FREEFORM);
-      cy.getByTestId(proposalDocsLink)
-        .find('a')
-        .should('have.attr', 'href')
-        .and('contain', '/tutorials/proposals/freeform-proposal');
-    });
-
-    it('should be able to see a connect wallet button - if vega wallet disconnected and user is submitting new proposal', function () {
-      goToMakeNewProposal(governanceProposalType.RAW);
-      cy.getByTestId(connectToVegaWalletButton)
         .should('be.visible')
         .and('have.text', 'Connect Vega wallet');
     });
@@ -166,7 +113,6 @@ context(
             );
           });
       });
-      cy.get('[data-testid="closed-proposals-toggle-networkUpgrades"]').click();
       cy.getByTestId('closed-proposals').within(() => {
         cy.getByTestId('protocol-upgrade-proposals-list-item').should(
           'have.length',
@@ -182,7 +128,6 @@ context(
         .first()
         .find('[data-testid="view-proposal-btn"]')
         .click();
-      cy.url().should('contain', '/protocol-upgrades/v1');
       cy.getByTestId('protocol-upgrade-proposal').within(() => {
         cy.get('h1').should('have.text', 'Vega Release v1');
         cy.getByTestId('protocol-upgrade-block-height').should(

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

@@ -11,7 +11,7 @@ import {
   goToMakeNewProposal,
   governanceProposalType,
 } from '../../support/governance.functions';
-import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
 
 const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey2');
 const vegaPubkeyTruncated = Cypress.env('vegaWalletPublicKey2Short');

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

@@ -5,8 +5,8 @@ import {
 } from '../../support/common.functions';
 import { waitForBeginningOfEpoch } from '../../support/staking.functions';
 
-const viewToggle = 'epoch-reward-view-toggle-total';
+const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
-const warning = 'callout';
+const warning = '[data-testid="callout"]';
 
 context(
   'Rewards Page - verify elements on page',
@@ -27,7 +27,7 @@ context(
       });
 
       it('should have epoch warning', function () {
-        cy.getByTestId(warning)
+        cy.get(warning)
           .should('be.visible')
           .and(
             'have.text',
@@ -36,7 +36,7 @@ context(
       });
 
       it('should have toggle for seeing total vs individual rewards', function () {
-        cy.getByTestId(viewToggle).should('be.visible');
+        cy.get(viewToggle).should('be.visible');
       });
 
       // Skipping due to bug #3471 causing flaky failuress

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

@@ -1,17 +1,18 @@
 import { navigateTo, navigation } from '../../support/common.functions';
 
 const tokenDetailsTable = '.token-details';
-const address = 'token-address';
+const address = '[data-testid="token-address"]';
-const contract = 'token-contract';
+const contract = '[data-testid="token-contract"]';
-const totalSupply = 'total-supply';
+const totalSupply = '[data-testid="total-supply"]';
-const circulatingSupply = 'circulating-supply';
+const circulatingSupply = '[data-testid="circulating-supply"]';
-const staked = 'staked';
+const staked = '[data-testid="staked"]';
-const tranchesLink = 'tranches-link';
+const tranchesLink = '[data-testid="tranches-link"]';
-const redeemBtn = 'check-vesting-page-btn';
+const redeemBtn = '[data-testid="check-vesting-page-btn"]';
-const getVegaWalletLink = 'get-vega-wallet-link';
+const getVegaWalletLink = '[data-testid="get-vega-wallet-link"]';
-const associateVegaLink = 'associate-vega-tokens-link-on-homepage';
+const associateVegaLink =
-const stakingBtn = 'staking-button-on-homepage';
+  '[data-testid="associate-vega-tokens-link-on-homepage"]';
-const governanceBtn = 'governance-button-on-homepage';
+const stakingBtn = '[data-testid="staking-button-on-homepage"]';
+const governanceBtn = '[data-testid="governance-button-on-homepage"]';
 
 const vegaTokenAddress = Cypress.env('vegaTokenAddress');
 const vegaTokenContractAddress = Cypress.env('vegaTokenContractAddress');
@@ -24,7 +25,7 @@ context('Verify elements on Token page', { tags: '@smoke' }, function () {
   describe('THE $VEGA TOKEN table', function () {
     it('should have TOKEN ADDRESS', function () {
       cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(address)
+        cy.get(address)
           .should('be.visible')
           .invoke('text')
           .should('be.equal', vegaTokenAddress);
@@ -33,7 +34,7 @@ context('Verify elements on Token page', { tags: '@smoke' }, function () {
     it('should have VESTING CONTRACT', function () {
       // 1004-ASSO-001
       cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(contract)
+        cy.get(contract)
           .should('be.visible')
           .invoke('text')
           .should('be.equal', vegaTokenContractAddress);
@@ -41,56 +42,56 @@ context('Verify elements on Token page', { tags: '@smoke' }, function () {
     });
     it('should have TOTAL SUPPLY', function () {
       cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(totalSupply).should('be.visible');
+        cy.get(totalSupply).should('be.visible');
       });
     });
     it('should have CIRCULATING SUPPLY', function () {
       cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(circulatingSupply).should('be.visible');
+        cy.get(circulatingSupply).should('be.visible');
       });
     });
     it('should have STAKED $VEGA', function () {
       cy.get(tokenDetailsTable).within(() => {
-        cy.getByTestId(staked).should('be.visible');
+        cy.get(staked).should('be.visible');
       });
     });
   });
 
   describe('links and buttons', function () {
     it('should have TRANCHES link', function () {
-      cy.getByTestId(tranchesLink)
+      cy.get(tranchesLink)
         .should('be.visible')
         .and('have.attr', 'href')
         .and('equal', '/token/tranches');
     });
     it('should have REDEEM button', function () {
-      cy.getByTestId(redeemBtn)
+      cy.get(redeemBtn)
         .should('be.visible')
         .parent()
         .should('have.attr', 'href')
         .and('equal', '/token/redeem');
     });
     it('should have GET VEGA WALLET link', function () {
-      cy.getByTestId(getVegaWalletLink)
+      cy.get(getVegaWalletLink)
         .should('be.visible')
         .and('have.attr', 'href')
         .and('equal', 'https://vega.xyz/wallet');
     });
     it('should have ASSOCIATE VEGA TOKENS link', function () {
-      cy.getByTestId(associateVegaLink)
+      cy.get(associateVegaLink)
         .should('be.visible')
         .and('have.attr', 'href')
         .and('equal', '/token/associate');
     });
     it('should have STAKING button', function () {
-      cy.getByTestId(stakingBtn)
+      cy.get(stakingBtn)
         .should('be.visible')
         .parent()
         .should('have.attr', 'href')
         .and('equal', '/validators');
     });
     it('should have GOVERNANCE button', function () {
-      cy.getByTestId(governanceBtn)
+      cy.get(governanceBtn)
         .should('be.visible')
         .parent()
         .should('have.attr', 'href')

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

@@ -1,37 +1,34 @@
 /// <reference types="cypress" />
 
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import {
   navigation,
   verifyPageHeader,
   verifyTabHighlighted,
 } from '../../support/common.functions';
-import {
+import { clickOnValidatorFromList } from '../../support/staking.functions';
-  clickOnValidatorFromList,
-  waitForBeginningOfEpoch,
-} from '../../support/staking.functions';
-import { previousEpochData } from '../../fixtures/mocks/previous-epoch';
 
-const guideLink = 'staking-guide-link';
+const guideLink = '[data-testid="staking-guide-link"]';
-const validatorTitle = 'validator-node-title';
+const validatorTitle = '[data-testid="validator-node-title"]';
-const validatorId = 'validator-id';
+const validatorId = '[data-testid="validator-id"]';
-const validatorPubKey = 'validator-public-key';
+const validatorPubKey = '[data-testid="validator-public-key"]';
-const ethAddressLink = 'link';
+const ethAddressLink = '[data-testid="link"]';
-const validatorStatus = 'validator-status';
+const validatorStatus = '[data-testid="validator-status"]';
-const totalStake = 'total-stake';
+const totalStake = '[data-testid="total-stake"]';
-const pendingStake = 'pending-stake';
+const pendingStake = '[data-testid="pending-stake"]';
-const stakedByOperator = 'staked-by-operator';
+const stakedByOperator = '[data-testid="staked-by-operator"]';
-const stakedByDelegates = 'staked-by-delegates';
+const stakedByDelegates = '[data-testid="staked-by-delegates"]';
-const stakeShare = 'stake-percentage';
+const stakeShare = '[data-testid="stake-percentage"]';
-const stakedByOperatorToolTip = 'staked-operator-tooltip';
+const stakedByOperatorToolTip = '[data-testid="staked-operator-tooltip"]';
-const stakedByDelegatesToolTip = 'staked-delegates-tooltip';
+const stakedByDelegatesToolTip = '[data-testid="staked-delegates-tooltip"]';
-const totalStakedToolTip = 'total-staked-tooltip';
+const totalStakedToolTip = '[data-testid="total-staked-tooltip"]';
-const unnormalisedVotingPowerToolTip = 'unnormalised-voting-power-tooltip';
+const unnormalisedVotingPowerToolTip =
-const normalisedVotingPowerToolTip = 'normalised-voting-power-tooltip';
+  '[data-testid="unnormalised-voting-power-tooltip"]';
-const performancePenaltyToolTip = 'performance-penalty-tooltip';
+const normalisedVotingPowerToolTip =
-const overstakedPenaltyToolTip = 'overstaked-penalty-tooltip';
+  '[data-testid="normalised-voting-power-tooltip"]';
-const multisigPenaltyToolTip = 'multisig-error-tooltip';
+const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
-const epochCountDown = 'epoch-countdown';
+const overstakedPenaltyToolTip = '[data-testid="overstaked-penalty-tooltip"]';
+const totalPenaltyToolTip = '[data-testid="total-penalty-tooltip"]';
+const epochCountDown = '[data-testid="epoch-countdown"]';
 const stakeNumberRegex = /^\d{1,3}(,\d{3})*(\.\d+)?$/;
 
 context('Validators Page - verify elements on page', function () {
@@ -40,232 +37,206 @@ context('Validators Page - verify elements on page', function () {
   });
 
   describe('with wallets disconnected', { tags: '@smoke' }, function () {
-    it('Should have validators tab highlighted', function () {
+    describe('description section', function () {
-      verifyTabHighlighted(navigation.validators);
+      it('Should have validators tab highlighted', function () {
-    });
+        verifyTabHighlighted(navigation.validators);
+      });
 
-    it('Should have validators ON VEGA header visible', function () {
+      it('Should have validators ON VEGA header visible', function () {
-      verifyPageHeader('Validators');
+        verifyPageHeader('Validators');
-    });
+      });
 
-    it('Should have Staking Guide link visible', function () {
+      it('Should have Staking Guide link visible', function () {
-      // 1002-STKE-003
+        // 2001-STKE-003
-      cy.getByTestId(guideLink)
+        cy.get(guideLink)
-        .should('be.visible')
+          .should('be.visible')
-        .and('have.text', 'Read more about staking on Vega')
+          .and('have.text', 'Read more about staking on Vega')
-        .and(
+          .and(
-          'have.attr',
+            'have.attr',
-          'href',
+            'href',
-          'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
+            'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
-        );
+          );
+      });
     });
+    describe(
+      'Should be able to see validator list from the staking page',
+      { tags: '@regression' },
+      function () {
+        // 2001-STKE-050
+        it('Should be able to see validator names', function () {
+          cy.get('[col-id="validator"] > div > span')
+            .should('have.length.at.least', 1)
+            .each(($name) => {
+              cy.wrap($name).should('not.be.empty');
+            });
+        });
 
-    // 1002-STKE-032
+        it('Should be able to see validator stake', function () {
-    it('Should have button to connect vega wallet in validator page', function () {
+          cy.getByTestId('total-stake')
-      clickOnValidatorFromList(0);
+            .should('have.length.at.least', 1)
-      cy.getByTestId('connect-to-vega-wallet-btn').should('be.visible');
+            .each(($stake) => {
-      cy.visit('/validators');
+              cy.wrap($stake).should('not.be.empty');
-    });
+            });
+        });
+
+        it('Should be able to see validator stake tooltip', function () {
+          cy.getByTestId('total-stake').first().realHover();
+
+          cy.get(stakedByOperatorToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by operator: 3,000.00');
+          cy.get(stakedByDelegatesToolTip)
+            .invoke('text')
+            .should('contain', 'Staked by delegates: 0.00');
+          cy.get(totalStakedToolTip)
+            .invoke('text')
+            .should('contain', 'Total stake: 3,000.00');
+        });
+
+        it('Should be able to see validator normalised voting power', function () {
+          cy.getByTestId('normalised-voting-power')
+            .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();
+
+          cy.get(unnormalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Unnormalised voting power: 20.00%');
+          cy.get(normalisedVotingPowerToolTip)
+            .invoke('text')
+            .should('contain', 'Normalised voting power: 50.00%');
+        });
+
+        // 2002-SINC-018
+        it('Should be able to see validator total penalties', function () {
+          cy.getByTestId('total-penalty')
+            .should('have.length.at.least', 1)
+            .each(($penalties) => {
+              cy.wrap($penalties).should('contain.text', '0%');
+            });
+        });
+
+        it('Should be able to see validator penalties tooltip', function () {
+          cy.getByTestId('total-penalty').realHover();
+
+          cy.get(performancePenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Performance penalty: 0.00%');
+          cy.get(overstakedPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
+          cy.get(totalPenaltyToolTip)
+            .invoke('text')
+            .should('contain', 'Total penalties: 60.00%');
+        });
+
+        it('Should be able to see validator pending stake', function () {
+          cy.getByTestId('total-pending-stake')
+            .should('have.length.at.least', 1)
+            .each(($pendingStake) => {
+              cy.wrap($pendingStake).should('contain.text', '0.00');
+            });
+        });
+      }
+    );
+
+    // 2001-STKE-050
+    describe(
+      'Should be able to see static information about a validator',
+      { tags: '@smoke' },
+      function () {
+        before('connect wallets and click on validator', function () {
+          cy.connectVegaWallet();
+          clickOnValidatorFromList(0);
+        });
+
+        // 2001-STKE-006
+        it('Should be able to see validator name', function () {
+          cy.get(validatorTitle).should('not.be.empty');
+        });
+
+        // 2001-STKE-007
+        it('Should be able to see validator id', function () {
+          cy.get(validatorId).should('not.be.empty');
+        });
+
+        // 2001-STKE-008
+        it('Should be able to see validator public key', function () {
+          cy.get(validatorPubKey).should('not.be.empty');
+        });
+
+        // 2001-STKE-010
+        it('Should be able to see Ethereum address', function () {
+          cy.get(ethAddressLink)
+            .should('not.be.empty')
+            .and('have.attr', 'href');
+        });
+        // TODO validators missing url for more information about them 2001-STKE-09
+
+        it('Should be able to see validator status', function () {
+          cy.get(validatorStatus).should('have.text', 'Consensus');
+        });
+
+        // 2001-STKE-012
+        it('Should be able to see total stake', function () {
+          cy.get(totalStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see pending stake', function () {
+          cy.get(pendingStake).invoke('text').should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by operator', function () {
+          cy.get(stakedByOperator)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        it('Should be able to see staked by delegates', function () {
+          cy.get(stakedByDelegates)
+            .invoke('text')
+            .should('match', stakeNumberRegex);
+        });
+
+        // 2001-STKE-051
+        it('Should be able to see stake share in percentage', function () {
+          cy.get(stakeShare)
+            .invoke('text')
+            .then(($stakePercentage) => {
+              // The pattern must start at a word boundary (\b).
+              // The pattern cannot be immediately preceded by a dot ((?<!\.)).
+              // The pattern can be one of the following:
+              // A percentage value of zero (0%), or
+              // A non-zero percentage value that can be:
+              // A single digit (\d) between 0 and 9, or
+              // A two-digit number between 0 and 99 (\d{1,2}), or
+              // The number 100.
+              // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
+              // The pattern must end with a percentage sign (%).
+
+              cy.wrap($stakePercentage).should(
+                'match',
+                /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
+              );
+            });
+        });
+
+        // 2001-STKE-011 2002-SINC-001 2002-SINC-002
+        it('Should be able to see epoch information', function () {
+          const epochTitle = 'h3';
+          const nextEpochInfo = 'p';
+
+          cy.get(epochCountDown).within(() => {
+            cy.get(epochTitle).should('not.be.empty');
+            cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
+          });
+        });
+      }
+    );
   });
-  // 1002-STKE-020 1002-STKE-021 1002-STKE-022 1002-STKE-023 1002-STKE-024
-  describe(
-    'Should be able to see validator list from the staking page',
-    { tags: '@regression' },
-    function () {
-      // 1002-STKE-050
-      it('Should be able to see validator names', function () {
-        cy.get('[col-id="validator"] > div > span')
-          .should('have.length.at.least', 1)
-          .each(($name) => {
-            cy.wrap($name).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake', function () {
-        cy.getByTestId('total-stake')
-          .should('have.length.at.least', 1)
-          .each(($stake) => {
-            cy.wrap($stake).should('not.be.empty');
-          });
-      });
-
-      it('Should be able to see validator stake tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('total-stake').first().realHover();
-
-        cy.getByTestId(stakedByOperatorToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by operator: 3,000.00');
-        cy.getByTestId(stakedByDelegatesToolTip)
-          .invoke('text')
-          .should('contain', 'Staked by delegates: 0.00');
-        cy.getByTestId(totalStakedToolTip)
-          .invoke('text')
-          .should('contain', 'Total stake: 3,000.00');
-      });
-
-      it('Should be able to see validator normalised voting power', function () {
-        cy.getByTestId('normalised-voting-power')
-          .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 () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('normalised-voting-power').first().realHover();
-
-        cy.getByTestId(unnormalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Unnormalised voting power: 20.00%');
-        cy.getByTestId(normalisedVotingPowerToolTip)
-          .invoke('text')
-          .should('contain', 'Normalised voting power: 50.00%');
-      });
-
-      // 2002-SINC-018
-      it('Should be able to see validator total penalties', function () {
-        cy.getByTestId('total-penalty')
-          .should('have.length.at.least', 1)
-          .each(($penalties) => {
-            cy.wrap($penalties).should('contain.text', '0%');
-          });
-      });
-
-      it('Should be able to see validator penalties tooltip', function () {
-        waitForBeginningOfEpoch();
-        cy.getByTestId('total-penalty').realHover();
-
-        cy.getByTestId(performancePenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Performance penalty: 0.00%');
-        cy.getByTestId(overstakedPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Overstaked penalty: 60.00%'); // value not asserted due to #2886
-      });
-
-      it('Should be able to see validator pending stake', function () {
-        cy.getByTestId('total-pending-stake')
-          .should('have.length.at.least', 1)
-          .each(($pendingStake) => {
-            cy.wrap($pendingStake).should('contain.text', '0.00');
-          });
-      });
-
-      it('Should be able to see multisig error', function () {
-        cy.mockGQL((req) => {
-          aliasGQLQuery(req, 'PreviousEpoch', previousEpochData);
-        });
-        waitForBeginningOfEpoch();
-        cy.getByTestId('total-penalty').first().realHover();
-        cy.getByTestId(multisigPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Multisig penalty: 100%');
-
-        cy.getByTestId('total-penalty').eq(1).realHover();
-        cy.getByTestId(multisigPenaltyToolTip)
-          .invoke('text')
-          .should('contain', 'Multisig penalty: 100%');
-      });
-    }
-  );
-
-  // 1002-STKE-050
-  describe(
-    'Should be able to see static information about a validator',
-    { tags: '@smoke' },
-    function () {
-      before('connect wallets and click on validator', function () {
-        cy.connectVegaWallet();
-        clickOnValidatorFromList(0);
-      });
-
-      // 1002-STKE-006
-      it('Should be able to see validator name', function () {
-        cy.getByTestId(validatorTitle).should('not.be.empty');
-      });
-
-      // 1002-STKE-007
-      it('Should be able to see validator id', function () {
-        cy.getByTestId(validatorId).should('not.be.empty');
-      });
-
-      // 1002-STKE-008
-      it('Should be able to see validator public key', function () {
-        cy.getByTestId(validatorPubKey).should('not.be.empty');
-      });
-
-      // 1002-STKE-010
-      it('Should be able to see Ethereum address', function () {
-        cy.getByTestId(ethAddressLink)
-          .should('not.be.empty')
-          .and('have.attr', 'href');
-      });
-      // TODO validators missing url for more information about them 1002-STKE-09
-
-      it('Should be able to see validator status', function () {
-        cy.getByTestId(validatorStatus).should('have.text', 'Consensus');
-      });
-
-      // 1002-STKE-012
-      it('Should be able to see total stake', function () {
-        cy.getByTestId(totalStake)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see pending stake', function () {
-        cy.getByTestId(pendingStake)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by operator', function () {
-        cy.getByTestId(stakedByOperator)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      it('Should be able to see staked by delegates', function () {
-        cy.getByTestId(stakedByDelegates)
-          .invoke('text')
-          .should('match', stakeNumberRegex);
-      });
-
-      // 1002-STKE-051
-      it('Should be able to see stake share in percentage', function () {
-        cy.getByTestId(stakeShare)
-          .invoke('text')
-          .then(($stakePercentage) => {
-            // The pattern must start at a word boundary (\b).
-            // The pattern cannot be immediately preceded by a dot ((?<!\.)).
-            // The pattern can be one of the following:
-            // A percentage value of zero (0%), or
-            // A non-zero percentage value that can be:
-            // A single digit (\d) between 0 and 9, or
-            // A two-digit number between 0 and 99 (\d{1,2}), or
-            // The number 100.
-            // The pattern can optionally include a decimal point and one or more digits after the decimal point ((?:(?<!100)\.\d+)?). However, if the number is 100, it cannot have a decimal point.
-            // The pattern must end with a percentage sign (%).
-
-            cy.wrap($stakePercentage).should(
-              'match',
-              /\b(?<!\.)(?:0+(?:\.0+)?%|(?:\d|\d{1,2}|100)(?:(?<!100)\.\d+)?)%/
-            );
-          });
-      });
-
-      // 1002-STKE-011 2002-SINC-001 2002-SINC-002
-      it('Should be able to see epoch information', function () {
-        const epochTitle = 'h3';
-        const nextEpochInfo = 'p';
-
-        cy.getByTestId(epochCountDown).within(() => {
-          cy.get(epochTitle).should('not.be.empty');
-          cy.get(nextEpochInfo).should('contain.text', 'Next epoch');
-        });
-      });
-    }
-  );
 });

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

@@ -6,7 +6,7 @@ import {
 } from '../../support/common.functions';
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 
-const connectButton = 'connect-to-eth-btn';
+const connectButton = '[data-testid="connect-to-eth-btn"]';
 const lockedTokensInVestingContract = '6,499,972.30';
 
 context(
@@ -29,7 +29,7 @@ context(
 
       // 1005-VEST-018
       it('should have connect Eth wallet button', function () {
-        cy.getByTestId(connectButton)
+        cy.get(connectButton)
           .should('be.visible')
           .and('have.text', 'Connect Ethereum wallet');
       });

apps/governance-e2e/src/integration/view/wallet-eth.cy.ts

@@ -5,11 +5,11 @@ const walletContainer = 'aside [data-testid="ethereum-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectToEthButton =
   '[data-testid="connect-to-eth-wallet-button"]:visible';
-const connectorList = 'web3-connector-list';
+const connectorList = '[data-testid="web3-connector-list"]';
 const associate = '[href="/token/associate"]';
 const disassociate = '[href="/token/disassociate"]';
-const disconnect = 'disconnect-from-eth-wallet-button';
+const disconnect = '[data-testid="disconnect-from-eth-wallet-button"]';
-const accountNo = 'ethereum-account-truncated';
+const accountNo = '[data-testid="ethereum-account-truncated"]';
 const currencyTitle = '[data-testid="currency-title"]:visible';
 const currencyValue = '[data-testid="currency-value"]:visible';
 const vegaInVesting = '[data-testid="vega-in-vesting-contract"]:visible';
@@ -18,8 +18,8 @@ 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 dialogHeader = 'dialog-title';
+const dialogHeader = '[data-testid="dialog-title"]';
-const dialogCloseBtn = 'dialog-close';
+const dialogCloseBtn = '[data-testid="dialog-close"]';
 
 context(
   'Ethereum Wallet - verify elements on widget',
@@ -59,7 +59,7 @@ context(
 
       it('should have Connect Ethereum header visible', function () {
         cy.get(dialog).within(() => {
-          cy.getByTestId(dialogHeader)
+          cy.get(dialogHeader)
             .should('be.visible')
             .and('have.text', 'Connect to your Ethereum wallet');
         });
@@ -73,7 +73,7 @@ context(
           'WalletConnect',
           'WalletConnect Legacy',
         ];
-        cy.getByTestId(connectorList).within(() => {
+        cy.get(connectorList).within(() => {
           cy.get('button').each(($btn, i) => {
             cy.wrap($btn).should('be.visible').and('have.text', connectList[i]);
           });
@@ -83,7 +83,7 @@ context(
       after('close popup', function () {
         cy.get(dialog)
           .within(() => {
-            cy.getByTestId(dialogCloseBtn).click();
+            cy.get(dialogCloseBtn).click();
           })
           .should('not.exist');
       });
@@ -106,7 +106,7 @@ context(
       // 0004-EWAL-005
       it('should have account number visible', function () {
         cy.get(walletContainer).within(() => {
-          cy.getByTestId(accountNo)
+          cy.get(accountNo)
             .should('be.visible')
             .and('have.text', Cypress.env('ethWalletPublicKeyTruncated'));
         });
@@ -129,7 +129,7 @@ context(
       // 0004-EWAL-007
       it('should have Disconnect button visible', function () {
         cy.get(walletContainer).within(() => {
-          cy.getByTestId(disconnect)
+          cy.get(disconnect)
             .should('be.visible')
             .and('have.text', 'Disconnect');
         });

apps/governance-e2e/src/integration/view/wallet-vega.cy.ts

@@ -1,34 +1,32 @@
 import { truncateByChars } from '@vegaprotocol/utils';
 import { waitForSpinner } from '../../support/common.functions';
-import {
+import { vegaWalletTeardown } from '../../support/wallet-teardown.functions';
-  vegaWalletFaucetAssetsWithoutCheck,
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
-  vegaWalletTeardown,
-} from '../../support/wallet-functions';
 
 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
-const connectButton = 'connect-vega-wallet';
+const connectButton = '[data-testid="connect-vega-wallet"]';
-const getVegaLink = 'link';
+const getVegaLink = '[data-testid="link"]';
 const dialog = '[role="dialog"]:visible';
-const dialogHeader = 'dialog-title';
+const dialogHeader = '[data-testid="dialog-title"]';
-const walletDialogHeader = 'wallet-dialog-title';
+const walletDialogHeader = '[data-testid="wallet-dialog-title"]';
-const connectorsList = 'connectors-list';
+const connectorsList = '[data-testid="connectors-list"]';
-const dialogCloseBtn = 'dialog-close';
+const dialogCloseBtn = '[data-testid="dialog-close"]';
-const restConnectorForm = 'rest-connector-form';
+const restConnectorForm = '[data-testid="rest-connector-form"]';
 const restWallet = '#wallet';
 const restPassphrase = '#passphrase';
 const restConnectBtn = '[type="submit"]';
-const accountNo = 'vega-account-truncated';
+const accountNo = '[data-testid="vega-account-truncated"]';
-const currencyTitle = 'currency-title';
+const currencyTitle = '[data-testid="currency-title"]';
-const currencyValue = 'currency-value';
+const currencyValue = '[data-testid="currency-value"]';
 const vegaUnstaked = '[data-testid="vega-wallet-balance-unstaked"] .text-right';
 const governanceBtn = '[href="/proposals"]';
 const stakingBtn = '[href="/validators"]';
-const manageLink = 'manage-vega-wallet';
+const manageLink = '[data-testid="manage-vega-wallet"]';
-const dialogVegaKey = 'vega-public-key-full';
+const dialogVegaKey = '[data-testid="vega-public-key-full"]';
-const dialogDisconnectBtn = 'disconnect';
+const dialogDisconnectBtn = '[data-testid="disconnect"]';
-const copyPublicKeyBtn = 'copy-vega-public-key';
+const copyPublicKeyBtn = '[data-testid="copy-vega-public-key"]';
-const vegaWalletCurrencyTitle = 'currency-title';
+const vegaWalletCurrencyTitle = '[data-testid="currency-title"]';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const txTimeout = Cypress.env('txTimeout');
 
@@ -47,10 +45,10 @@ context(
           cy.get(walletHeader)
             .should('be.visible')
             .and('have.text', 'Vega Wallet');
-          cy.getByTestId(connectButton)
+          cy.get(connectButton)
             .should('be.visible')
             .and('have.text', 'Connect Vega wallet to use associated $VEGA');
-          cy.getByTestId(getVegaLink)
+          cy.get(getVegaLink)
             .should('be.visible')
             .and('have.text', 'Get a Vega wallet')
             .and('have.attr', 'href', 'https://vega.xyz/wallet');
@@ -61,20 +59,20 @@ context(
     describe('when connect button clicked', () => {
       before('click connect vega wallet button', () => {
         cy.get(walletContainer).within(() => {
-          cy.getByTestId(connectButton).click();
+          cy.get(connectButton).click();
         });
       });
 
       it('should have Connect Vega header visible', () => {
         cy.get(dialog).within(() => {
-          cy.getByTestId(walletDialogHeader)
+          cy.get(walletDialogHeader)
             .should('be.visible')
             .and('have.text', 'Connect');
         });
       });
 
       it('should have jsonRpc and hosted connection options visible on list', function () {
-        cy.getByTestId(connectorsList).within(() => {
+        cy.get(connectorsList).within(() => {
           cy.getByTestId('connector-jsonRpc')
             .should('be.visible')
             .and('have.text', 'Connect Vega wallet');
@@ -86,33 +84,33 @@ context(
 
       it('should have close button visible', function () {
         cy.get(dialog).within(() => {
-          cy.getByTestId(dialogCloseBtn).should('be.visible');
+          cy.get(dialogCloseBtn).should('be.visible');
         });
       });
     });
 
     describe('when rest connector form opened', function () {
       before('click hosted wallet app button', function () {
-        cy.getByTestId(connectorsList).within(() => {
+        cy.get(connectorsList).within(() => {
           cy.getByTestId('connector-hosted').click();
         });
       });
 
       // 0002-WCON-002
       it('should have wallet field visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
+        cy.get(restConnectorForm).within(() => {
           cy.get(restWallet).should('be.visible');
         });
       });
 
       it('should have password field visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
+        cy.get(restConnectorForm).within(() => {
           cy.get(restPassphrase).should('be.visible');
         });
       });
 
       it('should have connect button visible', function () {
-        cy.getByTestId(restConnectorForm).within(() => {
+        cy.get(restConnectorForm).within(() => {
           cy.get(restConnectBtn)
             .should('be.visible')
             .and('have.text', 'Connect');
@@ -121,12 +119,12 @@ context(
 
       it('should have close button visible', function () {
         cy.get(dialog).within(() => {
-          cy.getByTestId(dialogCloseBtn).should('be.visible');
+          cy.get(dialogCloseBtn).should('be.visible');
         });
       });
 
       after('close dialog', function () {
-        cy.getByTestId(dialogCloseBtn).click().should('not.exist');
+        cy.get(dialogCloseBtn).click().should('not.exist');
       });
     });
 
@@ -152,7 +150,7 @@ context(
         { tags: '@smoke' },
         function () {
           cy.get(walletContainer).within(() => {
-            cy.getByTestId(accountNo)
+            cy.get(accountNo)
               .should('be.visible')
               .and('have.text', Cypress.env('vegaWalletPublicKeyShort'));
           });
@@ -161,7 +159,7 @@ context(
 
       it('should have Vega Associated currency title visible', function () {
         cy.get(walletContainer).within(() => {
-          cy.getByTestId(currencyTitle)
+          cy.get(currencyTitle)
             .should('be.visible')
             .and('contain.text', `VEGAAssociated`);
         });
@@ -172,7 +170,7 @@ context(
         { tags: '@smoke' },
         function () {
           cy.get(walletContainer).within(() => {
-            cy.getByTestId(currencyValue)
+            cy.get(currencyValue)
               .should('be.visible')
               .and('contain.text', `0.00`);
           });
@@ -204,23 +202,21 @@ context(
 
       it('should have Manage link visible', function () {
         cy.get(walletContainer).within(() => {
-          cy.getByTestId(manageLink)
+          cy.get(manageLink).should('be.visible').and('have.text', 'Manage');
-            .should('be.visible')
-            .and('have.text', 'Manage');
         });
       });
 
       describe('when Manage dialog opened', function () {
         before('click Manage link', function () {
           cy.get(walletContainer).within(() => {
-            cy.getByTestId(manageLink).click();
+            cy.get(manageLink).click();
           });
         });
 
         // 0002-WCON-025, 0002-WCON-026
         it('should have SELECT A VEGA KEY dialog title visible', function () {
           cy.get(dialog).within(() => {
-            cy.getByTestId(dialogHeader)
+            cy.get(dialogHeader)
               .should('be.visible')
               .and('have.text', 'SELECT A VEGA KEY');
           });
@@ -240,7 +236,7 @@ context(
               'contain.text',
               truncatedPubKey1
             );
-            cy.getByTestId(dialogVegaKey)
+            cy.get(dialogVegaKey)
               .should('be.visible')
               .and('contain.text', truncatedPubKey1)
               .and('contain.text', truncatedPubKey2);
@@ -250,7 +246,7 @@ context(
         // 0002-WCON-029
         it('should have copy public key button visible', function () {
           cy.get(dialog).within(() => {
-            cy.getByTestId(copyPublicKeyBtn)
+            cy.get(copyPublicKeyBtn)
               .should('be.visible')
               .and('contain.text', 'Copy');
           });
@@ -258,13 +254,13 @@ context(
 
         it('should have close button visible', function () {
           cy.get(dialog).within(() => {
-            cy.getByTestId(dialogCloseBtn).should('be.visible');
+            cy.get(dialogCloseBtn).should('be.visible');
           });
         });
 
         it('should have vega Disconnect all keys button visible', function () {
           cy.get(dialog).within(() => {
-            cy.getByTestId(dialogDisconnectBtn)
+            cy.get(dialogDisconnectBtn)
               .should('be.visible')
               .and('have.text', 'Disconnect all keys');
           });
@@ -273,10 +269,10 @@ context(
         // 0002-WCON-022
         it('should be able to disconnect all keys', function () {
           cy.get(dialog).within(() => {
-            cy.getByTestId(dialogDisconnectBtn).click();
+            cy.get(dialogDisconnectBtn).click();
           });
           cy.get(walletContainer).within(() => {
-            cy.getByTestId(connectButton).should('be.visible'); // 0002-WCON-023
+            cy.get(connectButton).should('be.visible'); // 0002-WCON-023
           });
         });
       });
@@ -289,28 +285,28 @@ context(
             name: 'USDC (fake)',
             symbol: 'fUSDC',
             amount: '1000000',
-            expectedAmount: 10.0,
+            expectedAmount: '10.00',
           },
           {
             id: '8566db7257222b5b7ef2886394ad28b938b28680a54a169bbc795027b89d6665',
             name: 'DAI (fake)',
             symbol: 'fDAI',
             amount: '200000',
-            expectedAmount: 2.0,
+            expectedAmount: '2.00',
           },
           {
             id: '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
             name: 'BTC (fake)',
             symbol: 'fBTC',
             amount: '600000',
-            expectedAmount: 6.0,
+            expectedAmount: '6.00',
           },
           {
             id: 'e02d4c15d790d1d2dffaf2dcd1cf06a1fe656656cf4ed18c8ce99f9e83643567',
             name: 'EURO (fake)',
             symbol: 'fEURO',
             amount: '800000',
-            expectedAmount: 8.0,
+            expectedAmount: '8.00',
           },
         ];
 
@@ -332,20 +328,19 @@ context(
         for (const { name, symbol, expectedAmount } of assets) {
           it(`should see ${name} within vega wallet`, () => {
             cy.get(walletContainer).within(() => {
-              cy.getByTestId(vegaWalletCurrencyTitle)
+              cy.get(vegaWalletCurrencyTitle)
                 .contains(name, txTimeout)
                 .should('be.visible');
 
-              cy.getByTestId(vegaWalletCurrencyTitle)
+              cy.get(vegaWalletCurrencyTitle)
                 .contains(name)
                 .parent()
                 .siblings()
-                .then((elementAmount) => {
+                .invoke('text')
-                  const displayedAmount = parseFloat(elementAmount.text());
+                .then(parseFloat)
-                  expect(displayedAmount).be.gte(expectedAmount);
+                .should('be.gte', parseFloat(expectedAmount));
-                });
 
-              cy.getByTestId(vegaWalletCurrencyTitle)
+              cy.get(vegaWalletCurrencyTitle)
                 .contains(name)
                 .parent()
                 .contains(symbol);

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

@@ -5,6 +5,8 @@ import {
   verifyTabHighlighted,
 } from '../../support/common.functions';
 
+const connectToVegaBtn = '[data-testid="connect-to-vega-wallet-btn"]';
+
 context(
   'Withdraw Page - verify elements on page',
   { tags: '@smoke' },
@@ -24,7 +26,7 @@ context(
       });
 
       it('should have connect Vega wallet button', function () {
-        cy.getByTestId('connect-to-vega-wallet-btn')
+        cy.get(connectToVegaBtn)
           .should('be.visible')
           .and('have.text', 'Connect Vega wallet');
       });

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

@@ -1,11 +1,8 @@
-import { stakingPageDisassociateAllTokens } from './staking.functions';
-
 const tokenDropDown = 'state-trigger';
 const txTimeout = Cypress.env('txTimeout');
 
 export enum navigation {
   section = 'nav',
-  home = '[href="/"]',
   vesting = '[href="/token/redeem"]',
   validators = '[href="/validators"]',
   rewards = '[href="/rewards"]',
@@ -21,7 +18,6 @@ export function convertTokenValueToNumber(subject: string) {
 }
 
 const topLevelRoutes = [
-  navigation.home,
   navigation.proposals,
   navigation.validators,
   navigation.rewards,
@@ -37,7 +33,7 @@ export function navigateTo(page: navigation) {
       });
   } else {
     return cy.get(navigation.section, { timeout: 10000 }).within(() => {
-      cy.get(page).eq(0).click({ force: true });
+      cy.get(page).eq(0).click();
     });
   }
 }
@@ -101,25 +97,3 @@ export function turnTelemetryOff() {
     win.localStorage.setItem('vega_telemetry_on', 'false')
   );
 }
-
-export function dissociateFromSecondWalletKey() {
-  const secondWalletKey = Cypress.env('vegaWalletPublicKey2Short');
-  cy.getByTestId('vega-in-wallet')
-    .first()
-    .within(() => {
-      cy.getByTestId('eth-wallet-associated-balances')
-        .last()
-        .within(() => {
-          cy.getByTestId('associated-key')
-            .invoke('text')
-            .as('associatedPubKey');
-        });
-    });
-  cy.get('@associatedPubKey').then((associatedPubKey) => {
-    if (associatedPubKey == secondWalletKey) {
-      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
-      cy.get('[data-testid="select-keypair-button"]').eq(0).click();
-      stakingPageDisassociateAllTokens();
-    }
-  });
-}

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

@@ -59,11 +59,11 @@ export function submitUniqueRawProposal(proposalFields: {
   submit?: boolean;
 }) {
   goToMakeNewProposal(governanceProposalType.RAW);
-  let proposalBodyPath = 'src/fixtures/proposals/raw.json';
+  let proposalBodyPath = '/proposals/raw.json';
   if (proposalFields.proposalBody) {
     proposalBodyPath = proposalFields.proposalBody;
   }
-  cy.readFile(proposalBodyPath).then((rawProposal) => {
+  cy.fixture(proposalBodyPath).then((rawProposal) => {
     if (proposalFields.proposalTitle) {
       rawProposal.rationale.title = proposalFields.proposalTitle;
       cy.wrap(proposalFields.proposalTitle).as('proposalTitle');
@@ -73,10 +73,7 @@ export function submitUniqueRawProposal(proposalFields: {
     }
     if (proposalFields.closingTimestamp) {
       rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
-    } else if (
+    } else {
-      !proposalFields.closingTimestamp &&
-      !proposalFields.proposalBody
-    ) {
       const minTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
       rawProposal.terms.closingTimestamp = minTimeStamp;
     }
@@ -109,7 +106,7 @@ export function enterUniqueFreeFormProposalBody(
     'this is a e2e freeform proposal description'
   );
   cy.get(proposalVoteDeadline).clear().click().type(timestamp);
-  cy.getByTestId('proposal-download-json').should('be.visible').click();
+  cy.getByTestId('proposal-submit').should('be.visible').click();
 }
 
 export function getProposalFromTitle(proposalTitle: string) {
@@ -191,7 +188,6 @@ export function goToMakeNewProposal(proposalType: governanceProposalType) {
   }
 }
 
-// 3001-VOTE-013 3001-VOTE-014
 export function waitForProposalSubmitted() {
   cy.contains('Awaiting network confirmation', epochTimeout).should(
     'be.visible'
@@ -226,23 +222,6 @@ export function createFreeformProposal(proposalTitle: string) {
   navigateTo(navigation.proposals);
 }
 
-export function getDownloadedProposalJsonPath(proposalType: string) {
-  const downloadPath = './cypress/downloads/';
-  const filepath = downloadPath + proposalType + getFormattedTime() + '.json';
-  return filepath;
-}
-
-function getFormattedTime() {
-  const now = new Date();
-  const day = now.getDate().toString().padStart(2, '0');
-  const month = now.toLocaleString('en-US', { month: 'short' });
-  const year = now.getFullYear().toString();
-  const hours = now.getHours().toString().padStart(2, '0');
-  const minutes = now.getMinutes().toString().padStart(2, '0');
-
-  return `${day}-${month}-${year}-${hours}-${minutes}`;
-}
-
 export enum governanceProposalType {
   NETWORK_PARAMETER = 'Network parameter',
   NEW_MARKET = 'New market',

apps/governance-e2e/src/support/index.js

@@ -5,7 +5,8 @@ import './common.functions.ts';
 import './staking.functions.ts';
 import './governance.functions.ts';
 import './wallet-eth.functions.ts';
-import './wallet-functions.ts';
+import './wallet-teardown.functions.ts';
+import './wallet-vega.functions.ts';
 import './proposal.functions.ts';
 import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';

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

@@ -1,5 +1,5 @@
 import { closeDialog } from './common.functions';
-import { vegaWalletTeardown } from './wallet-functions';
+import { vegaWalletTeardown } from './wallet-teardown.functions';
 
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
@@ -221,7 +221,7 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }
 
 export function closeStakingDialog() {
-  cy.getByTestId('dialog-title', txTimeout).should(
+  cy.getByTestId('dialog-title').should(
     'contain.text',
     'At the beginning of the next epoch'
   );
@@ -236,8 +236,8 @@ export function validateWalletCurrency(
   currencyTitle: string,
   expectedAmount: string
 ) {
-  cy.get("[data-testid='currency-title']", txTimeout)
+  cy.get("[data-testid='currency-title']")
-    .contains(currencyTitle, txTimeout)
+    .contains(currencyTitle)
     .parent()
     .parent()
     .within(() => {

apps/governance-e2e/src/support/wallet-eth.functions.ts

@@ -5,7 +5,7 @@ const capsuleWalletConnectButton = '[data-testid="web3-connector-Unknown"]';
 
 export function ethereumWalletConnect() {
   cy.highlight('Connecting Eth Wallet');
-  cy.get(connectToEthButton, { timeout: 60000 }).within(() => {
+  cy.get(connectToEthButton).within(() => {
     cy.contains('Connect Ethereum wallet to associate $VEGA')
       .should('be.visible')
       .click();

apps/governance-e2e/src/support/wallet-teardown.functions.ts

@@ -19,7 +19,7 @@ const ethStakingBridgeContractAddress = Cypress.env(
 );
 const ethProviderUrl = Cypress.env('ethProviderUrl');
 const getAccount = (number = 0) => `m/44'/60'/0'/0/${number}`;
-const transactionTimeout = { timeout: 100000, log: false };
+const transactionTimeout = 100000;
 const Erc20BridgeAddress = '0x9708FF7510D4A7B9541e1699d15b53Ecb1AFDc54';
 
 const provider = new ethers.providers.JsonRpcProvider({ url: ethProviderUrl });
@@ -43,7 +43,10 @@ export async function depositAsset(
   const faucet = new Token(assetEthAddress, signer);
   cy.wrap(
     faucet.approve(Erc20BridgeAddress, amount + '0'.repeat(decimalPlaces + 1)),
-    transactionTimeout
+    {
+      timeout: transactionTimeout,
+      log: false,
+    }
   ).then(() => {
     const collateralBridge = new CollateralBridge(Erc20BridgeAddress, signer);
     cy.wrap(
@@ -52,7 +55,7 @@ export async function depositAsset(
         amount + '0'.repeat(decimalPlaces),
         '0x' + vegaWalletPubKey
       ),
-      transactionTimeout
+      { timeout: transactionTimeout, log: false }
     );
   });
 }
@@ -76,13 +79,13 @@ export async function vegaWalletTeardown() {
         }
       });
       cy.get(vegaWalletContainer).within(() => {
-        cy.get(associatedAmountInWallet, transactionTimeout).should(
+        cy.get(associatedAmountInWallet, {
-          'have.length',
+          timeout: transactionTimeout,
-          1
+        })
-        );
+          .should('have.length', 1, { timeout: transactionTimeout })
-        cy.get(associatedAmountInWallet)
+          .contains('0.00', {
-          .first(transactionTimeout)
+            timeout: transactionTimeout,
-          .should('have.text', '0.00');
+          });
       });
     });
 }
@@ -106,7 +109,7 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
   cy.highlight('Tearing down staking tokens from vega wallet if present');
   cy.wrap(
     stakingBridgeContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-    transactionTimeout
+    { timeout: transactionTimeout }
   ).then((stakeBalance) => {
     if (Number(stakeBalance) != 0) {
       cy.get(vegaWalletContainer).within(() => {
@@ -119,29 +122,32 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
                 String(stakeBalance),
                 vegaWalletPubKey
               ),
-              transactionTimeout
+              { timeout: transactionTimeout }
             );
             cy.wrap(
               vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
-              transactionTimeout
+              {
+                timeout: transactionTimeout,
+                log: false,
+              }
             ).then((vestingAmount) => {
               if (Number(vestingAmount) != 0) {
-                cy.contains('Associated', transactionTimeout)
+                cy.contains('Associated', {
+                  timeout: transactionTimeout,
+                })
                   .parent()
                   .parent()
                   .within(() => {
-                    cy.getByTestId('currency-value', transactionTimeout)
+                    cy.getByTestId('currency-value', {
-                      .first()
+                      timeout: transactionTimeout,
+                    })
+                      .should('have.length', 1)
                       .invoke('text')
                       .as('displayedAmount');
-                    cy.get('@displayedAmount', transactionTimeout).should(
+                    cy.get('@displayedAmount', {
-                      'not.eq',
+                      timeout: transactionTimeout,
-                      $associatedAmount
+                    }).should('not.eq', $associatedAmount);
-                    );
                   });
-                // Wait needed to allow Eth transaction to complete - otherwise could result in nonce error
-                // eslint-disable-next-line cypress/no-unnecessary-waiting
-                cy.wait(2000);
               }
             });
           });
@@ -152,14 +158,14 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
 
 async function vegaWalletTeardownVesting(vestingContract: TokenVesting) {
   cy.highlight('Tearing down vesting tokens from vega wallet if present');
-  cy.wrap(
+  cy.wrap(vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey), {
-    vestingContract.stake_balance(ethWalletPubKey, vegaWalletPubKey),
+    timeout: transactionTimeout,
-    transactionTimeout
+    log: false,
-  ).then((vestingAmount) => {
+  }).then((vestingAmount) => {
     if (Number(vestingAmount) != 0) {
       cy.wrap(
         vestingContract.remove_stake(String(vestingAmount), vegaWalletPubKey),
-        transactionTimeout
+        { timeout: transactionTimeout }
       );
     }
   });
@@ -176,27 +182,3 @@ export async function vegaWalletDisassociate(amount: string) {
   amount = amount + '0'.repeat(18);
   stakingBridgeContract.remove_stake(amount, vegaWalletPubKey);
 }
-
-export function vegaWalletFaucetAssetsWithoutCheck(
-  asset: string,
-  amount: string,
-  vegaWalletPublicKey: string
-) {
-  cy.highlight(`Topping up vega wallet with ${asset}, amount: ${amount}`);
-  cy.exec(
-    `curl -X POST -d '{"amount": "${amount}", "asset": "${asset}", "party": "${vegaWalletPublicKey}"}' http://localhost:1790/api/v1/mint`
-  )
-    .its('stdout')
-    .then((response) => {
-      assert.include(
-        response,
-        `"success":true`,
-        'Ensuring curl command was successfully undertaken'
-      );
-    });
-}
-
-export function switchVegaWalletPubKey() {
-  cy.get('[data-testid="manage-vega-wallet"]:visible').click();
-  cy.get('[data-testid="select-keypair-button"]').eq(0).click();
-}

apps/governance-e2e/src/support/wallet-vega.functions.ts

@@ -0,0 +1,18 @@
+export function vegaWalletFaucetAssetsWithoutCheck(
+  asset: string,
+  amount: string,
+  vegaWalletPublicKey: string
+) {
+  cy.highlight(`Topping up vega wallet with ${asset}, amount: ${amount}`);
+  cy.exec(
+    `curl -X POST -d '{"amount": "${amount}", "asset": "${asset}", "party": "${vegaWalletPublicKey}"}' http://localhost:1790/api/v1/mint`
+  )
+    .its('stdout')
+    .then((response) => {
+      assert.include(
+        response,
+        `"success":true`,
+        'Ensuring curl command was successfully undertaken'
+      );
+    });
+}

apps/governance/.env

@@ -5,11 +5,10 @@ NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50

apps/governance/.env.devnet

@@ -6,10 +6,9 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https:/
 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=#
+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
 NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/.env.mainnet

@@ -3,10 +3,9 @@ NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/3ba145ccc2884bcd91213d8dc989ca76
+NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996

apps/governance/.env.stagnet1

@@ -1,9 +1,9 @@
 # App configuration variables
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+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

apps/governance/.env.testnet

@@ -13,4 +13,3 @@ 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
 NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/.env.validator-testnet

@@ -7,7 +7,6 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https:/
 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://explorer.validators-testnet.vega.rocks/
+NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/src/components/collapsible-toggle/collapsible-toggle.spec.tsx

@@ -1,69 +0,0 @@
-import { render, fireEvent } from '@testing-library/react';
-import { CollapsibleToggle } from './collapsible-toggle';
-
-describe('CollapsibleToggle', () => {
-  const testId = 'collapsible-toggle';
-
-  it('renders without crashing', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId, getByText } = render(
-      <CollapsibleToggle
-        toggleState={false}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    expect(getByTestId(testId)).toBeInTheDocument();
-    expect(getByText('Test')).toBeInTheDocument();
-  });
-
-  it('calls setToggleState with the opposite of current toggleState when clicked', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId } = render(
-      <CollapsibleToggle
-        toggleState={false}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    fireEvent.click(getByTestId(testId));
-
-    expect(mockSetToggleState).toHaveBeenCalledWith(true);
-  });
-
-  it('has the rotate-180 class if toggleState is true', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId } = render(
-      <CollapsibleToggle
-        toggleState={true}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    expect(getByTestId('toggle-icon-wrapper')).toHaveClass('rotate-180');
-  });
-
-  it('does not have the rotate-180 class if toggleState is false', () => {
-    const mockSetToggleState = jest.fn();
-    const { getByTestId } = render(
-      <CollapsibleToggle
-        toggleState={false}
-        setToggleState={mockSetToggleState}
-        dataTestId={testId}
-      >
-        <div>Test</div>
-      </CollapsibleToggle>
-    );
-
-    expect(getByTestId('toggle-icon-wrapper')).not.toHaveClass('rotate-180');
-  });
-});

apps/governance/src/components/collapsible-toggle/collapsible-toggle.tsx

@@ -1,38 +0,0 @@
-import classnames from 'classnames';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import type { Dispatch, SetStateAction, ReactNode } from 'react';
-
-interface CollapsibleToggleProps {
-  toggleState: boolean;
-  setToggleState: Dispatch<SetStateAction<boolean>>;
-  children: ReactNode;
-  dataTestId?: string;
-}
-
-export const CollapsibleToggle = ({
-  toggleState,
-  setToggleState,
-  dataTestId,
-  children,
-}: CollapsibleToggleProps) => {
-  const classes = classnames(
-    'mb-4 transition-transform ease-in-out duration-300',
-    {
-      'rotate-180': toggleState,
-    }
-  );
-
-  return (
-    <button
-      onClick={() => setToggleState(!toggleState)}
-      data-testid={dataTestId}
-    >
-      <div className="flex items-center gap-3">
-        {children}
-        <div className={classes} data-testid="toggle-icon-wrapper">
-          <Icon name="chevron-down" size={8} />
-        </div>
-      </div>
-    </button>
-  );
-};

apps/governance/src/components/collapsible-toggle/index.ts

@@ -1 +0,0 @@
-export * from './collapsible-toggle';

apps/governance/src/components/multisig-incorrect-notice/index.ts

@@ -1 +0,0 @@
-export * from './multisig-incorrect-notice';

apps/governance/src/components/multisig-incorrect-notice/multisig-incorrect-notice.spec.tsx

@@ -1,52 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { useEthereumConfig } from '@vegaprotocol/web3';
-import { useEnvironment } from '@vegaprotocol/environment';
-import { MultisigIncorrectNotice } from './multisig-incorrect-notice';
-
-jest.mock('@vegaprotocol/web3', () => ({
-  useEthereumConfig: jest.fn(),
-}));
-
-jest.mock('@vegaprotocol/environment', () => ({
-  useEnvironment: jest.fn(),
-}));
-
-describe('MultisigIncorrectNotice', () => {
-  it('renders correctly when config is provided', () => {
-    (useEthereumConfig as jest.Mock).mockReturnValue({
-      config: {
-        multisig_control_contract: {
-          address: '0x1234',
-        },
-      },
-    });
-
-    (useEnvironment as unknown as jest.Mock).mockReturnValue({
-      ETHERSCAN_URL: 'https://etherscan.io',
-    });
-
-    render(<MultisigIncorrectNotice />);
-
-    expect(screen.getByTestId('multisig-contract-link')).toHaveAttribute(
-      'href',
-      'https://etherscan.io/address/0x1234'
-    );
-    expect(screen.getByTestId('multisig-contract-link')).toHaveAttribute(
-      'title',
-      '0x1234'
-    );
-    expect(
-      screen.getByTestId('multisig-validators-learn-more')
-    ).toBeInTheDocument();
-  });
-
-  it('does not render when config is not provided', () => {
-    (useEthereumConfig as jest.Mock).mockReturnValue({
-      config: null,
-    });
-
-    const { container } = render(<MultisigIncorrectNotice />);
-
-    expect(container.firstChild).toBeNull();
-  });
-});

apps/governance/src/components/multisig-incorrect-notice/multisig-incorrect-notice.tsx

@@ -1,49 +0,0 @@
-import { useTranslation } from 'react-i18next';
-import { Callout, Intent, Link } from '@vegaprotocol/ui-toolkit';
-import { useEthereumConfig } from '@vegaprotocol/web3';
-import { useEnvironment, DocsLinks } from '@vegaprotocol/environment';
-import type { EthereumConfig } from '@vegaprotocol/web3';
-
-export const MultisigIncorrectNotice = () => {
-  const { t } = useTranslation();
-  const { config } = useEthereumConfig();
-  const { ETHERSCAN_URL } = useEnvironment();
-
-  if (!config) {
-    return null;
-  }
-
-  const contract = config[
-    'multisig_control_contract' as keyof EthereumConfig
-  ] as {
-    address: string;
-  };
-
-  return (
-    <div className="mb-10">
-      <Callout intent={Intent.Warning}>
-        <div>
-          <Link
-            title={contract.address}
-            href={`${ETHERSCAN_URL}/address/${contract.address}`}
-            target="_blank"
-            data-testid="multisig-contract-link"
-          >
-            {t('multisigContractLink')}
-          </Link>{' '}
-          {t('multisigContractIncorrect')}
-        </div>
-
-        <div className="mt-2">
-          <Link
-            href={DocsLinks?.VALIDATOR_SCORES_REWARDS}
-            target="_blank"
-            data-testid="multisig-validators-learn-more"
-          >
-            {t('learnMore')}
-          </Link>
-        </div>
-      </Callout>
-    </div>
-  );
-};

apps/governance/src/components/vega-wallet-dialogs/risk-message.tsx

@@ -1,40 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import {
-  ExternalLink,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
-import Routes from '../../routes/routes';
-
-export const RiskMessage = () => {
-  return (
-    <>
-      <div className="bg-vega-light-100 dark:bg-vega-dark-100 p-6 mb-6">
-        <ul className="list-[square] ml-4">
-          <li>
-            {t(
-              'You may encounter bugs, loss of functionality or loss of assets using the App.'
-            )}
-          </li>
-          <li>
-            {t(
-              'No party accepts any liability for any losses whatsoever related to its use.'
-            )}
-          </li>
-        </ul>
-      </div>
-      <p className="mb-8">
-        {t(
-          'By using the Vega Governance App, you acknowledge that you have read and understood the'
-        )}{' '}
-        <ExternalLink href={Routes.DISCLAIMER} className="underline">
-          <span className="flex items-center gap-1">
-            <span>{t('Vega Governance Disclaimer')}</span>
-            <VegaIcon name={VegaIconNames.OPEN_EXTERNAL} />
-          </span>
-        </ExternalLink>
-        .
-      </p>
-    </>
-  );
-};

apps/governance/src/components/vega-wallet-dialogs/vega-wallet-dialogs.tsx

@@ -4,11 +4,9 @@ import {
   useAppState,
 } from '../../contexts/app-state/app-state-context';
 import { Connectors } from '../../lib/vega-connectors';
-import { RiskMessage } from './risk-message';
 
 export const VegaWalletDialogs = () => {
   const { appState, appDispatch } = useAppState();
-
   return (
     <>
       <VegaConnectDialog
@@ -19,7 +17,6 @@ export const VegaWalletDialogs = () => {
             isOpen: open,
           })
         }
-        riskMessage={<RiskMessage />}
       />
 
       <VegaManageDialog

apps/governance/src/hooks/use-listen-for-staking-events.ts

@@ -3,32 +3,32 @@ import { usePendingBalancesStore } from './use-pending-balances-manager';
 import type { Contract } from 'ethers';
 import { useListenForPendingEthEvents } from './use-listen-for-pending-eth-events';
 import { prepend0x } from '@vegaprotocol/smart-contracts';
-import { useWeb3React } from '@web3-react/core';
 
 export const useListenForStakingEvents = (
   contract: Contract | undefined,
   vegaPublicKey: string | null,
   numberOfConfirmations: number
 ) => {
-  const { account } = useWeb3React();
   const { addPendingTxs, removePendingTx, resetPendingTxs } =
     usePendingBalancesStore((state) => ({
       addPendingTxs: state.addPendingTxs,
       removePendingTx: state.removePendingTx,
       resetPendingTxs: state.resetPendingTxs,
     }));
-  const addFilter = useMemo(() => {
+  const addFilter = useMemo(
-    if (!account || !vegaPublicKey || !contract) return null;
+    () =>
-    return contract.filters.Stake_Deposited(
+      vegaPublicKey && contract
-      null,
+        ? contract.filters.Stake_Deposited(null, null, prepend0x(vegaPublicKey))
-      null,
+        : null,
-      prepend0x(vegaPublicKey)
+    [contract, vegaPublicKey]
-    );
+  );
-  }, [contract, vegaPublicKey, account]);
+  const removeFilter = useMemo(
-  const removeFilter = useMemo(() => {
+    () =>
-    if (!account || !vegaPublicKey || !contract) return null;
+      vegaPublicKey && contract
-    return contract.filters.Stake_Removed(null, null, prepend0x(vegaPublicKey));
+        ? contract.filters.Stake_Removed(null, null, prepend0x(vegaPublicKey))
-  }, [contract, vegaPublicKey, account]);
+        : null,
+    [contract, vegaPublicKey]
+  );
 
   /**
    * Listen for all add stake events

apps/governance/src/i18n/translations/dev.json

@@ -116,7 +116,7 @@
   "Showing tranches with <{{trancheMinimum}} VEGA, click to hide these tranches": "Showing tranches with ≤{{trancheMinimum}} $VEGA, click to hide these tranches",
   "Not showing tranches with <{{trancheMinimum}} VEGA, click to show all tranches": "Not showing tranches with ≤{{trancheMinimum}} $VEGA, click to show all tranches",
   "the holder": "the holder",
-  "Your data couldn't be loaded": "Your data couldn't be loaded",
+  "We couldn't seem to load your data.": "We couldn't seem to load your data.",
   "Vesting VEGA": "Vesting VEGA",
   "All the tokens in this tranche are locked and can not be redeemed yet.": "All the tokens in this tranche are locked and can not be redeemed yet.",
   "Redeem unlocked VEGA from tranche {{id}}": "Redeem unlocked $VEGA from tranche {{id}}",
@@ -596,8 +596,6 @@
   "noPercentage": "No percentage",
   "proposalJson": "Full proposal JSON",
   "proposalDetails": "Proposal details",
-  "marketSpecification": "Market specification",
-  "viewMarketJson": "View market JSON",
   "proposalDescription": "Description",
   "currentlySetTo": "Currently expected to ",
   "currently": "currently",
@@ -730,12 +728,8 @@
   "ThisWillSetEnactmentDeadlineTo": "This will set the enactment date to",
   "ThisWillSetValidationDeadlineTo": "This will set the validation deadline to",
   "Hours": "hours",
-  "ThisWillAdd2MinutesToAllowTimeToConfirmInWallet": "Note: 2 minutes of extra time are added when you choose the minimum value. This gives you time to confirm the proposal in your wallet.",
+  "ThisWillAdd2MinutesToAllowTimeToConfirmInWallet": "Note: we add 2 minutes of extra time when you choose the minimum value. This gives you time to confirm the proposal in your wallet.",
-  "ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline": "The proposal will fail if enactment is earlier than the voting deadline",
+  "ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline": "Proposal will fail if enactment is earlier than the voting deadline",
-  "ProposalWillFailIfEnactmentIsBelowTheMinimumDeadline": "The proposal will fail if enactment deadline is below the minimum",
-  "ProposalWillFailIfVotingIsBelowTheMinimumDeadline": "The proposal will fail if voting deadline is below the minimum",
-  "ProposalWillFailIfEnactmentIsAboveTheMaximumDeadline": "The proposal will fail if enactment deadline is above the maximum",
-  "ProposalWillFailIfVotingIsAboveTheMaximumDeadline": "The proposal will fail if voting deadline is above the maximum",
   "SelectAMarketToChange": "Select a market to change",
   "MarketName": "Market name",
   "MarketCode": "Market code",
@@ -786,7 +780,6 @@
   "performancePenalty": "Performance penalty",
   "overstaked": "Overstaked",
   "overstakedPenalty": "Overstaked penalty",
-  "multisigPenalty": "Multisig 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.",
   "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.",
@@ -822,19 +815,5 @@
   "NoThanks": "No thanks",
   "ShareData": "Share data",
   "ContinueSharingData": "Continue sharing data",
-  "NodeUnsuitable": "Node: {{url}} is unsuitable",
+  "NodeUnsuitable": "Node: {{url}} is unsuitable"
-  "Disclaimer": "Disclaimer",
-  "disclaimer1": "The Vega Governance App allows the Vega network to arrive at on-chain decisions, where tokenholders can create proposals that other tokenholders can vote to approve or reject.  Vega supports on-chain proposals for creating markets and assets, and changing network parameters, markets and assets. Vega also supports freeform proposals for community suggestions that will not be enacted on-chain.",
-  "disclaimer2": "The Vega Governance App is free, public and open source software.  Software upgrades may contain bugs or security vulnerabilities that might result in loss of functionality.",
-  "disclaimer3": "The Vega Governance App uses data obtained from nodes on the Vega Blockchain. The developers of the Vega Governance App do not operate or run the Vega Blockchain or any other blockchain.",
-  "disclaimer4": "The Vega Governance App is provided “as is”.  The developers of the Vega Governance App make no representations or warranties of any kind, whether express or implied, statutory or otherwise regarding the Vega Governance App.  They disclaim all warranties of merchantability, quality, fitness for purpose.  They disclaim all warranties that the Vega Governance App is free of harmful components or errors.",
-  "disclaimer5": "No developer of the Vega Governance App accepts any responsibility for, or liability to users in connection with their use of the Vega Governance App.",
-  "multisigContractLink": "Ethereum Multisig Contract",
-  "multisigContractIncorrect": "is incorrectly configured. Validator and delegator rewards will be penalised until this is resolved.",
-  "learnMore": "Learn more",
-  "AllValidators": "All validators",
-  "AllProposals": "All proposals",
-  "RejectedProposals": "Rejected proposals",
-  "networkGovernance": "Network governance",
-  "networkUpgrades": "Network upgrades"
 }

apps/governance/src/lib/get-multisig-status-info.spec.ts

@@ -1,70 +0,0 @@
-import {
-  getMultisigStatusInfo,
-  MultisigStatus,
-} from './get-multisig-status-info';
-import type { PreviousEpochQuery } from '../routes/staking/__generated__/PreviousEpoch';
-
-const createNode = (id: string, multisigScore: string) => ({
-  node: {
-    id,
-    stakedTotal: '1000',
-    rewardScore: { multisigScore },
-  },
-});
-
-describe('getMultisigStatus', () => {
-  it('should return MultisigStatus.noNodes when no nodes are present', () => {
-    const result = getMultisigStatusInfo({
-      epoch: { id: '1', validatorsConnection: { edges: [] } },
-    } as PreviousEpochQuery);
-    expect(result).toEqual({
-      multisigStatus: MultisigStatus.noNodes,
-      showMultisigStatusError: true,
-    });
-  });
-
-  it('should return MultisigStatus.correct when all nodes have multisigScore of 1', () => {
-    const result = getMultisigStatusInfo({
-      epoch: {
-        id: '1',
-        validatorsConnection: {
-          edges: [createNode('1', '1'), createNode('2', '1')],
-        },
-      },
-    } as PreviousEpochQuery);
-    expect(result).toEqual({
-      multisigStatus: MultisigStatus.correct,
-      showMultisigStatusError: false,
-    });
-  });
-
-  it('should return MultisigStatus.nodeNeedsRemoving when all nodes have multisigScore of 0', () => {
-    const result = getMultisigStatusInfo({
-      epoch: {
-        id: '1',
-        validatorsConnection: {
-          edges: [createNode('1', '0'), createNode('2', '0')],
-        },
-      },
-    } as PreviousEpochQuery);
-    expect(result).toEqual({
-      multisigStatus: MultisigStatus.nodeNeedsRemoving,
-      showMultisigStatusError: true,
-    });
-  });
-
-  it('should return MultisigStatus.nodeNeedsAdding when some nodes have multisigScore of 0 and others have 1', () => {
-    const result = getMultisigStatusInfo({
-      epoch: {
-        id: '1',
-        validatorsConnection: {
-          edges: [createNode('1', '0'), createNode('2', '1')],
-        },
-      },
-    } as PreviousEpochQuery);
-    expect(result).toEqual({
-      multisigStatus: MultisigStatus.nodeNeedsAdding,
-      showMultisigStatusError: true,
-    });
-  });
-});

apps/governance/src/lib/get-multisig-status-info.ts

@@ -1,42 +0,0 @@
-import { removePaginationWrapper } from '@vegaprotocol/utils';
-import type { PreviousEpochQuery } from '../routes/staking/__generated__/PreviousEpoch';
-
-export enum MultisigStatus {
-  'correct' = 'correct',
-  'nodeNeedsAdding' = 'nodeNeedsAdding',
-  'nodeNeedsRemoving' = 'nodeNeedsRemoving ',
-  'noNodes' = 'noNodes',
-}
-
-export const getMultisigStatusInfo = (
-  previousEpochData: PreviousEpochQuery
-) => {
-  let status = MultisigStatus.noNodes;
-
-  const allNodesInPreviousEpoch = removePaginationWrapper(
-    previousEpochData?.epoch.validatorsConnection?.edges
-  );
-
-  const hasZero = allNodesInPreviousEpoch.some(
-    (node) => Number(node?.rewardScore?.multisigScore) === 0
-  );
-  const hasOne = allNodesInPreviousEpoch.some(
-    (node) => Number(node?.rewardScore?.multisigScore) === 1
-  );
-
-  if (hasZero && hasOne) {
-    // If any individual node has 0 it means that node is missing from the multisig and needs to be added
-    status = MultisigStatus.nodeNeedsAdding;
-  } else if (hasZero) {
-    // If all nodes have 0 it means there is an incorrect address in the multisig that needs to be removed
-    status = MultisigStatus.nodeNeedsRemoving;
-  } else if (allNodesInPreviousEpoch.length > 0) {
-    // If all nodes have 1 it means the multisig is correct
-    status = MultisigStatus.correct;
-  }
-
-  return {
-    showMultisigStatusError: status !== MultisigStatus.correct,
-    multisigStatus: status,
-  };
-};

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

@@ -1,21 +0,0 @@
-import type { RouteChildProps } from '..';
-import { useDocumentTitle } from '../../hooks/use-document-title';
-import { Heading } from '../../components/heading';
-import { useTranslation } from 'react-i18next';
-
-const Disclaimer = ({ name }: RouteChildProps) => {
-  useDocumentTitle(name);
-  const { t } = useTranslation();
-  return (
-    <>
-      <Heading title={t('Disclaimer')} />
-      <p className="mb-6 mt-10">{t('disclaimer1')}</p>
-      <p className="mb-6">{t('disclaimer2')}</p>
-      <p className="mb-6">{t('disclaimer3')}</p>
-      <p className="mb-8">{t('disclaimer4')}</p>
-      <p className="mb-8">{t('disclaimer5')}</p>
-    </>
-  );
-};
-
-export default Disclaimer;

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

@@ -209,10 +209,7 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     [proposalsData]
   );
 
-  const sortedProposals = useMemo(
+  const sortedProposals = useMemo(() => orderByDate(proposals), [proposals]);
-    () => orderByDate(proposals).reverse(),
-    [proposals]
-  );
 
   const protocolUpgradeProposals = useMemo(
     () =>

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

@@ -1,9 +1,9 @@
 import ReactMarkdown from 'react-markdown';
+import classnames from 'classnames';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import { Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 
 export const ProposalDescription = ({
   description,
@@ -12,16 +12,23 @@ export const ProposalDescription = ({
 }) => {
   const { t } = useTranslation();
   const [showDescription, setShowDescription] = useState(false);
+  const showDescriptionIconClasses = classnames('mb-4', {
+    'rotate-180': showDescription,
+  });
 
   return (
     <section data-testid="proposal-description">
-      <CollapsibleToggle
+      <button
-        toggleState={showDescription}
+        onClick={() => setShowDescription(!showDescription)}
-        setToggleState={setShowDescription}
+        data-testid="proposal-description-toggle"
-        dataTestId={'proposal-description-toggle'}
       >
-        <SubHeading title={t('proposalDescription')} />
+        <div className="flex items-center gap-3">
-      </CollapsibleToggle>
+          <SubHeading title={t('proposalDescription')} />
+          <div className={showDescriptionIconClasses}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>
 
       {showDescription && (
         <RoundedWrapper paddingBottom={true} marginBottomLarge={true}>

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.spec.tsx

@@ -124,7 +124,7 @@ describe('Proposal header', () => {
       })
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
-      'New asset proposal'
+      'Unknown proposal'
     );
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(

apps/governance/src/routes/proposals/components/proposal-detail-header/proposal-header.tsx

@@ -21,7 +21,6 @@ export const ProposalHeader = ({
 
   let details: ReactNode;
   let proposalType = '';
-  let fallbackTitle = '';
 
   const title = proposal?.rationale.title.trim();
 
@@ -30,7 +29,6 @@ export const ProposalHeader = ({
   switch (change?.__typename) {
     case 'NewMarket': {
       proposalType = 'NewMarket';
-      fallbackTitle = t('NewMarketProposal');
       details = (
         <>
           <span>
@@ -52,7 +50,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateMarket': {
       proposalType = 'UpdateMarket';
-      fallbackTitle = t('UpdateMarketProposal');
       details = (
         <>
           <span>{t('Market change')}:</span>{' '}
@@ -63,7 +60,6 @@ export const ProposalHeader = ({
     }
     case 'NewAsset': {
       proposalType = 'NewAsset';
-      fallbackTitle = t('NewAssetProposal');
       details = (
         <>
           <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
@@ -85,7 +81,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateNetworkParameter': {
       proposalType = 'NetworkParameter';
-      fallbackTitle = t('NetworkParameterProposal');
       details = (
         <>
           <span>{t('Change')}:</span>{' '}
@@ -100,13 +95,11 @@ export const ProposalHeader = ({
     }
     case 'NewFreeform': {
       proposalType = 'Freeform';
-      fallbackTitle = t('FreeformProposal');
       details = <span />;
       break;
     }
     case 'UpdateAsset': {
       proposalType = 'UpdateAsset';
-      fallbackTitle = t('UpdateAssetProposal');
       details = (
         <>
           <span>{t('AssetID')}:</span>{' '}
@@ -122,14 +115,10 @@ export const ProposalHeader = ({
       <div data-testid="proposal-title">
         {isListItem ? (
           <header>
-            <SubHeading
+            <SubHeading title={titleContent || t('Unknown proposal')} />
-              title={titleContent || fallbackTitle || t('Unknown proposal')}
-            />
           </header>
         ) : (
-          <Heading
+          <Heading title={titleContent || t('Unknown proposal')} />
-            title={titleContent || fallbackTitle || t('Unknown proposal')}
-          />
         )}
       </div>
 

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

@@ -1,8 +1,8 @@
+import classnames from 'classnames';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { Icon, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
@@ -13,16 +13,23 @@ export const ProposalJson = ({
 }) => {
   const { t } = useTranslation();
   const [showDetails, setShowDetails] = useState(false);
+  const showDetailsIconClasses = classnames('mb-4', {
+    'rotate-180': showDetails,
+  });
 
   return (
     <section data-testid="proposal-json">
-      <CollapsibleToggle
+      <button
-        toggleState={showDetails}
+        onClick={() => setShowDetails(!showDetails)}
-        setToggleState={setShowDetails}
+        data-testid="proposal-json-toggle"
-        dataTestId="proposal-json-toggle"
       >
-        <SubHeading title={t('proposalJson')} />
+        <div className="flex items-center gap-3">
-      </CollapsibleToggle>
+          <SubHeading title={t('proposalJson')} />
+          <div className={showDetailsIconClasses}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>
 
       {showDetails && <SyntaxHighlighter data={proposal} />}
     </section>

apps/governance/src/routes/proposals/components/proposal-market-data/index.tsx

@@ -1 +0,0 @@
-export * from './proposal-market-data';

apps/governance/src/routes/proposals/components/proposal-market-data/proposal-market-data.tsx

@@ -1,218 +0,0 @@
-import isEqual from 'lodash/isEqual';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  InstrumentInfoPanel,
-  KeyDetailsInfoPanel,
-  LiquidityMonitoringParametersInfoPanel,
-  LiquidityPriceRangeInfoPanel,
-  MetadataInfoPanel,
-  OracleInfoPanel,
-  PriceMonitoringBoundsInfoPanel,
-  RiskFactorsInfoPanel,
-  RiskModelInfoPanel,
-  RiskParametersInfoPanel,
-  SettlementAssetInfoPanel,
-} from '@vegaprotocol/markets';
-import {
-  Accordion,
-  AccordionItem,
-  Button,
-  CopyWithTooltip,
-  Dialog,
-  Icon,
-  SyntaxHighlighter,
-} from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
-import type { DataSourceDefinition } from '@vegaprotocol/types';
-import { create } from 'zustand';
-
-type MarketDataDialogState = {
-  isOpen: boolean;
-  open: () => void;
-  close: () => void;
-};
-
-export const useMarketDataDialogStore = create<MarketDataDialogState>(
-  (set) => ({
-    isOpen: false,
-    open: () => set({ isOpen: true }),
-    close: () => set({ isOpen: false }),
-  })
-);
-
-export const ProposalMarketData = ({
-  marketData,
-}: {
-  marketData: MarketInfoWithData;
-}) => {
-  const { t } = useTranslation();
-  const { isOpen, open, close } = useMarketDataDialogStore();
-  const [showDetails, setShowDetails] = useState(false);
-
-  if (!marketData) {
-    return null;
-  }
-
-  const settlementData = marketData.tradableInstrument.instrument.product
-    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
-  const terminationData = marketData.tradableInstrument.instrument.product
-    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
-
-  const getSigners = (data: DataSourceDefinition) => {
-    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
-      const signers = data.sourceType.sourceType.signers || [];
-
-      return signers.map(({ signer }) => {
-        return (
-          (signer.__typename === 'ETHAddress' && signer.address) ||
-          (signer.__typename === 'PubKey' && signer.key)
-        );
-      });
-    }
-    return [];
-  };
-
-  return (
-    <section className="relative" data-testid="proposal-market-data">
-      <CollapsibleToggle
-        toggleState={showDetails}
-        setToggleState={setShowDetails}
-        dataTestId="proposal-market-data-toggle"
-      >
-        <SubHeading title={t('marketSpecification')} />
-      </CollapsibleToggle>
-
-      {showDetails && (
-        <>
-          <div className="float-right">
-            <Button onClick={open} data-testid="view-market-json">
-              {t('viewMarketJson')}
-            </Button>
-          </div>
-          <div className="mb-10">
-            <Accordion>
-              <AccordionItem
-                itemId="key-details"
-                title={t('Key details')}
-                content={<KeyDetailsInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="instrument"
-                title={t('Instrument')}
-                content={<InstrumentInfoPanel market={marketData} />}
-              />
-              {isEqual(
-                getSigners(settlementData),
-                getSigners(terminationData)
-              ) ? (
-                <AccordionItem
-                  itemId="oracles"
-                  title={t('Oracle')}
-                  content={
-                    <OracleInfoPanel
-                      market={marketData}
-                      type="settlementData"
-                    />
-                  }
-                />
-              ) : (
-                <>
-                  <AccordionItem
-                    itemId="settlement-oracle"
-                    title={t('Settlement Oracle')}
-                    content={
-                      <OracleInfoPanel
-                        market={marketData}
-                        type="settlementData"
-                      />
-                    }
-                  />
-
-                  <AccordionItem
-                    itemId="termination-oracle"
-                    title={t('Termination Oracle')}
-                    content={
-                      <OracleInfoPanel market={marketData} type="termination" />
-                    }
-                  />
-                </>
-              )}
-              <AccordionItem
-                itemId="settlement-asset"
-                title={t('Settlement asset')}
-                content={<SettlementAssetInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="metadata"
-                title={t('Metadata')}
-                content={<MetadataInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="risk-model"
-                title={t('Risk model')}
-                content={<RiskModelInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="risk-parameters"
-                title={t('Risk parameters')}
-                content={<RiskParametersInfoPanel market={marketData} />}
-              />
-              <AccordionItem
-                itemId="risk-factors"
-                title={t('Risk factors')}
-                content={<RiskFactorsInfoPanel market={marketData} />}
-              />
-              {(
-                marketData.priceMonitoringSettings?.parameters?.triggers || []
-              ).map((_, triggerIndex) => (
-                <AccordionItem
-                  itemId={`trigger-${triggerIndex}`}
-                  title={t(`Price monitoring bounds ${triggerIndex + 1}`)}
-                  content={
-                    <PriceMonitoringBoundsInfoPanel
-                      market={marketData}
-                      triggerIndex={triggerIndex}
-                    />
-                  }
-                />
-              ))}
-              <AccordionItem
-                itemId="liqudity-monitoring-parameters"
-                title={t('Liquidity monitoring parameters')}
-                content={
-                  <LiquidityMonitoringParametersInfoPanel market={marketData} />
-                }
-              />
-              <AccordionItem
-                itemId="liquidity-price-range"
-                title={t('Liquidity price range')}
-                content={<LiquidityPriceRangeInfoPanel market={marketData} />}
-              />
-            </Accordion>
-          </div>
-        </>
-      )}
-
-      <Dialog
-        title={marketData.tradableInstrument.instrument.code}
-        open={isOpen}
-        onChange={(isOpen) => (isOpen ? open() : close())}
-        size="medium"
-        dataTestId="market-json-dialog"
-      >
-        <CopyWithTooltip text={JSON.stringify(marketData)}>
-          <button className="bg-vega-dark-100 rounded-sm py-2 px-3 mb-4 text-white">
-            <span>
-              <Icon name="duplicate" />
-            </span>
-            <span className="ml-2">Copy</span>
-          </button>
-        </CopyWithTooltip>
-        <SyntaxHighlighter data={marketData} />
-      </Dialog>
-    </section>
-  );
-};

apps/governance/src/routes/proposals/components/proposal-votes-table/proposal-votes-table.tsx

@@ -1,3 +1,4 @@
+import classnames from 'classnames';
 import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
@@ -5,13 +6,13 @@ import {
   KeyValueTableRow,
   Thumbs,
   RoundedWrapper,
+  Icon,
 } from '@vegaprotocol/ui-toolkit';
 import { formatNumber, formatNumberPercentage } from '@vegaprotocol/utils';
 import { SubHeading } from '../../../../components/heading';
 import { useVoteInformation } from '../../hooks';
 import { useAppState } from '../../../../contexts/app-state/app-state-context';
 import { ProposalType } from '../proposal/proposal';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 
@@ -56,15 +57,23 @@ export const ProposalVotesTable = ({
     ? t('byTokenVote')
     : t('byLiquidityVote');
 
+  const showDetailsIconClasses = classnames('mb-4', {
+    'rotate-180': showDetails,
+  });
+
   return (
     <>
-      <CollapsibleToggle
+      <button
-        toggleState={showDetails}
+        onClick={() => setShowDetails(!showDetails)}
-        setToggleState={setShowDetails}
+        data-testid="vote-breakdown-toggle"
-        dataTestId="vote-breakdown-toggle"
       >
-        <SubHeading title={t('voteBreakdown')} />
+        <div className="flex items-center gap-3">
-      </CollapsibleToggle>
+          <SubHeading title={t('voteBreakdown')} />
+          <div className={showDetailsIconClasses}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>
 
       {showDetails && (
         <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>