feat(ci): turn off nx cloud

.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 }}"
-          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
-          echo "Commit: $commit"
-          until docker pull vegaprotocol/trading:$commit; do
+          until docker pull vegaprotocol/trading:${{ github.event.release.tag_name }}; 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"

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

@@ -6,9 +6,9 @@ on:
       - release/*
       - develop
       - main
-  # uncomment pull_request and comment pull_request_target to test CI changes against feature branch not target branch (develop)
-  # pull_request:
-  pull_request_target:
+    tags:
+      - v*
+  pull_request:
     types:
       - opened
       - ready_for_review
@@ -22,8 +22,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 +47,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 +62,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
@@ -112,82 +109,51 @@ jobs:
           echo "Branch slug: ${branch_slug}"
           echo ">>>> eof debug"
 
-          projects_array=()
-
+          projects_e2e=""
           preview_governance="not deployed"
           preview_trading="not deployed"
           preview_explorer="not deployed"
           preview_tools="not deployed"
-
-          # parse if affected is any of three main applications, if none - use all of them
           if echo "$affected" | grep -q governance; then
             echo "Governance is affected"
-            projects_array+=("governance")
+            projects_e2e+='"governance-e2e" '
             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")
+            projects_e2e+='"trading-e2e" '
             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")
+            projects_e2e+='"explorer-e2e" '
             preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
           fi
-          if [[ ${#projects_array[@]} -eq 0 ]]; then
-            projects_array=("governance" "trading" "explorer")
+          if [[ -z "$projects_e2e" ]]; then
+            projects_e2e+='"governance-e2e" "trading-e2e" "explorer-e2e" '
             preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
             preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
             preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
           fi
-
-          # applications parsed before this loop are applicable for running e2e-tests
-          projects_e2e_array=()
-          for project in "${projects_array[@]}"; do
-            projects_e2e_array+=("${project}-e2e")
-          done
-          # all applications below this loop are not applicable for running e2e-test
-
-          # check if pull request event to deploy tools
-          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
-            if echo "$affected" | grep -q multisig-signer; then
-              echo "Tools are affected"
+          projects="$(echo $projects_e2e | sed 's|-e2e||g')"
+          if echo "$affected" | grep -q multisig-signer; then
+            echo "Tools are affected"
+            # tools are only applicable to check previews or deploy from develop to mainnet
+            if [[ "${{ github.event_name }}" = "pull_request" ]]; then
               echo "Deploying tools on preview"
               preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
-
-              projects_array+=("multisig-signer")
+              projects+=' "multisig-signer" '
             fi
-          # those apps deploy only from develop to mainnet
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-            if echo "$affected" | grep -q multisig-signer; then
-              echo "Tools are affected"
+            if [[ "${{ github.ref }}" =~ .*develop$ ]]; then
               echo "Deploying tools on s3"
-
-              projects_array+=("multisig-signer")
-            fi
-            if echo "$affected" | grep -q static; then
-              echo "static is affected"
-              echo "Deploying static on s3"
-
-              projects_array+=("static")
-            fi
-            if echo "$affected" | grep -q ui-toolkit; then
-              echo "ui-toolkit is affected"
-              echo "Deploying ui-toolkit on s3"
-
-              projects_array+=("ui-toolkit")
+              projects+=' "multisig-signer" '
             fi
           fi
-
-          echo "Projects: ${projects_array[@]}"
-          echo "Projects E2E: ${projects_e2e_array[@]}"
-          projects_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_array[@]}")
-          projects_e2e_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_e2e_array[@]}")
-
-          echo PROJECTS_E2E=$projects_e2e_json >> $GITHUB_ENV
-          echo PROJECTS=$projects_json >> $GITHUB_ENV
-
+          projects_e2e=${projects_e2e%?}
+          projects_e2e=[${projects_e2e// /,}]
+          projects=[${projects// /,}]
+          echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
+          echo PROJECTS=$projects >> $GITHUB_ENV
           echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
           echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
           echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
@@ -204,7 +170,7 @@ jobs:
   cypress:
     needs: lint-test-build
     name: '(CI) cypress'
-    # if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
+    if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
@@ -214,7 +180,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,7 +191,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:

.github/workflows/cypress-run.yml

@@ -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/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 }}
@@ -77,16 +74,10 @@ jobs:
               envName="mainnet"
               bucketName="tools.vega.xyz"
             fi
-            if [[ "${{ matrix.app }}" = "static" ]]; then
-              envName="mainnet"
-              bucketName="static.vega.xyz"
-            fi
-            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
-              envName="mainnet"
-              bucketName="ui.vega.rocks"
-            fi
           elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
             envName="mainnet"
+          elif [[ "${{ matrix.app}}" = "trading" ]] && [[ "${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }}" = "true" ]]; then
+            envName="mainnet"
           fi
 
           if [[ "${envName}" = "mainnet" ]]; then
@@ -115,15 +106,14 @@ jobs:
         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 +135,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 +148,7 @@ jobs:
 
       - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
-        continue-on-error: true
-        id: ghcr-push
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ github.event_name == 'pull_request' || (matrix.app == 'trading' && github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') ) }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -173,9 +161,7 @@ jobs:
 
       - name: Publish dist as docker image (docker hub)
         uses: docker/build-push-action@v3
-        continue-on-error: true
-        id: dockerhub-push
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -184,41 +170,13 @@ jobs:
             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' || '' }}
-
-      - 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' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ github.ref_name }}
+            vegaprotocol/${{ matrix.app }}:mainnet
 
       # 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' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
+        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') && ( matrix.app != 'trading' || (matrix.app == 'trading' && !endsWith(github.ref, 'main') ) ) }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -228,62 +186,30 @@ jobs:
           AWS_REGION: 'eu-west-1'
           SOURCE_DIR: 'dist-result'
 
-      - name: Install aws CLI
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
-        uses: unfor19/install-aws-cli-action@master
-
-      - name: Perform cache invalidation
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
-        env:
-          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          AWS_REGION: 'eu-west-1'
-        run: |
-          echo "Looking for distribution for bucket: ${{ env.BUCKET_NAME }}"
-          id=$(aws cloudfront list-distributions | jq -Mrc '.DistributionList.Items | .[] | select(.DefaultCacheBehavior.TargetOriginId == "${{ env.BUCKET_NAME }}") | .Id')
-          echo "Found id is: ${id}"
-          aws cloudfront create-invalidation --distribution-id $id --paths "/*"
-
       - 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' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         run: |
-          if echo ${{ github.ref }} | grep -q main; then
-            # display info about app
-            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
-              -H "Content-Type: application/json" \
-              -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
-              https://api.fleek.co/graphql
+          # display info about app
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){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:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
-              https://api.fleek.co/graphql
-
-          elif echo ${{ github.ref }} | grep -q release/testnet; then
-            # display info about app
-            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
+          # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+          curl -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+            -H "Content-Type: application/json" \
+            -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+            https://api.fleek.co/graphql
 
       - name: Check out ipfs-redirect
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         uses: actions/checkout@v3
         with:
           repository: 'vegaprotocol/ipfs-redirect'
@@ -291,12 +217,11 @@ jobs:
           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') ) }}
+      - name: Update console.vega.xyz DNS to redirect to the new console
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         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"
@@ -304,28 +229,52 @@ jobs:
           new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
           new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
 
+          ls -al ipfs-redirect
+
+          echo $new_hash > ipfs-redirect/cidv0.txt
+          echo $new_cid > ipfs-redirect/cidv1.txt
+
           (
             cd ipfs-redirect
 
-            # configure git
             git status
             cat .git/config
             git config --global user.email "vega-ci-bot@vega.xyz"
             git config --global user.name "vega-ci-bot"
 
-            # update CID files
-            if echo ${{ github.ref }} | grep -q main; then
-              echo $new_hash > cidv0-mainnet.txt
-              echo $new_cid > cidv1-mainnet.txt
-              git add cidv0-mainnet.txt cidv1-mainnet.txt
-            elif echo ${{ github.ref }} | grep -q release/testnet; then
-              echo $new_hash > cidv0-fairground.txt
-              echo $new_cid > cidv1-fairground.txt
-              git add cidv0-fairground.txt cidv1-fairground.txt
-            fi
-
-            # create commit
+            branch_name="update-hash-${{ github.ref }}"
+            git checkout -b "$branch_name"
             commit_msg="Automated hash update from ${{ github.ref }}"
+            git add cidv0.txt cidv1.txt
             git commit -m "$commit_msg"
-            git push -u origin "main"
+            git push -u origin "$branch_name"
+            pr_url="$(gh pr create --title "${commit_msg}" --body 'automated pull request to update CIDs')"
+            echo $pr_url
+            # once auto merge get's enabled on documentation repo let's do follow up
+            sleep 5
+            gh pr merge "${pr_url}" --delete-branch --squash --admin
           )
+
+          # # Generate console URL
+          # 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}"
+
+          # # Update record in DNSimple
+          # # docs: https://developer.dnsimple.com/v2/zones/records/#updateZoneRecord
+          # dnsimple_account_id=84895
+          # dnsimple_zone_name=console.vega.xyz
+          # dnsimple_record_id=44409591
+          # # see: https://dnsimple.com/a/84895/domains/console.vega.xyz/records/44409591/edit
+
+          # curl  -H 'Authorization: Bearer ${{ secrets.DNSIMPLE_API_TOKEN }}' \
+          #       -H 'Accept: application/json' \
+          #       -H 'Content-Type: application/json' \
+          #       -X PATCH \
+          #       -d "{
+          #             \"content\": \"${new_console_url}\"
+          #       }" \
+          #       https://api.dnsimple.com/v2/${dnsimple_account_id}/zones/${dnsimple_zone_name}/records/${dnsimple_record_id}

apps/explorer/.env.mainnet

@@ -5,7 +5,7 @@ NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/
 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

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/components/assets/assets-table.tsx

@@ -1,15 +1,15 @@
-import { useMemo } from 'react';
 import type { AssetFieldsFragment } from '@vegaprotocol/assets';
 import { AssetTypeMapping, AssetStatusMapping } from '@vegaprotocol/assets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
+import { AgGridColumn } from 'ag-grid-react';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
 import { useNavigate } from 'react-router-dom';
-import type { RowClickedEvent, ColDef } from 'ag-grid-community';
+import type { RowClickedEvent } from 'ag-grid-community';
 
 type AssetsTableProps = {
   data: AssetFieldsFragment[] | null;
@@ -31,58 +31,6 @@ export const AssetsTable = ({ data }: AssetsTableProps) => {
     };
   }, []);
 
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      { headerName: t('Symbol'), field: 'symbol' },
-      { headerName: t('Name'), field: 'name' },
-      {
-        flex: 2,
-        headerName: t('ID'),
-        field: 'id',
-        hide: window.innerWidth < BREAKPOINT_MD,
-      },
-      {
-        colId: 'type',
-        headerName: t('Type'),
-        field: 'source.__typename',
-        hide: window.innerWidth < BREAKPOINT_MD,
-        valueFormatter: ({ value }: { value?: string }) =>
-          value ? AssetTypeMapping[value].value : '',
-      },
-      {
-        headerName: t('Status'),
-        field: 'status',
-        hide: window.innerWidth < BREAKPOINT_MD,
-        valueFormatter: ({ value }: { value?: string }) =>
-          value ? AssetStatusMapping[value].value : '',
-      },
-      {
-        colId: 'actions',
-        headerName: '',
-        sortable: false,
-        filter: false,
-        resizable: false,
-        wrapText: true,
-        field: 'id',
-        cellRenderer: ({
-          value,
-        }: VegaICellRendererParams<AssetFieldsFragment, 'id'>) =>
-          value ? (
-            <ButtonLink
-              onClick={(e) => {
-                navigate(value);
-              }}
-            >
-              {t('View details')}
-            </ButtonLink>
-          ) : (
-            ''
-          ),
-      },
-    ],
-    [navigate]
-  );
-
   return (
     <AgGrid
       ref={ref}
@@ -98,11 +46,60 @@ export const AssetsTable = ({ data }: AssetsTableProps) => {
         filterParams: { buttons: ['reset'] },
         autoHeight: true,
       }}
-      columnDefs={columnDefs}
       suppressCellFocus={true}
       onRowClicked={({ data }: RowClickedEvent) => {
         navigate(data.id);
       }}
-    />
+    >
+      <AgGridColumn headerName={t('Symbol')} field="symbol" />
+      <AgGridColumn headerName={t('Name')} field="name" />
+      <AgGridColumn
+        flex="2"
+        headerName={t('ID')}
+        field="id"
+        hide={window.innerWidth < BREAKPOINT_MD}
+      />
+      <AgGridColumn
+        colId="type"
+        headerName={t('Type')}
+        field="source.__typename"
+        hide={window.innerWidth < BREAKPOINT_MD}
+        valueFormatter={({ value }: { value?: string }) =>
+          value && AssetTypeMapping[value].value
+        }
+      />
+      <AgGridColumn
+        headerName={t('Status')}
+        field="status"
+        hide={window.innerWidth < BREAKPOINT_MD}
+        valueFormatter={({ value }: { value?: string }) =>
+          value && AssetStatusMapping[value].value
+        }
+      />
+      <AgGridColumn
+        colId="actions"
+        headerName=""
+        sortable={false}
+        filter={false}
+        resizable={false}
+        wrapText={true}
+        field="id"
+        cellRenderer={({
+          value,
+        }: VegaICellRendererParams<AssetFieldsFragment, 'id'>) =>
+          value ? (
+            <ButtonLink
+              onClick={(e) => {
+                navigate(value);
+              }}
+            >
+              {t('View details')}
+            </ButtonLink>
+          ) : (
+            ''
+          )
+        }
+      />
+    </AgGrid>
   );
 };

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">
-      <Icon name="refresh" className="!align-baseline mr-2" size={3} />
-      {t('Load new')}
-    </Button>
+    <div className="mb-4">
+      <span data-testid="new-blocks">{blocksToLoad} new blocks - </span>
+      <ButtonLink onClick={refresh} data-testid="refresh">
+        {t('refresh to see latest')}
+      </ButtonLink>
+    </div>
   );
 };

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

@@ -1,9 +1,8 @@
-import { useMemo } from 'react';
 import type { MarketFieldsFragment } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
-import type { ColDef } from 'ag-grid-community';
+import { AgGridColumn } from 'ag-grid-react';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
@@ -40,34 +39,54 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
     };
   }, []);
 
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        colId: 'code',
-        headerName: t('Code'),
-        field: 'tradableInstrument.instrument.code',
-      },
-      {
-        colId: 'name',
-        headerName: t('Name'),
-        field: 'tradableInstrument.instrument.name',
-      },
-      {
-        headerName: t('Status'),
-        field: 'state',
-        hide: window.innerWidth <= BREAKPOINT_MD,
-        valueGetter: ({
+  return (
+    <AgGrid
+      ref={gridRef}
+      rowData={data}
+      getRowId={({ data }: { data: MarketFieldsFragment }) => data.id}
+      overlayNoRowsTemplate={t('This chain has no markets')}
+      domLayout="autoHeight"
+      defaultColDef={{
+        flex: 1,
+        resizable: true,
+        sortable: true,
+        filter: true,
+        filterParams: { buttons: ['reset'] },
+        autoHeight: true,
+      }}
+      suppressCellFocus={true}
+      onRowClicked={({ data, event }: RowClickedEvent) => {
+        if ((event?.target as HTMLElement).tagName.toUpperCase() !== 'BUTTON') {
+          navigate(data.id);
+        }
+      }}
+    >
+      <AgGridColumn
+        colId="code"
+        headerName={t('Code')}
+        field="tradableInstrument.instrument.code"
+      />
+      <AgGridColumn
+        colId="name"
+        headerName={t('Name')}
+        field="tradableInstrument.instrument.name"
+      />
+      <AgGridColumn
+        headerName={t('Status')}
+        field="state"
+        hide={window.innerWidth <= BREAKPOINT_MD}
+        valueGetter={({
           data,
-        }: VegaValueGetterParams<MarketFieldsFragment>) => {
+        }: VegaValueGetterParams<MarketFieldsFragment, 'state'>) => {
           return data?.state ? MarketStateMapping[data?.state] : '-';
-        },
-      },
-      {
-        colId: 'asset',
-        headerName: t('Settlement asset'),
-        field: 'tradableInstrument.instrument.product.settlementAsset.symbol',
-        hide: window.innerWidth <= BREAKPOINT_MD,
-        cellRenderer: ({
+        }}
+      />
+      <AgGridColumn
+        colId="asset"
+        headerName={t('Settlement asset')}
+        field="tradableInstrument.instrument.product.settlementAsset.symbol"
+        hide={window.innerWidth <= BREAKPOINT_MD}
+        cellRenderer={({
           data,
         }: VegaICellRendererParams<
           MarketFieldsFragment,
@@ -86,19 +105,19 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
           ) : (
             ''
           );
-        },
-      },
-      {
-        flex: 2,
-        headerName: t('Market ID'),
-        field: 'id',
-        hide: window.innerWidth <= BREAKPOINT_MD,
-      },
-      {
-        colId: 'actions',
-        headerName: '',
-        field: 'id',
-        cellRenderer: ({
+        }}
+      />
+      <AgGridColumn
+        flex={2}
+        headerName={t('Market ID')}
+        field="id"
+        hide={window.innerWidth <= BREAKPOINT_MD}
+      />
+      <AgGridColumn
+        colId="actions"
+        headerName=""
+        field="id"
+        cellRenderer={({
           value,
         }: VegaICellRendererParams<MarketFieldsFragment, 'id'>) =>
           value ? (
@@ -107,34 +126,9 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
             </Link>
           ) : (
             ''
-          ),
-      },
-    ],
-    [openAssetDetailsDialog]
-  );
-
-  return (
-    <AgGrid
-      ref={gridRef}
-      rowData={data}
-      getRowId={({ data }: { data: MarketFieldsFragment }) => data.id}
-      overlayNoRowsTemplate={t('This chain has no markets')}
-      domLayout="autoHeight"
-      defaultColDef={{
-        flex: 1,
-        resizable: true,
-        sortable: true,
-        filter: true,
-        filterParams: { buttons: ['reset'] },
-        autoHeight: true,
-      }}
-      columnDefs={columnDefs}
-      suppressCellFocus={true}
-      onRowClicked={({ data, event }: RowClickedEvent) => {
-        if ((event?.target as HTMLElement).tagName.toUpperCase() !== 'BUTTON') {
-          navigate(data.id);
+          )
         }
-      }}
-    />
+      />
+    </AgGrid>
   );
 };

apps/explorer/src/app/components/order-details/amend-order-details.spec.tsx

@@ -12,7 +12,7 @@ type Amend = components['schemas']['v1OrderAmendment'];
 
 function renderAmendOrderDetails(
   id: string,
-  version: number | undefined,
+  version: number,
   amend: Amend,
   mocks: MockedResponse[]
 ) {
@@ -25,11 +25,7 @@ function renderAmendOrderDetails(
   );
 }
 
-function renderExistingAmend(
-  id: string,
-  version: number | undefined,
-  amend: Amend
-) {
+function renderExistingAmend(id: string, version: number, amend: Amend) {
   const mocks = [
     {
       request: {
@@ -81,55 +77,6 @@ function renderExistingAmend(
         },
       },
     },
-    {
-      request: {
-        query: ExplorerDeterministicOrderDocument,
-        variables: {
-          orderId: '123',
-        },
-      },
-      result: {
-        data: {
-          orderByID: {
-            __typename: 'Order',
-            id: '123',
-            type: 'GTT',
-            status: Schema.OrderStatus.STATUS_ACTIVE,
-            version: 100,
-            createdAt: '123',
-            updatedAt: '456',
-            expiresAt: '789',
-            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-            price: '200',
-            side: 'BUY',
-            remaining: '99',
-            rejectionReason: 'rejection',
-            reference: '123',
-            size: '200',
-            party: {
-              __typename: 'Party',
-              id: '234',
-            },
-            market: {
-              __typename: 'Market',
-              id: 'amend-to-order-latest-version',
-              state: 'STATUS_ACTIVE',
-              positionDecimalPlaces: 2,
-              decimalPlaces: '5',
-              tradableInstrument: {
-                instrument: {
-                  name: 'amend-to-order-latest-version-test',
-                  product: {
-                    __typename: 'Future',
-                    quoteName: '123',
-                  },
-                },
-              },
-            },
-          },
-        },
-      },
-    },
     {
       request: {
         query: ExplorerMarketDocument,
@@ -210,15 +157,4 @@ describe('Amend order details', () => {
     expect(await res.findByText('New price')).toBeInTheDocument();
     expect(await res.findByText('-7879')).toBeInTheDocument();
   });
-
-  it('Fetches latest version when version is not specified', async () => {
-    const amend: Amend = {
-      price: '-7879',
-    };
-
-    const res = renderExistingAmend('123', undefined, amend);
-    expect(
-      await res.findByText('amend-to-order-latest-version')
-    ).toBeInTheDocument();
-  });
 });

apps/explorer/src/app/components/order-details/amend-order-details.tsx

@@ -12,7 +12,7 @@ import { wrapperClasses } from './deterministic-order-details';
 export interface AmendOrderDetailsProps {
   id: string;
   amend: components['schemas']['v1OrderAmendment'];
-  // Version to fetch. Latest is provided by default
+  // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
   version?: number;
 }
 
@@ -34,11 +34,13 @@ export function getSideDeltaColour(delta: string): string {
  * @param param0
  * @returns
  */
-const AmendOrderDetails = ({ id, version, amend }: AmendOrderDetailsProps) => {
-  const variables = version ? { orderId: id, version } : { orderId: id };
-
+const AmendOrderDetails = ({
+  id,
+  version = 0,
+  amend,
+}: AmendOrderDetailsProps) => {
   const { data, error } = useExplorerDeterministicOrderQuery({
-    variables,
+    variables: { orderId: id, version },
   });
 
   if (error || (data && !data.orderByID)) {

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

@@ -1,6 +1,7 @@
 import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
+import { AgGridColumn } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
@@ -8,7 +9,7 @@ import type {
   VegaValueFormatterParams,
 } from '@vegaprotocol/datagrid';
 import { useLayoutEffect, useMemo, useRef, useState } from 'react';
-import type { RowClickedEvent, ColDef } from 'ag-grid-community';
+import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import {
@@ -63,128 +64,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
     title: '',
     content: null,
   });
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        colId: 'title',
-        headerName: t('Title'),
-        field: 'rationale.title',
-        flex: 2,
-        wrapText: true,
-      },
-      {
-        colId: 'type',
-        maxWidth: 180,
-        hide: window.innerWidth <= BREAKPOINT_MD,
-        headerName: t('Type'),
-        field: 'terms.change.__typename',
-      },
-      {
-        maxWidth: 100,
-        headerName: t('State'),
-        field: 'state',
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<ProposalListFieldsFragment, 'state'>) => {
-          return value ? ProposalStateMapping[value] : '-';
-        },
-      },
-      {
-        colId: 'voting',
-        maxWidth: 100,
-        hide: window.innerWidth <= BREAKPOINT_MD,
-        headerName: t('Voting'),
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
-          if (data) {
-            const yesTokens = new BigNumber(data.votes.yes.totalTokens);
-            const noTokens = new BigNumber(data.votes.no.totalTokens);
-            const totalTokensVoted = yesTokens.plus(noTokens);
-            const yesPercentage = totalTokensVoted.isZero()
-              ? new BigNumber(0)
-              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
-            return (
-              <div className="uppercase flex h-full items-center justify-center pt-2">
-                <VoteProgress
-                  threshold={requiredMajorityPercentage}
-                  progress={yesPercentage}
-                />
-              </div>
-            );
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'cDate',
-        maxWidth: 150,
-        hide: window.innerWidth <= BREAKPOINT_MD,
-        headerName: t('Closing date'),
-        field: 'terms.closingDatetime',
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<
-          ProposalListFieldsFragment,
-          'terms.closingDatetime'
-        >) => {
-          return value ? getDateTimeFormat().format(new Date(value)) : '-';
-        },
-      },
-      {
-        colId: 'eDate',
-        maxWidth: 150,
-        hide: window.innerWidth <= BREAKPOINT_MD,
-        headerName: t('Enactment date'),
-        field: 'terms.enactmentDatetime',
-        valueFormatte: ({
-          value,
-        }: VegaValueFormatterParams<
-          ProposalListFieldsFragment,
-          'terms.enactmentDatetime'
-        >) => {
-          return value ? getDateTimeFormat().format(new Date(value)) : '-';
-        },
-      },
-      {
-        colId: 'actions',
-        minWidth: window.innerWidth > BREAKPOINT_MD ? 221 : 80,
-        maxWidth: 221,
-        sortable: false,
-        filter: false,
-        resizable: false,
-        cellRenderer: ({
-          data,
-        }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
-          const proposalPage = tokenLink(
-            TOKEN_PROPOSAL.replace(':id', data?.id || '')
-          );
-          const openDialog = () => {
-            if (!data) return;
-            setDialog({
-              open: true,
-              title: data.rationale.title,
-              content: data.terms,
-            });
-          };
-          return (
-            <div className="pb-1">
-              <button className="underline max-md:hidden" onClick={openDialog}>
-                {t('View terms')}
-              </button>{' '}
-              <ExternalLink className="max-md:hidden" href={proposalPage}>
-                {t('Open in Governance')}
-              </ExternalLink>
-              <ExternalLink className="md:hidden" href={proposalPage}>
-                {t('Open')}
-              </ExternalLink>
-            </div>
-          );
-        },
-      },
-    ],
-    [requiredMajorityPercentage, tokenLink]
-  );
+
   return (
     <>
       <AgGrid
@@ -203,7 +83,6 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
           filterParams: { buttons: ['reset'] },
           autoHeight: true,
         }}
-        columnDefs={columnDefs}
         suppressCellFocus={true}
         onRowClicked={({ data, event }: RowClickedEvent) => {
           if (
@@ -215,7 +94,128 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
             window.open(proposalPage, '_blank');
           }
         }}
-      />
+      >
+        <AgGridColumn
+          colId="title"
+          headerName={t('Title')}
+          field="rationale.title"
+          flex={2}
+          wrapText={true}
+        />
+        <AgGridColumn
+          colId="type"
+          maxWidth={180}
+          hide={window.innerWidth <= BREAKPOINT_MD}
+          headerName={t('Type')}
+          field="terms.change.__typename"
+        />
+        <AgGridColumn
+          maxWidth={100}
+          headerName={t('State')}
+          field="state"
+          valueFormatter={({
+            value,
+          }: VegaValueFormatterParams<ProposalListFieldsFragment, 'state'>) => {
+            return value ? ProposalStateMapping[value] : '-';
+          }}
+        />
+        <AgGridColumn
+          colId="voting"
+          maxWidth={100}
+          hide={window.innerWidth <= BREAKPOINT_MD}
+          headerName={t('Voting')}
+          cellRenderer={({
+            data,
+          }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
+            if (data) {
+              const yesTokens = new BigNumber(data.votes.yes.totalTokens);
+              const noTokens = new BigNumber(data.votes.no.totalTokens);
+              const totalTokensVoted = yesTokens.plus(noTokens);
+              const yesPercentage = totalTokensVoted.isZero()
+                ? new BigNumber(0)
+                : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
+              return (
+                <div className="uppercase flex h-full items-center justify-center pt-2">
+                  <VoteProgress
+                    threshold={requiredMajorityPercentage}
+                    progress={yesPercentage}
+                  />
+                </div>
+              );
+            }
+            return '-';
+          }}
+        />
+        <AgGridColumn
+          colId="cDate"
+          maxWidth={150}
+          hide={window.innerWidth <= BREAKPOINT_MD}
+          headerName={t('Closing date')}
+          field="terms.closingDatetime"
+          valueFormatter={({
+            value,
+          }: VegaValueFormatterParams<
+            ProposalListFieldsFragment,
+            'terms.closingDatetime'
+          >) => {
+            return value ? getDateTimeFormat().format(new Date(value)) : '-';
+          }}
+        />
+        <AgGridColumn
+          colId="eDate"
+          maxWidth={150}
+          hide={window.innerWidth <= BREAKPOINT_MD}
+          headerName={t('Enactment date')}
+          field="terms.enactmentDatetime"
+          valueFormatter={({
+            value,
+          }: VegaValueFormatterParams<
+            ProposalListFieldsFragment,
+            'terms.enactmentDatetime'
+          >) => {
+            return value ? getDateTimeFormat().format(new Date(value)) : '-';
+          }}
+        />
+        <AgGridColumn
+          colId="actions"
+          minWidth={window.innerWidth > BREAKPOINT_MD ? 221 : 80}
+          maxWidth={221}
+          sortable={false}
+          filter={false}
+          resizable={false}
+          cellRenderer={({
+            data,
+          }: VegaICellRendererParams<ProposalListFieldsFragment>) => {
+            const proposalPage = tokenLink(
+              TOKEN_PROPOSAL.replace(':id', data?.id || '')
+            );
+            const openDialog = () => {
+              if (!data) return;
+              setDialog({
+                open: true,
+                title: data.rationale.title,
+                content: data.terms,
+              });
+            };
+            return (
+              <div className="pb-1">
+                <button
+                  className="underline max-md:hidden"
+                  onClick={openDialog}
+                >
+                  {t('View terms')}
+                </button>{' '}
+                <ExternalLink className="max-md:hidden" href={proposalPage}>
+                  {t('Open in Governance')}
+                </ExternalLink>
+                <ExternalLink className="md:hidden" href={proposalPage}>
+                  {t('Open')}
+                </ExternalLink>
+              </div>
+            );
+          }}
+        />
+      </AgGrid>
       <JsonViewerDialog
         open={dialog.open}
         onChange={(isOpen) => setDialog({ ...dialog, open: isOpen })}

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/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/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/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';
-import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
-
-const BE_TXS_PER_REQUEST = 15;
+const BE_TXS_PER_REQUEST = 20;
 
 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({
-      limit: BE_TXS_PER_REQUEST,
-      filters: f,
-    });
-
+    useTxsData({ limit: BE_TXS_PER_REQUEST });
   return (
-    <>
-      <menu className="mb-2">
-        <BlocksRefetch refetch={refreshTxs} />
-        <TxsFilter filters={filters} setFilters={setFilters} />
-      </menu>
-
+    <section className="md:p-2 lg:p-4 xl:p-6">
+      <RouteTitle>{t('Transactions')}</RouteTitle>
+      <BlocksRefetch refetch={refreshTxs} />
       <TxsInfiniteList
         hasMoreTxs={hasMoreTxs}
         areTxsLoading={loading}
@@ -50,6 +24,6 @@ export const TxsListFiltered = () => {
         error={error}
         className="mb-28"
       />
-    </>
+    </section>
   );
 };

apps/explorer/src/styles.css

@@ -1,5 +1,6 @@
-@import 'ag-grid-community/styles/ag-grid.css';
-@import 'ag-grid-community/styles/ag-theme-balham.css';
+@import 'ag-grid-community/dist/styles/ag-grid.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
 
 /* You can add global styles to this file, and also import other style files */
 @tailwind base;

apps/governance-e2e/cypress.config.js

@@ -49,7 +49,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,31 +14,25 @@ import {
   submitUniqueRawProposal,
   voteForProposal,
 } from '../../../../governance-e2e/src/support/governance.functions';
-import {
-  ensureSpecifiedUnstakedTokensAreAssociated,
-  stakingPageAssociateTokens,
-  stakingPageDisassociateAllTokens,
-} from '../../../../governance-e2e/src/support/staking.functions';
+import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governance-e2e/src/support/staking.functions';
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
-import {
-  switchVegaWalletPubKey,
-  vegaWalletSetSpecifiedApprovalAmount,
-} from '../../support/wallet-functions';
+import { vegaWalletSetSpecifiedApprovalAmount } from '../../../../governance-e2e/src/support/wallet-teardown.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';
-const proposalVoteProgressForTokens = 'vote-progress-indicator-tokens-for';
+  '[data-testid="vote-progress-indicator-percentage-against"]';
+const proposalVoteProgressForTokens =
+  '[data-testid="vote-progress-indicator-tokens-for"]';
 const proposalVoteProgressAgainstTokens =
-  'vote-progress-indicator-tokens-against';
-const changeVoteButton = 'change-vote-button';
-const proposalDetailsTitle = 'proposal-title';
-const proposalDetailsDescription = 'proposal-description';
-const openProposals = 'open-proposals';
-const viewProposalButton = 'view-proposal-btn';
+  '[data-testid="vote-progress-indicator-tokens-against"]';
+const changeVoteButton = '[data-testid="change-vote-button"]';
+const proposalDetailsTitle = '[data-testid="proposal-title"]';
+const proposalDetailsDescription = '[data-testid="proposal-description"]';
+const openProposals = '[data-testid="open-proposals"]';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
 const proposalDescriptionToggle = 'proposal-description-toggle';
 const voteBreakdownToggle = 'vote-breakdown-toggle';
 const proposalTermsToggle = 'proposal-json-toggle';
@@ -50,7 +44,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,18 +65,18 @@ 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.getByTestId('proposal-description-toggle');
-        cy.getByTestId(proposalDetailsDescription)
+        cy.get(proposalDetailsDescription)
           .find('p')
           .should('have.text', proposalDescription);
       });
@@ -116,7 +110,7 @@ describe(
       });
       navigateTo(navigation.proposals);
       getProposalFromTitle(proposalTitle).within(() =>
-        cy.getByTestId(viewProposalButton).click()
+        cy.get(viewProposalButton).click()
       );
       cy.wrap(
         formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
@@ -138,7 +132,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 +159,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 +176,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)
-        .contains('1.00')
-        .and('be.visible');
-      cy.getByTestId(proposalVoteProgressAgainstTokens)
+      cy.get(proposalVoteProgressForTokens).contains('1.00').and('be.visible');
+      cy.get(proposalVoteProgressAgainstTokens)
         .contains('0.00')
         .and('be.visible');
       cy.getByTestId(voteBreakdownToggle).click();
@@ -212,15 +204,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 +229,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)
-        .contains('1')
-        .and('be.visible');
+      cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
       cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Total Supply')
         .invoke('text')
@@ -261,22 +251,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 +297,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

@@ -16,16 +16,16 @@ import {
 } 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 proposalStatus = 'proposal-status';
-const viewProposalButton = 'view-proposal-btn';
-const votesTable = 'votes-table';
-const openProposals = 'open-proposals';
+const closedProposals = '[data-testid="closed-proposals"]';
+const proposalStatus = '[data-testid="proposal-status"]';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
+const votesTable = '[data-testid="votes-table"]';
+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(
@@ -55,18 +55,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.getByTestId(viewProposalButton).click();
+            cy.get(proposalStatus).should('have.text', 'Enacted');
+            cy.get(viewProposalButton).click();
           });
       });
       cy.getByTestId('proposal-type').should('have.text', 'New market');
-      cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
-      cy.getByTestId(votesTable).within(() => {
+      cy.get(proposalStatus).should('have.text', 'Enacted');
+      cy.get(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
       });
@@ -81,27 +81,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)
-        .should('have.text', 'Passed')
-        .then(() => {
-          cy.getByTestId(proposalStatus, proposalTimeout).should(
-            'have.text',
-            'Enacted'
-          );
-        });
-      cy.getByTestId(votesTable).within(() => {
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Passed');
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      cy.get(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 +109,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(
-        'have.text',
-        'Enacted'
-      );
+      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
     });
 
     // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -137,17 +128,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.getByTestId(proposalStatus, proposalTimeout).should(
-        'have.text',
-        'Declined'
-      );
+      cy.get(proposalStatus).should('have.text', 'Open');
+      cy.get(proposalStatus, proposalTimeout).should('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

@@ -32,23 +32,24 @@ 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 vegaWalletAssociatedBalance = 'associated-amount';
-const vegaWalletNameElement = 'wallet-name';
-const vegaWallet = 'vega-wallet';
-const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
-const newProposalSubmitButton = 'proposal-submit';
-const viewProposalButton = 'view-proposal-btn';
-const rawProposalData = 'proposal-data';
-const voteButtons = 'vote-buttons';
+const vegaWalletStakedBalances =
+  '[data-testid="vega-wallet-balance-staked-validators"]';
+const vegaWalletAssociatedBalance = '[data-testid="associated-amount"]';
+const vegaWalletNameElement = '[data-testid="wallet-name"]';
+const vegaWallet = '[data-testid="vega-wallet"]';
+const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
+const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const viewProposalButton = '[data-testid="view-proposal-btn"]';
+const rawProposalData = '[data-testid="proposal-data"]';
+const voteButtons = '[data-testid="vote-buttons"]';
 const rejectProposalsLink = '[href="/proposals/rejected"]';
-const feedbackError = 'Error';
-const noOpenProposals = 'no-open-proposals';
-const noClosedProposals = 'no-closed-proposals';
+const feedbackError = '[data-testid="Error"]';
+const noOpenProposals = '[data-testid="no-open-proposals"]';
+const noClosedProposals = '[data-testid="no-closed-proposals"]';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
@@ -92,10 +93,10 @@ 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');
     });
@@ -125,14 +126,11 @@ context(
       stakingValidatorPageAddStake('2');
       closeStakingDialog();
 
-      cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
-        'contain',
-        '2'
-      );
+      cy.get(vegaWalletStakedBalances, txTimeout).should('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.get('input:invalid')
@@ -140,7 +138,7 @@ context(
         .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 +168,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 +185,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 +205,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 +221,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,15 +249,15 @@ 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();
     });
 
@@ -267,10 +265,10 @@ context(
     // 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.get(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.get(rawProposalData).type('Not a valid json string');
+      cy.get(newProposalSubmitButton).click();
       cy.getByTestId('input-error-text').should(
         'have.text',
         'Must be valid JSON'
@@ -285,22 +283,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 +311,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.getByTestId(connectToVegaWalletButton).should('not.exist');
+      cy.get(vegaWalletNameElement).should('be.visible');
+      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

@@ -8,7 +8,6 @@ import {
 } from '../../support/common.functions';
 import {
   getDownloadedProposalJsonPath,
-  getProposalFromTitle,
   submitUniqueRawProposal,
 } from '../../support/governance.functions';
 import {
@@ -24,38 +23,38 @@ import {
 } 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 proposalType = 'proposal-type';
-const proposalDetails = 'proposal-details';
-const newProposalSubmitButton = 'proposal-submit';
-const proposalVoteDeadline = 'proposal-vote-deadline';
-const proposalParameterSelect = 'proposal-parameter-select';
-const proposalMarketSelect = 'proposal-market-select';
-const newProposalTitle = 'proposal-title';
-const newProposalDescription = 'proposal-description';
-const newProposalTerms = 'proposal-terms';
-const newProposedParameterValue = 'selected-proposal-param-new-value';
-const minVoteDeadline = 'min-vote';
-const maxVoteDeadline = 'max-vote';
-const minValidationDeadline = 'min-validation';
-const minEnactDeadline = 'min-enactment';
-const maxEnactDeadline = 'max-enactment';
-const inputError = 'input-error-text';
-const enactmentDeadlineError = 'enactment-before-voting-deadline';
-const proposalDownloadBtn = 'proposal-download-json';
+const openProposals = '[data-testid="open-proposals"]';
+const proposalType = '[data-testid="proposal-type"]';
+const proposalDetails = '[data-testid="proposal-details"]';
+const newProposalSubmitButton = '[data-testid="proposal-submit"]';
+const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
+const proposalParameterSelect = '[data-testid="proposal-parameter-select"]';
+const proposalMarketSelect = '[data-testid="proposal-market-select"]';
+const newProposalTitle = '[data-testid="proposal-title"]';
+const newProposalDescription = '[data-testid="proposal-description"]';
+const newProposalTerms = '[data-testid="proposal-terms"]';
+const newProposedParameterValue =
+  '[data-testid="selected-proposal-param-new-value"]';
+const minVoteDeadline = '[data-testid="min-vote"]';
+const maxVoteDeadline = '[data-testid="max-vote"]';
+const minValidationDeadline = '[data-testid="min-validation"]';
+const minEnactDeadline = '[data-testid="min-enactment"]';
+const maxEnactDeadline = '[data-testid="max-enactment"]';
+const 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 proposalJsonSection = 'proposal-json';
+const proposalTermsSection = 'proposal';
 const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
 const fUSDCId =
   '816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc';
@@ -86,20 +85,18 @@ context(
     it('Unable to submit network parameter with missing/invalid fields', function () {
       navigateTo(navigation.proposals);
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.getByTestId(proposalDownloadBtn).click();
-      cy.getByTestId(inputError).should('have.length', 3);
-      cy.getByTestId(newProposalTitle).type(
+      cy.get(proposalDownloadBtn).click();
+      cy.get(inputError).should('have.length', 3);
+      cy.get(newProposalTitle).type(
         'Invalid update network parameter proposal'
       );
-      cy.getByTestId(newProposalDescription).type(
-        'E2E invalid test for proposals'
-      );
-      cy.getByTestId(proposalParameterSelect).select(
+      cy.get(newProposalDescription).type('E2E invalid test for proposals');
+      cy.get(proposalParameterSelect).select(
         'spam_protection_proposal_min_tokens'
       );
-      cy.getByTestId(newProposedParameterValue).type('0');
-      cy.getByTestId(proposalVoteDeadline).clear().type('0');
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(newProposedParameterValue).type('0');
+      cy.get(proposalVoteDeadline).clear().type('0');
+      cy.get(proposalDownloadBtn)
         .click()
         .then(() => {
           cy.wrap(
@@ -109,7 +106,7 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.getByTestId(newProposalSubmitButton).click();
+      cy.get(newProposalSubmitButton).click();
       validateDialogContentMsg('PROPOSAL_ERROR_CLOSE_TIME_TOO_SOON');
     });
 
@@ -117,33 +114,29 @@ context(
     it('Able to download and submit network param proposal', function () {
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
       // 3007-PNEC-006
-      cy.getByTestId(newProposalTitle)
+      cy.get(newProposalTitle)
         .siblings()
         .should('contain.text', '(100 characters or less)');
       // 3007-PNEC-004 3007-PNEC-005
-      cy.getByTestId(newProposalTitle).type(
-        'Test update network parameter proposal'
-      );
+      cy.get(newProposalTitle).type('Test update network parameter proposal');
       // 3007-PNEC-009
-      cy.getByTestId(newProposalDescription)
+      cy.get(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'
-      );
+      cy.get(newProposalDescription).type('E2E test for downloading proposals');
       // 3007-PNEC-010
-      cy.getByTestId(proposalParameterSelect).select(
+      cy.get(proposalParameterSelect).select(
         'governance_proposal_asset_minClose'
       );
       // 3007-PNEC-011
-      cy.getByTestId(newProposedParameterValue).type('10s');
+      cy.get(newProposedParameterValue).type('10s');
       // 3007-PNEC-012
-      cy.getByTestId(proposalVoteDeadline).clear().type('2');
+      cy.get(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();
+      cy.get(maxEnactDeadline).click();
       // 3007-PNEC-016
       cy.getByTestId('enactment-date').invoke('text').should('not.be.empty');
       // 3007-PNEC-017
@@ -152,7 +145,7 @@ context(
       ).should('be.visible');
       // 3007-PNE-018
       cy.log('Download updated proposal file');
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -182,21 +175,19 @@ 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(
-        'Test update network parameter proposal'
-      );
-      cy.getByTestId(newProposalDescription).type('invalid deadlines');
-      cy.getByTestId(proposalParameterSelect).select(
+      cy.get(newProposalTitle).type('Test update network parameter proposal');
+      cy.get(newProposalDescription).type('invalid deadlines');
+      cy.get(proposalParameterSelect).select(
         'spam_protection_proposal_min_tokens'
       );
-      cy.getByTestId(newProposedParameterValue).type('0');
-      cy.getByTestId(proposalVoteDeadline).clear().type('0');
-      cy.getByTestId(maxVoteDeadline).click();
-      cy.getByTestId(enactmentDeadlineError).should(
+      cy.get(newProposedParameterValue).type('0');
+      cy.get(proposalVoteDeadline).clear().type('0');
+      cy.get(maxVoteDeadline).click();
+      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(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -207,77 +198,55 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.getByTestId(newProposalSubmitButton).click();
+      cy.get(newProposalSubmitButton).click();
       validateFeedBackMsg(
         'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
       );
     });
 
     // 3003-PMAN-001
-    it(
-      'Able to submit valid new market proposal',
-      { tags: '@smoke' },
-      function () {
-        const proposalTitle = 'Test new market proposal';
-        goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-        cy.getByTestId(newProposalTitle).type('Test new market proposal');
-        cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-        cy.fixture('/proposals/new-market').then((newMarketProposal) => {
-          const newMarketPayload = JSON.stringify(newMarketProposal);
-          cy.getByTestId(newProposalTerms).type(newMarketPayload, {
-            parseSpecialCharSequences: false,
-            delay: 2,
+    it('Able to submit valid new market proposal', function () {
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+      cy.get(newProposalTitle).type('Test new market proposal');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.fixture('/proposals/new-market').then((newMarketProposal) => {
+        const newMarketPayload = JSON.stringify(newMarketProposal);
+        cy.get(newProposalTerms).type(newMarketPayload, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
+      cy.get(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-new-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath }); // 3003-PMAN-003
           });
         });
-        cy.getByTestId(proposalDownloadBtn)
-          .should('be.visible')
-          .click()
-          .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.getByTestId(inputError).should('have.length', 3);
-      cy.getByTestId(newProposalTitle).type('Test new market proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(proposalDownloadBtn).should('be.visible').click();
+      cy.get(inputError).should('have.length', 3);
+      cy.get(newProposalTitle).type('Test new market proposal');
+      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(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -288,7 +257,7 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       validateFeedBackMsg(errorMsg);
     });
@@ -296,22 +265,21 @@ context(
     // 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();
+      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="select-keypair-button"]').eq(0).click(); // switch to second wallet pub key
       stakingPageAssociateTokens('1');
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type(
-        'Test update market proposal - rejected'
-      );
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
+      cy.get(newProposalTitle).type('Test update market proposal - rejected');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.get(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(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -322,13 +290,14 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
       validateDialogContentMsg('PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
       closeDialog();
       ethereumWalletConnect();
       stakingPageDisassociateAllTokens();
-      switchVegaWalletPubKey();
+      cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+      cy.get('[data-testid="select-keypair-button"]').eq(0).click();
     });
 
     // 3002-PROP-020
@@ -340,19 +309,17 @@ context(
         vegaWalletPublicKey
       );
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type(
-        'Test update market proposal - rejected'
-      );
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
+      cy.get(newProposalTitle).type('Test update market proposal - rejected');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.get(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(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -363,7 +330,7 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       validateFeedBackMsg(
         '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)'
@@ -378,9 +345,9 @@ context(
         vegaWalletPublicKey
       );
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(newProposalTitle).type('Test update market proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
-      cy.getByTestId(proposalMarketSelect).select('Test market 1');
+      cy.get(newProposalTitle).type('Test update market proposal');
+      cy.get(newProposalDescription).type('E2E test for proposals');
+      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,12 +362,12 @@ 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(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -447,19 +414,19 @@ context(
     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.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalTitle).type(proposalTitle);
+      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.getByTestId(minValidationDeadline).click();
-      cy.getByTestId(minEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(minVoteDeadline).click();
+      cy.get(minValidationDeadline).click();
+      cy.get(minEnactDeadline).click();
+      cy.get(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -470,9 +437,9 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false }); // 3005-PASN-003
           });
         });
-      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
+      cy.get(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');
@@ -484,8 +451,8 @@ context(
         .within(() => {
           cy.getByTestId(viewProposalBtn).click();
         });
-      cy.getByTestId(proposalJsonToggle).click();
-      cy.getByTestId(proposalJsonSection).within(() => {
+      cy.getByTestId('proposal-terms-toggle').click();
+      cy.getByTestId(proposalTermsSection).within(() => {
         cy.contains('USDT Coin').should('be.visible');
         cy.contains('USDT').should('be.visible');
       });
@@ -493,8 +460,8 @@ 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.getByTestId(inputError).should('have.length', 3);
+      cy.get(proposalDownloadBtn).should('be.visible').click();
+      cy.get(inputError).should('have.length', 3);
     });
 
     it('Able to submit update asset proposal using min deadline', function () {
@@ -503,9 +470,9 @@ context(
 
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
-      cy.getByTestId(minVoteDeadline).click();
-      cy.getByTestId(minEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(minVoteDeadline).click();
+      cy.get(minEnactDeadline).click();
+      cy.get(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -517,16 +484,13 @@ context(
           });
         });
       navigateTo(navigation.proposals);
-      cy.getByTestId(openProposals).within(() => {
-        cy.getByTestId(proposalType)
+      cy.get(openProposals).within(() => {
+        cy.get(proposalType)
           .contains('Update asset')
           .parentsUntil(proposalListItem)
           .last()
           .within(() => {
-            cy.getByTestId(proposalDetails).should(
-              'contain.text',
-              assetId.slice(0, 6)
-            ); // 3001-VOTE-029
+            cy.get(proposalDetails).should('contain.text', assetId.slice(0, 6)); // 3001-VOTE-029
             cy.getByTestId(viewProposalBtn).click();
           });
       });
@@ -534,11 +498,13 @@ context(
         .invoke('text')
         .should('not.be.empty');
       // 3001-VOTE-030 3001-VOTE-031
-      cy.getByTestId(proposalJsonToggle).click();
-      cy.getByTestId(proposalJsonSection).within(() => {
-        cy.contains(assetId).should('be.visible');
-        cy.contains('lifetimeLimit').should('be.visible');
-        cy.contains('10').should('be.visible');
+      cy.getByTestId('proposal-terms-toggle').click();
+      cy.getByTestId('proposal-terms').within(() => {
+        getProposalInformationFromTable('assetId').should('have.text', assetId);
+        getProposalInformationFromTable('lifetimeLimit').should(
+          'have.text',
+          '10'
+        );
       });
     });
 
@@ -546,9 +512,9 @@ context(
     it('Able to submit update asset proposal using max deadline', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
-      cy.getByTestId(maxVoteDeadline).click();
-      cy.getByTestId(maxEnactDeadline).click();
-      cy.getByTestId(proposalDownloadBtn)
+      cy.get(maxVoteDeadline).click();
+      cy.get(maxEnactDeadline).click();
+      cy.get(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -563,36 +529,36 @@ context(
 
     it('Unable to submit edit asset proposal with missing/invalid fields', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
-      cy.getByTestId(inputError).should('have.length', 3);
+      cy.get(proposalDownloadBtn).should('be.visible').click();
+      cy.get(inputError).should('have.length', 3);
     });
 
     it('Able to download and submit freeform proposal', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       // 3008-PFRO-006
-      cy.getByTestId(newProposalTitle)
+      cy.get(newProposalTitle)
         .siblings()
         .should('contain.text', '(100 characters or less)'); // 3008-PFRO-007
       // 3008-PFRO-005
-      cy.getByTestId(newProposalTitle).type('Test freeform proposal form');
+      cy.get(newProposalTitle).type('Test freeform proposal form');
       // 3008-PFRO-009
-      cy.getByTestId(newProposalDescription)
+      cy.get(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(
+      cy.get(newProposalDescription).type(
         'E2E test for downloading freeform proposal'
       );
       // 3008-PFRO-012
-      cy.getByTestId(minVoteDeadline).should('exist'); // 3002-PROP-008
-      cy.getByTestId(maxVoteDeadline).should('exist');
+      cy.get(minVoteDeadline).should('exist'); // 3002-PROP-008
+      cy.get(maxVoteDeadline).should('exist');
       // 3008-PFRO-011
-      cy.getByTestId(proposalVoteDeadline).clear().type('2');
+      cy.get(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)
+      cy.get(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -626,23 +592,15 @@ context(
     }
 
     function enterUpdateAssetProposalDetails() {
-      cy.getByTestId(newProposalTitle).type('Test update asset proposal');
-      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.get(newProposalTitle).type('Test update asset proposal');
+      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 viewProposalButton = 'view-proposal-btn';
+const proposalClosingDate = '[data-testid="vote-details"]';
+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.getByTestId(proposalClosingDate)
+    cy.get(openProposals).within(() => {
+      cy.get(proposalClosingDate)
         .first()
         .invoke('text')
         .should('match', /days|minutes/);
-      cy.getByTestId(proposalClosingDate).should('contain.text', 'months');
-      cy.getByTestId(proposalClosingDate).last().should('contain.text', 'year');
+      cy.get(proposalClosingDate).should('contain.text', 'months');
+      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');
@@ -106,7 +106,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 +124,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

@@ -14,10 +14,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 };
@@ -39,7 +40,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
     cy.associateTokensToVegaWallet('6000');
     navigateTo(navigation.validators);
     cy.VegaWalletTopUpRewardsPool();
-    cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
+    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
       'contain',
       '6,000.0',
       txTimeout

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,62 +54,48 @@ 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');
     });
 
-    describe('Eth wallet - contains VEGA tokens', function () {
+    describe.skip('Eth wallet - contains VEGA tokens', function () {
       beforeEach(
         'teardown wallet & drill into a specific validator',
         function () {
           cy.clearLocalStorage();
           turnTelemetryOff();
-          // Go to homepage to allow wallet teardown without epoch timer refreshing page
-          navigateTo(navigation.home);
-          vegaWalletTeardown();
+          cy.reload();
+          waitForSpinner();
+          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
-        verifyThisEpochValue(2.0); // 1002-STKE-013
+        verifyNextEpochValue(2.0); // 2001-STKE-016 2001-STKE-038
+        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%');
       });
 
@@ -127,7 +114,6 @@ context(
         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 +218,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 +231,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 +255,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 +303,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);
@@ -396,9 +381,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 +403,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 +417,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 +431,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 +445,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 +486,11 @@ context(
         );
       });
 
+      afterEach('Teardown Wallet', function () {
+        navigateTo(navigation.home);
+        vegaWalletTeardown();
+      });
+
       function verifyNextEpochValue(amount: number) {
         cy.getByTestId('stake-next-epoch', epochTimeout)
           .contains(amount, epochTimeout)
@@ -511,7 +498,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 vegaWalletAssociatedBalance = 'currency-value';
-const vegaWalletUnstakedBalance = 'vega-wallet-balance-unstaked';
-const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
-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 ethWalletContainer = '[data-testid="ethereum-wallet"]';
+const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
+const vegaWalletUnstakedBalance =
+  '[data-testid="vega-wallet-balance-unstaked"]';
 const txTimeout = Cypress.env('txTimeout');
+const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
+const 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 = 'aside [data-testid="vega-wallet"]';
 
 context(
   'Token association flow - with eth and vega wallets connected',
@@ -64,41 +64,31 @@ context(
         }
       );
 
-      it(
-        'Able to associate tokens - from wallet',
-        { tags: '@smoke' },
-        function () {
-          //1004-ASSO-003
-          //1004-ASSO-005
-          //1004-ASSO-009
-          //1004-ASSO-030
-          //1004-ASSO-012
-          //1004-ASSO-013
-          //1004-ASSO-014
-          //1004-ASSO-015
-          //1004-ASSO-030
-          //0005-ETXN-006
-          //0005-ETXN-003
-          //0005-ETXN-005
-          stakingPageAssociateTokens('2', { skipConfirmation: true });
-          validateWalletCurrency('Associated', '0.00');
-          validateWalletCurrency('Pending association', '2.00');
-          validateWalletCurrency('Total associated after pending', '2.00');
-          // 0005-ETXN-002
-          verifyEthWalletAssociatedBalance('2.0');
-          verifyEthWalletTotalAssociatedBalance('2.0');
-          cy.get(vegaWallet).within(() => {
-            cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-              'contain',
-              2.0
-            );
-          });
-          cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
-            'contain',
-            2.0
-          );
-        }
-      );
+      it('Able to associate tokens - from wallet', function () {
+        //1004-ASSO-003
+        //1004-ASSO-005
+        //1004-ASSO-009
+        //1004-ASSO-030
+        //1004-ASSO-012
+        //1004-ASSO-013
+        //1004-ASSO-014
+        //1004-ASSO-015
+        //1004-ASSO-030
+        //0005-ETXN-006
+        //0005-ETXN-003
+        //0005-ETXN-005
+        stakingPageAssociateTokens('2', { skipConfirmation: true });
+        validateWalletCurrency('Associated', '0.00');
+        validateWalletCurrency('Pending association', '2.00');
+        validateWalletCurrency('Total associated after pending', '2.00');
+        // 0005-ETXN-002
+        verifyEthWalletAssociatedBalance('2.0');
+        verifyEthWalletTotalAssociatedBalance('2.0');
+        cy.get(vegaWallet).within(() => {
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+        });
+        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
+      });
 
       it('Able to disassociate all associated tokens - manually', function () {
         // 1004-ASSO-025
@@ -129,7 +119,7 @@ context(
         verifyEthWalletAssociatedBalance('1,001.00');
         verifyEthWalletTotalAssociatedBalance('7,001.00');
         cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '1,001.00'
           );
@@ -139,20 +129,14 @@ context(
       it('Able to disassociate a partial amount of tokens currently associated', function () {
         stakingPageAssociateTokens('2');
         cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            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.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            1.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
         });
       });
 
@@ -162,24 +146,21 @@ context(
           '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.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            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(
@@ -187,10 +168,7 @@ context(
             );
           });
         cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            0.0
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
         });
       });
 
@@ -212,15 +190,9 @@ context(
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get(vegaWallet).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            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,
@@ -241,54 +213,45 @@ context(
         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).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            58
-          );
+          cy.get(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).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            52
-          );
+          cy.get(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).within(() => {
-          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            43
-          );
+          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
         });
       });
 
@@ -297,10 +260,10 @@ 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.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
-        cy.getByTestId(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
-        cy.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled');
+        cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
+        cy.get(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
+        cy.get(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
+        cy.get(tokenSubmitButton, txTimeout).should('be.disabled');
       });
 
       // 1004-ASSO-004
@@ -325,25 +288,23 @@ context(
 
       it('Able to associate tokens to different public key of connected vega wallet', function () {
         cy.get(ethWalletAssociateButton).click();
-        cy.getByTestId(associateWalletRadioButton).click();
-        cy.getByTestId(connectedVegaKey).should(
+        cy.get(associateWalletRadioButton).click();
+        cy.get(connectedVegaKey).should(
           'have.text',
           Cypress.env('vegaWalletPublicKey')
         );
 
-        switchVegaWalletPubKey();
-        cy.getByTestId(connectedVegaKey).should(
+        cy.get('[data-testid="manage-vega-wallet"]:visible').click();
+        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.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            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';
@@ -55,10 +55,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 +69,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 })
-          .should('have.value', usdtSelectValue);
+        cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(submitWithdrawalButton).click();
         cy.getByTestId(formValidationError).should('have.length', 1);
@@ -96,75 +89,68 @@ context(
       });
     });
 
-    it(
-      'Able to withdraw asset: -eth wallet connected -withdraw funds button',
-      { tags: '@smoke' },
-      function () {
-        // 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 })
-            .should('have.value', usdtSelectValue);
-          cy.getByTestId(balanceAvailable, txTimeout).should('exist');
-          cy.getByTestId(withdrawalThreshold).should(
-            'have.text',
-            '100,000.00000T'
+    it('Able to withdraw asset: -eth wallet connected -withdraw funds button', function () {
+      // fill in withdrawal form
+      cy.getByTestId(withdraw).should('be.visible').click();
+      cy.getByTestId(withdrawalForm, txTimeout).within(() => {
+        cy.get('select').select(usdtSelectValue, { force: true });
+        cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+        cy.getByTestId(withdrawalThreshold).should(
+          'have.text',
+          '100,000.00000T'
+        );
+        cy.getByTestId(delayTime).should('have.text', 'None');
+        cy.getByTestId(amountInput).click().type('120');
+        cy.getByTestId(submitWithdrawalButton).click();
+      });
+      // 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(delayTime).should('have.text', 'None');
-          cy.getByTestId(amountInput).click().type('120');
-          cy.getByTestId(submitWithdrawalButton).click();
+          cy.getByTestId(toastCompleteWithdrawal).click();
+          cy.getByTestId(toastClose).click();
         });
-        // 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/');
-          });
-      }
-    );
+      // 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 +159,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 })
-          .should('have.value', usdtSelectValue);
+        cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(ethAddressInput).should('be.empty');
         cy.getByTestId(amountInput).click().type('110');
         cy.getByTestId(submitWithdrawalButton).click();
@@ -236,10 +219,7 @@ context(
     it('Should be able to see withdrawal details from toast', 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.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(withdrawalThreshold).should(
           'have.text',
@@ -294,10 +274,7 @@ 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 })
-          .should('have.value', usdtSelectValue);
+        cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(amountInput).click().type('100');
         cy.pause();

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

@@ -10,10 +10,9 @@ import {
 } from '../../support/governance.functions';
 import { mockNetworkUpgradeProposal } from '../../support/proposal.functions';
 
-const proposalDocsLink = 'proposal-docs-link';
-const proposalDocumentationLink = 'proposal-documentation-link';
-const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
+const proposalDocumentationLink = '[data-testid="proposal-documentation-link"]';
 const governanceDocsUrl = 'https://vega.xyz/governance';
+const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
 
 context(
   'Governance Page - verify elements on page',
@@ -42,7 +41,7 @@ context(
 
     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')
@@ -65,7 +64,7 @@ context(
     // 3007-PNE-021
     it('should have documentation links for network parameter proposal', function () {
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
         .find('a')
         .should('have.attr', 'href')
         .and('contain', '/tutorials/proposals/network-parameter-proposal');
@@ -74,7 +73,7 @@ context(
     // 3003-PMAN-002 3003-PMAN-005
     it('should have documentation links for new market proposal', function () {
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
         .find('a')
         .should('have.attr', 'href')
         .and('contain', '/tutorials/proposals/new-market-proposal');
@@ -83,7 +82,7 @@ context(
     // 3004-PMAC-005
     it('should have documentation links for update market proposal', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
         .find('a')
         .should('have.attr', 'href')
         .and('contain', '/tutorials/proposals/update-market-proposal');
@@ -92,7 +91,7 @@ context(
     // 3005-PASN-002 005-PASN-005
     it('should have documentation links for new asset proposal', function () {
       goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
         .find('a')
         .should('have.attr', 'href')
         .and('contain', '/tutorials/proposals/new-asset-proposal');
@@ -101,7 +100,7 @@ context(
     // 3006-PASC-002 3006-PASC-005
     it('should have documentation links for update asset proposal', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
         .find('a')
         .should('have.attr', 'href')
         .and('contain', '/tutorials/proposals/update-asset-proposal');
@@ -110,7 +109,7 @@ context(
     // 3008-PFRO-003 3008-PFRO-017
     it('should have documentation links for freeform proposal', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
-      cy.getByTestId(proposalDocsLink)
+      cy.getByTestId('proposal-docs-link')
         .find('a')
         .should('have.attr', 'href')
         .and('contain', '/tutorials/proposals/freeform-proposal');
@@ -118,7 +117,7 @@ context(
 
     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)
+      cy.get(connectToVegaWalletButton)
         .should('be.visible')
         .and('have.text', 'Connect Vega wallet');
     });
@@ -166,7 +165,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',

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 warning = 'callout';
+const viewToggle = '[data-testid="epoch-reward-view-toggle-total"]';
+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 contract = 'token-contract';
-const totalSupply = 'total-supply';
-const circulatingSupply = 'circulating-supply';
-const staked = 'staked';
-const tranchesLink = 'tranches-link';
-const redeemBtn = 'check-vesting-page-btn';
-const getVegaWalletLink = 'get-vega-wallet-link';
-const associateVegaLink = 'associate-vega-tokens-link-on-homepage';
-const stakingBtn = 'staking-button-on-homepage';
-const governanceBtn = 'governance-button-on-homepage';
+const address = '[data-testid="token-address"]';
+const contract = '[data-testid="token-contract"]';
+const totalSupply = '[data-testid="total-supply"]';
+const circulatingSupply = '[data-testid="circulating-supply"]';
+const staked = '[data-testid="staked"]';
+const tranchesLink = '[data-testid="tranches-link"]';
+const redeemBtn = '[data-testid="check-vesting-page-btn"]';
+const getVegaWalletLink = '[data-testid="get-vega-wallet-link"]';
+const associateVegaLink =
+  '[data-testid="associate-vega-tokens-link-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 {
-  clickOnValidatorFromList,
-  waitForBeginningOfEpoch,
-} from '../../support/staking.functions';
-import { previousEpochData } from '../../fixtures/mocks/previous-epoch';
+import { clickOnValidatorFromList } from '../../support/staking.functions';
 
-const guideLink = 'staking-guide-link';
-const validatorTitle = 'validator-node-title';
-const validatorId = 'validator-id';
-const validatorPubKey = 'validator-public-key';
-const ethAddressLink = 'link';
-const validatorStatus = 'validator-status';
-const totalStake = 'total-stake';
-const pendingStake = 'pending-stake';
-const stakedByOperator = 'staked-by-operator';
-const stakedByDelegates = 'staked-by-delegates';
-const stakeShare = 'stake-percentage';
-const stakedByOperatorToolTip = 'staked-operator-tooltip';
-const stakedByDelegatesToolTip = 'staked-delegates-tooltip';
-const totalStakedToolTip = 'total-staked-tooltip';
-const unnormalisedVotingPowerToolTip = 'unnormalised-voting-power-tooltip';
-const normalisedVotingPowerToolTip = 'normalised-voting-power-tooltip';
-const performancePenaltyToolTip = 'performance-penalty-tooltip';
-const overstakedPenaltyToolTip = 'overstaked-penalty-tooltip';
-const multisigPenaltyToolTip = 'multisig-error-tooltip';
-const epochCountDown = 'epoch-countdown';
+const guideLink = '[data-testid="staking-guide-link"]';
+const validatorTitle = '[data-testid="validator-node-title"]';
+const validatorId = '[data-testid="validator-id"]';
+const validatorPubKey = '[data-testid="validator-public-key"]';
+const ethAddressLink = '[data-testid="link"]';
+const validatorStatus = '[data-testid="validator-status"]';
+const totalStake = '[data-testid="total-stake"]';
+const pendingStake = '[data-testid="pending-stake"]';
+const stakedByOperator = '[data-testid="staked-by-operator"]';
+const stakedByDelegates = '[data-testid="staked-by-delegates"]';
+const stakeShare = '[data-testid="stake-percentage"]';
+const stakedByOperatorToolTip = '[data-testid="staked-operator-tooltip"]';
+const stakedByDelegatesToolTip = '[data-testid="staked-delegates-tooltip"]';
+const totalStakedToolTip = '[data-testid="total-staked-tooltip"]';
+const unnormalisedVotingPowerToolTip =
+  '[data-testid="unnormalised-voting-power-tooltip"]';
+const normalisedVotingPowerToolTip =
+  '[data-testid="normalised-voting-power-tooltip"]';
+const performancePenaltyToolTip = '[data-testid="performance-penalty-tooltip"]';
+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 () {
-      verifyTabHighlighted(navigation.validators);
-    });
+    describe('description section', function () {
+      it('Should have validators tab highlighted', function () {
+        verifyTabHighlighted(navigation.validators);
+      });
 
-    it('Should have validators ON VEGA header visible', function () {
-      verifyPageHeader('Validators');
-    });
+      it('Should have validators ON VEGA header visible', function () {
+        verifyPageHeader('Validators');
+      });
 
-    it('Should have Staking Guide link visible', function () {
-      // 1002-STKE-003
-      cy.getByTestId(guideLink)
-        .should('be.visible')
-        .and('have.text', 'Read more about staking on Vega')
-        .and(
-          'have.attr',
-          'href',
-          'https://docs.vega.xyz/mainnet/concepts/vega-chain/#staking-on-vega'
-        );
+      it('Should have Staking Guide link visible', function () {
+        // 2001-STKE-003
+        cy.get(guideLink)
+          .should('be.visible')
+          .and('have.text', 'Read more about staking on Vega')
+          .and(
+            'have.attr',
+            'href',
+            '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 have button to connect vega wallet in validator page', function () {
-      clickOnValidatorFromList(0);
-      cy.getByTestId('connect-to-vega-wallet-btn').should('be.visible');
-      cy.visit('/validators');
-    });
+        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 () {
+          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 accountNo = 'ethereum-account-truncated';
+const disconnect = '[data-testid="disconnect-from-eth-wallet-button"]';
+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 dialogCloseBtn = 'dialog-close';
+const dialogHeader = '[data-testid="dialog-title"]';
+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 {
-  vegaWalletFaucetAssetsWithoutCheck,
-  vegaWalletTeardown,
-} from '../../support/wallet-functions';
+import { vegaWalletTeardown } from '../../support/wallet-teardown.functions';
+import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
 
 const walletContainer = 'aside [data-testid="vega-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
-const connectButton = 'connect-vega-wallet';
-const getVegaLink = 'link';
+const connectButton = '[data-testid="connect-vega-wallet"]';
+const getVegaLink = '[data-testid="link"]';
 const dialog = '[role="dialog"]:visible';
-const dialogHeader = 'dialog-title';
-const walletDialogHeader = 'wallet-dialog-title';
-const connectorsList = 'connectors-list';
-const dialogCloseBtn = 'dialog-close';
-const restConnectorForm = 'rest-connector-form';
+const dialogHeader = '[data-testid="dialog-title"]';
+const walletDialogHeader = '[data-testid="wallet-dialog-title"]';
+const connectorsList = '[data-testid="connectors-list"]';
+const dialogCloseBtn = '[data-testid="dialog-close"]';
+const restConnectorForm = '[data-testid="rest-connector-form"]';
 const restWallet = '#wallet';
 const restPassphrase = '#passphrase';
 const restConnectBtn = '[type="submit"]';
-const accountNo = 'vega-account-truncated';
-const currencyTitle = 'currency-title';
-const currencyValue = 'currency-value';
+const accountNo = '[data-testid="vega-account-truncated"]';
+const currencyTitle = '[data-testid="currency-title"]';
+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 dialogVegaKey = 'vega-public-key-full';
-const dialogDisconnectBtn = 'disconnect';
-const copyPublicKeyBtn = 'copy-vega-public-key';
-const vegaWalletCurrencyTitle = 'currency-title';
+const manageLink = '[data-testid="manage-vega-wallet"]';
+const dialogVegaKey = '[data-testid="vega-public-key-full"]';
+const dialogDisconnectBtn = '[data-testid="disconnect"]';
+const copyPublicKeyBtn = '[data-testid="copy-vega-public-key"]';
+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)
-            .should('be.visible')
-            .and('have.text', 'Manage');
+          cy.get(manageLink).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) => {
-                  const displayedAmount = parseFloat(elementAmount.text());
-                  expect(displayedAmount).be.gte(expectedAmount);
-                });
+                .invoke('text')
+                .then(parseFloat)
+                .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

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

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"]';

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

@@ -139,9 +139,6 @@ async function vegaWalletTeardownStaking(stakingBridgeContract: StakingBridge) {
                       $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);
               }
             });
           });
@@ -176,27 +173,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/__mocks__/react-markdown.js

@@ -0,0 +1,6 @@
+function ReactMarkdown({ children }) {
+  // eslint-disable-next-line react/jsx-no-useless-fragment
+  return <>{children}</>;
+}
+
+export default ReactMarkdown;

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/i18n/translations/dev.json

@@ -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",
@@ -731,11 +729,7 @@
   "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.",
-  "ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline": "The 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",
+  "ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline": "Proposal will fail if enactment is earlier than the voting deadline",
   "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.",
@@ -831,11 +824,5 @@
   "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",
-  "assetSpecification": "Asset specification"
+  "learnMore": "Learn more"
 }

apps/governance/src/routes/proposals/components/proposal-asset-details/index.tsx

@@ -1 +0,0 @@
-export * from './proposal-asset-details';

apps/governance/src/routes/proposals/components/proposal-asset-details/proposal-asset-details.tsx

@@ -1,48 +0,0 @@
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { SubHeading } from '../../../../components/heading';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
-import { AssetDetail, AssetDetailsTable } from '@vegaprotocol/assets';
-import type { AssetFieldsFragment } from '@vegaprotocol/assets';
-
-export const ProposalAssetDetails = ({
-  asset,
-}: {
-  asset: AssetFieldsFragment;
-}) => {
-  const { t } = useTranslation();
-  const [showAssetDetails, setShowAssetDetails] = useState(false);
-
-  return (
-    <section data-testid="proposal-asset-details">
-      <CollapsibleToggle
-        toggleState={showAssetDetails}
-        setToggleState={setShowAssetDetails}
-        dataTestId={'proposal-asset-details-toggle'}
-      >
-        <SubHeading title={t('assetSpecification')} />
-      </CollapsibleToggle>
-
-      {showAssetDetails && (
-        <div className="mb-10 pb-4">
-          <AssetDetailsTable
-            asset={asset}
-            omitRows={[
-              AssetDetail.STATUS,
-              AssetDetail.INFRASTRUCTURE_FEE_ACCOUNT_BALANCE,
-              AssetDetail.GLOBAL_REWARD_POOL_ACCOUNT_BALANCE,
-              AssetDetail.MAKER_PAID_FEES_ACCOUNT_BALANCE,
-              AssetDetail.MAKER_RECEIVED_FEES_ACCOUNT_BALANCE,
-              AssetDetail.LP_FEE_REWARD_ACCOUNT_BALANCE,
-              AssetDetail.MARKET_PROPOSER_REWARD_ACCOUNT_BALANCE,
-            ]}
-            inline={true}
-            noBorder={true}
-            dtClassName="text-black dark:text-white text-ui !px-0 !font-normal"
-            ddClassName="text-black dark:text-white text-ui !px-0 !font-normal max-w-full"
-          />
-        </div>
-      )}
-    </section>
-  );
-};

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
-        toggleState={showDescription}
-        setToggleState={setShowDescription}
-        dataTestId={'proposal-description-toggle'}
+      <button
+        onClick={() => setShowDescription(!showDescription)}
+        data-testid="proposal-description-toggle"
       >
-        <SubHeading title={t('proposalDescription')} />
-      </CollapsibleToggle>
+        <div className="flex items-center gap-3">
+          <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-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
-        toggleState={showDetails}
-        setToggleState={setShowDetails}
-        dataTestId="proposal-json-toggle"
+      <button
+        onClick={() => setShowDetails(!showDetails)}
+        data-testid="proposal-json-toggle"
       >
-        <SubHeading title={t('proposalJson')} />
-      </CollapsibleToggle>
+        <div className="flex items-center gap-3">
+          <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
-        toggleState={showDetails}
-        setToggleState={setShowDetails}
-        dataTestId="vote-breakdown-toggle"
+      <button
+        onClick={() => setShowDetails(!showDetails)}
+        data-testid="vote-breakdown-toggle"
       >
-        <SubHeading title={t('voteBreakdown')} />
-      </CollapsibleToggle>
+        <div className="flex items-center gap-3">
+          <SubHeading title={t('voteBreakdown')} />
+          <div className={showDetailsIconClasses}>
+            <Icon name="chevron-down" size={8} />
+          </div>
+        </div>
+      </button>
 
       {showDetails && (
         <RoundedWrapper marginBottomLarge={true} paddingBottom={true}>

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

@@ -1,9 +1,7 @@
-import { MemoryRouter } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { generateProposal } from '../../test-helpers/generate-proposals';
 import { Proposal } from './proposal';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import { ProposalState } from '@vegaprotocol/types';
 
 jest.mock('@vegaprotocol/network-parameters', () => ({
   ...jest.requireActual('@vegaprotocol/network-parameters'),
@@ -30,6 +28,9 @@ jest.mock('../proposal-change-table', () => ({
 jest.mock('../proposal-json', () => ({
   ProposalJson: () => <div data-testid="proposal-json"></div>,
 }));
+jest.mock('../proposal-terms/proposal-terms', () => ({
+  ProposalTerms: () => <div data-testid="proposal-terms"></div>,
+}));
 jest.mock('../proposal-votes-table', () => ({
   ProposalVotesTable: () => <div data-testid="proposal-votes-table"></div>,
 }));
@@ -40,49 +41,23 @@ jest.mock('../list-asset', () => ({
   ListAsset: () => <div data-testid="proposal-list-asset"></div>,
 }));
 
-const renderComponent = (proposal: ProposalQuery['proposal']) => {
-  render(
-    <MemoryRouter>
-      <Proposal
-        restData={{}}
-        proposal={proposal as ProposalQuery['proposal']}
-      />
-    </MemoryRouter>
-  );
-};
-
 it('Renders with data-testid', async () => {
   const proposal = generateProposal();
-  renderComponent(proposal);
-
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
   expect(await screen.findByTestId('proposal')).toBeInTheDocument();
 });
 
-it('Renders with a link back to "all proposals"', async () => {
-  const proposal = generateProposal();
-  renderComponent(proposal);
-
-  expect(await screen.findByTestId('all-proposals-link')).toBeInTheDocument();
-});
-
-it('Renders a rejected proposals with a link back to "rejected proposals"', async () => {
-  const proposal = generateProposal({
-    state: ProposalState.STATE_REJECTED,
-  });
-  renderComponent(proposal);
-
-  expect(
-    await screen.findByTestId('rejected-proposals-link')
-  ).toBeInTheDocument();
-});
-
 it('renders each section', async () => {
   const proposal = generateProposal();
-  renderComponent(proposal);
-
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
   expect(await screen.findByTestId('proposal-header')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-change-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-json')).toBeInTheDocument();
+  expect(screen.getByTestId('proposal-terms')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-votes-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-vote-details')).toBeInTheDocument();
   expect(screen.queryByTestId('proposal-list-asset')).not.toBeInTheDocument();
@@ -105,7 +80,8 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
       },
     },
   });
-  renderComponent(proposal);
-
+  render(
+    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
+  );
   expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });

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

@@ -1,26 +1,18 @@
-import { useTranslation } from 'react-i18next';
-import { Link } from 'react-router-dom';
 import {
   NetworkParams,
   useNetworkParams,
 } from '@vegaprotocol/network-parameters';
-import { AsyncRenderer, Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
 import { ProposalHeader } from '../proposal-detail-header/proposal-header';
+import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
+import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
 import { ProposalDescription } from '../proposal-description';
 import { ProposalChangeTable } from '../proposal-change-table';
 import { ProposalJson } from '../proposal-json';
+import { ProposalTerms } from '../proposal-terms';
 import { ProposalVotesTable } from '../proposal-votes-table';
-import { ProposalAssetDetails } from '../proposal-asset-details';
 import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
-import Routes from '../../../routes';
-import { ProposalMarketData } from '../proposal-market-data';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
-import type { AssetQuery } from '@vegaprotocol/assets';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
-import { ProposalState } from '@vegaprotocol/types';
 
 export enum ProposalType {
   PROPOSAL_NEW_MARKET = 'PROPOSAL_NEW_MARKET',
@@ -32,19 +24,11 @@ export enum ProposalType {
 }
 export interface ProposalProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  newMarketData?: MarketInfoWithData | null;
-  assetData?: AssetQuery | null;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   restData: any;
 }
 
-export const Proposal = ({
-  proposal,
-  restData,
-  newMarketData,
-  assetData,
-}: ProposalProps) => {
-  const { t } = useTranslation();
+export const Proposal = ({ proposal, restData }: ProposalProps) => {
   const { params, loading, error } = useNetworkParams([
     NetworkParams.governance_proposal_market_minVoterBalance,
     NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -59,23 +43,6 @@ export const Proposal = ({
     return null;
   }
 
-  let asset = assetData
-    ? removePaginationWrapper(assetData.assetsConnection?.edges)[0]
-    : undefined;
-
-  if (proposal.terms.change.__typename === 'UpdateAsset' && asset) {
-    asset = {
-      ...asset,
-      quantum: proposal.terms.change.quantum,
-    };
-
-    if (asset.source.__typename === 'ERC20') {
-      asset.source.lifetimeLimit = proposal.terms.change.source.lifetimeLimit;
-      asset.source.withdrawThreshold =
-        proposal.terms.change.source.withdrawThreshold;
-    }
-  }
-
   let minVoterBalance = null;
   let proposalType = null;
 
@@ -114,85 +81,53 @@ export const Proposal = ({
   return (
     <AsyncRenderer data={params} loading={loading} error={error}>
       <section data-testid="proposal">
-        <div className="flex items-center gap-1">
-          <Icon name={'chevron-left'} />
-
-          {proposal.state === ProposalState.STATE_REJECTED ? (
-            <div data-testid="rejected-proposals-link">
-              <Link className="underline" to={Routes.PROPOSALS_REJECTED}>
-                {t('RejectedProposals')}
-              </Link>
-            </div>
-          ) : (
-            <div data-testid="all-proposals-link">
-              <Link className="underline" to={Routes.PROPOSALS}>
-                {t('AllProposals')}
-              </Link>
-            </div>
-          )}
-        </div>
         <ProposalHeader proposal={proposal} isListItem={false} />
 
-        <div id="details">
-          <div className="my-10">
-            <ProposalChangeTable proposal={proposal} />
-          </div>
+        <div className="my-10">
+          <ProposalChangeTable proposal={proposal} />
+        </div>
 
-          {proposal.terms.change.__typename === 'NewAsset' &&
-          proposal.terms.change.source.__typename === 'ERC20' &&
-          proposal.id ? (
-            <ListAsset
-              assetId={proposal.id}
-              withdrawalThreshold={
-                proposal.terms.change.source.withdrawThreshold
-              }
-              lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
-            />
-          ) : null}
+        {proposal.terms.change.__typename === 'NewAsset' &&
+        proposal.terms.change.source.__typename === 'ERC20' &&
+        proposal.id ? (
+          <ListAsset
+            assetId={proposal.id}
+            withdrawalThreshold={proposal.terms.change.source.withdrawThreshold}
+            lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
+          />
+        ) : null}
 
-          <div className="mb-4">
-            <ProposalDescription description={proposal.rationale.description} />
-          </div>
+        <div className="mb-4">
+          <ProposalDescription description={proposal.rationale.description} />
+        </div>
 
-          {newMarketData && (
+        {proposal.terms.change.__typename !== 'NewMarket' &&
+          proposal.terms.change.__typename !== 'UpdateMarket' &&
+          proposal.terms.change.__typename !== 'NewFreeform' && (
             <div className="mb-4">
-              <ProposalMarketData marketData={newMarketData} />
+              <ProposalTerms data={proposal.terms} />
             </div>
           )}
 
-          {(proposal.terms.change.__typename === 'NewAsset' ||
-            proposal.terms.change.__typename === 'UpdateAsset') &&
-            asset && (
-              <div className="mb-4">
-                <ProposalAssetDetails asset={asset} />
-              </div>
-            )}
-
-          <div className="mb-6">
-            <ProposalJson proposal={restData?.data?.proposal} />
-          </div>
+        <div className="mb-6">
+          <ProposalJson proposal={restData?.data?.proposal} />
         </div>
 
-        <div id="voting">
-          <div className="mb-10">
-            <RoundedWrapper paddingBottom={true}>
-              <VoteDetails
-                proposal={proposal}
-                proposalType={proposalType}
-                minVoterBalance={minVoterBalance}
-                spamProtectionMinTokens={
-                  params?.spam_protection_voting_min_tokens
-                }
-              />
-            </RoundedWrapper>
-          </div>
-
-          <div className="mb-4">
-            <ProposalVotesTable
+        <div className="mb-10">
+          <RoundedWrapper paddingBottom={true}>
+            <VoteDetails
               proposal={proposal}
               proposalType={proposalType}
+              minVoterBalance={minVoterBalance}
+              spamProtectionMinTokens={
+                params?.spam_protection_voting_min_tokens
+              }
             />
-          </div>
+          </RoundedWrapper>
+        </div>
+
+        <div className="mb-4">
+          <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
         </div>
       </section>
     </AsyncRenderer>

apps/governance/src/routes/proposals/components/proposals-list-filter/proposals-list-filter.spec.tsx

@@ -1,34 +0,0 @@
-import { render, fireEvent, screen } from '@testing-library/react';
-import { ProposalsListFilter } from './proposals-list-filter';
-
-describe('ProposalsListFilter', () => {
-  let setFilterString: jest.Mock;
-
-  beforeEach(() => {
-    setFilterString = jest.fn();
-    render(
-      <ProposalsListFilter filterString="" setFilterString={setFilterString} />
-    );
-  });
-
-  it('renders successfully', () => {
-    expect(screen.getByTestId('proposals-list-filter')).toBeInTheDocument();
-  });
-
-  it('should handle the filter toggle click', () => {
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    expect(screen.getByTestId('proposals-list-filter')).toBeInTheDocument();
-  });
-
-  it('should handle input change', () => {
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-
-    expect(setFilterString).toHaveBeenCalledWith('test');
-  });
-
-  // 'clear filter' tests are handled in the proposals-list.spec.tsx file
-  // as it is responsible for the filter state
-});

apps/governance/src/routes/proposals/components/proposals-list-filter/proposals-list-filter.tsx

@@ -1,16 +1,13 @@
 import { useTranslation } from 'react-i18next';
 import { useState } from 'react';
-import { FormGroup, Icon, Input } from '@vegaprotocol/ui-toolkit';
-import { CollapsibleToggle } from '../../../../components/collapsible-toggle';
+import { ButtonLink, FormGroup, Input } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction } from 'react';
 
 interface ProposalsListFilterProps {
-  filterString: string;
   setFilterString: Dispatch<SetStateAction<string>>;
 }
 
 export const ProposalsListFilter = ({
-  filterString,
   setFilterString,
 }: ProposalsListFilterProps) => {
   const { t } = useTranslation();
@@ -18,39 +15,27 @@ export const ProposalsListFilter = ({
 
   return (
     <div data-testid="proposals-list-filter" className="mb-4">
-      <CollapsibleToggle
-        toggleState={filterVisible}
-        setToggleState={setFilterVisible}
-        dataTestId={'proposal-filter-toggle'}
-      >
-        <div className="text-xl mb-4">{t('FilterProposals')}</div>
-      </CollapsibleToggle>
-
+      {!filterVisible && (
+        <ButtonLink
+          onClick={() => setFilterVisible(true)}
+          data-testid="set-proposals-filter-visible"
+        >
+          {t('FilterProposals')}
+        </ButtonLink>
+      )}
       {filterVisible && (
-        <div data-testid="proposals-list-filter-visible">
+        <div data-testid="open-proposals-list-filter">
           <p>{t('FilterProposalsDescription')}</p>
           <FormGroup
             label="Filter text input"
             labelFor="filter-input"
             hideLabel={true}
-            className="relative"
           >
             <Input
-              value={filterString}
               data-testid="filter-input"
               id="filter-input"
               onChange={(e) => setFilterString(e.target.value)}
-              className="pr-8"
             />
-            {filterString && filterString.length > 0 && (
-              <button
-                className="absolute top-2 right-2"
-                onClick={() => setFilterString('')}
-                data-testid="clear-filter"
-              >
-                <Icon name="cross" size={6} className="text-vega-light-200" />
-              </button>
-            )}
           </FormGroup>
         </div>
       )}

apps/governance/src/routes/proposals/components/proposals-list/proposals-list.spec.tsx

@@ -1,7 +1,4 @@
-import {
-  generateProposal,
-  generateProtocolUpgradeProposal,
-} from '../../test-helpers/generate-proposals';
+import { generateProposal } from '../../test-helpers/generate-proposals';
 import { MockedProvider } from '@apollo/client/testing';
 import { VegaWalletContext } from '@vegaprotocol/wallet';
 import { BrowserRouter as Router } from 'react-router-dom';
@@ -18,7 +15,6 @@ import {
   nextMonth,
 } from '../../test-helpers/mocks';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 
 const openProposalClosesNextMonth = generateProposal({
   id: 'proposal1',
@@ -58,22 +54,12 @@ const failedProposalClosedLastMonth = generateProposal({
   },
 });
 
-const closedProtocolUpgradeProposal = generateProtocolUpgradeProposal({
-  upgradeBlockHeight: '1',
-});
-
-const renderComponent = (
-  proposals: ProposalQuery['proposal'][],
-  protocolUpgradeProposals?: ProtocolUpgradeProposalFieldsFragment[]
-) => (
+const renderComponent = (proposals: ProposalQuery['proposal'][]) => (
   <Router>
     <MockedProvider mocks={[networkParamsQueryMock]}>
       <AppStateProvider>
         <VegaWalletContext.Provider value={mockWalletContext}>
-          <ProposalsList
-            proposals={proposals}
-            protocolUpgradeProposals={protocolUpgradeProposals || []}
-          />
+          <ProposalsList proposals={proposals} protocolUpgradeProposals={[]} />
         </VegaWalletContext.Provider>
       </AppStateProvider>
     </MockedProvider>
@@ -157,15 +143,17 @@ describe('Proposals list', () => {
     render(
       renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
     );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    expect(screen.getByTestId('proposals-list-filter')).toBeInTheDocument();
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
+    expect(
+      screen.getByTestId('open-proposals-list-filter')
+    ).toBeInTheDocument();
   });
 
   it('Filters list by text - party id', () => {
     render(
       renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
     );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
     fireEvent.change(screen.getByTestId('filter-input'), {
       target: { value: 'bvcx' },
     });
@@ -178,7 +166,7 @@ describe('Proposals list', () => {
     render(
       renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
     );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
     fireEvent.change(screen.getByTestId('filter-input'), {
       target: { value: 'proposal1' },
     });
@@ -191,7 +179,7 @@ describe('Proposals list', () => {
     render(
       renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
     );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
+    fireEvent.click(screen.getByTestId('set-proposals-filter-visible'));
     fireEvent.change(screen.getByTestId('filter-input'), {
       target: { value: 'osal1' },
     });
@@ -199,92 +187,4 @@ describe('Proposals list', () => {
     expect(container.querySelector('#proposal1')).toBeInTheDocument();
     expect(container.querySelector('#proposal2')).not.toBeInTheDocument();
   });
-
-  it('When filter is used, clear button is visible', () => {
-    render(
-      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
-    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-    expect(screen.getByTestId('clear-filter')).toBeInTheDocument();
-  });
-
-  it('When clear filter button is used, input is cleared', () => {
-    render(
-      renderComponent([openProposalClosesNextMonth, openProposalClosesNextWeek])
-    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-    fireEvent.click(screen.getByTestId('clear-filter'));
-    expect((screen.getByTestId('filter-input') as HTMLInputElement).value).toBe(
-      ''
-    );
-  });
-
-  it('Displays a toggle for closed proposals if there are both closed governance proposals and closed upgrade proposals', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    expect(screen.getByTestId('toggle-closed-proposals')).toBeInTheDocument();
-  });
-
-  it('Does not display a toggle for closed proposals if there are only closed upgrade proposals', () => {
-    render(renderComponent([], [closedProtocolUpgradeProposal]));
-    expect(
-      screen.queryByTestId('toggle-closed-proposals')
-    ).not.toBeInTheDocument();
-  });
-
-  it('Does not display a toggle for closed proposals if there are only closed governance proposals', () => {
-    render(renderComponent([enactedProposalClosedLastWeek]));
-    expect(
-      screen.queryByTestId('toggle-closed-proposals')
-    ).not.toBeInTheDocument();
-  });
-
-  it('Does not display a toggle for closed proposals if the proposal filter is engaged', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    fireEvent.click(screen.getByTestId('proposal-filter-toggle'));
-    fireEvent.change(screen.getByTestId('filter-input'), {
-      target: { value: 'test' },
-    });
-    expect(
-      screen.queryByTestId('toggle-closed-proposals')
-    ).not.toBeInTheDocument();
-  });
-
-  it('Displays closed governance proposals by default due to default for the toggle', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    expect(
-      screen.getByTestId('closed-governance-proposals')
-    ).toBeInTheDocument();
-  });
-
-  it('Displays closed upgrade proposals when the toggle is clicked', () => {
-    render(
-      renderComponent(
-        [enactedProposalClosedLastWeek],
-        [closedProtocolUpgradeProposal]
-      )
-    );
-    fireEvent.click(screen.getByText('Network upgrades'));
-    expect(screen.getByTestId('closed-upgrade-proposals')).toBeInTheDocument();
-  });
 });

apps/governance/src/routes/proposals/components/proposals-list/proposals-list.tsx

@@ -7,12 +7,7 @@ import { ProposalsListItem } from '../proposals-list-item';
 import { ProtocolUpgradeProposalsListItem } from '../protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item';
 import { ProposalsListFilter } from '../proposals-list-filter';
 import Routes from '../../../routes';
-import {
-  Button,
-  Toggle,
-  VegaIcon,
-  VegaIconNames,
-} from '@vegaprotocol/ui-toolkit';
+import { Button, VegaIcon, VegaIconNames } from '@vegaprotocol/ui-toolkit';
 import { Link } from 'react-router-dom';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
@@ -59,11 +54,6 @@ export const orderByUpgradeBlockHeight = (
     ['desc', 'desc']
   );
 
-enum ClosedProposalsViewOptions {
-  NetworkGovernance = 'networkGovernance',
-  NetworkUpgrades = 'networkUpgrades',
-}
-
 export const ProposalsList = ({
   proposals,
   protocolUpgradeProposals,
@@ -71,10 +61,6 @@ export const ProposalsList = ({
 }: ProposalsListProps) => {
   const { t } = useTranslation();
   const [filterString, setFilterString] = useState('');
-  const [closedProposalsView, setClosedProposalsView] =
-    useState<ClosedProposalsViewOptions>(
-      ClosedProposalsViewOptions.NetworkGovernance
-    );
 
   const sortedProposals: SortedProposalsProps = useMemo(() => {
     const initialSorting = proposals.reduce(
@@ -123,7 +109,7 @@ export const ProposalsList = ({
       );
       return {
         open: orderByUpgradeBlockHeight(initialSorting.open),
-        closed: orderByUpgradeBlockHeight(initialSorting.closed),
+        closed: orderByUpgradeBlockHeight(initialSorting.closed).reverse(),
       };
     }, [protocolUpgradeProposals, lastBlockHeight]);
 
@@ -141,7 +127,6 @@ export const ProposalsList = ({
           marginBottom={false}
           title={t('pageTitleProposals')}
         />
-
         {DocsLinks && (
           <div className="xs:justify-self-end" data-testid="new-proposal-link">
             <ExternalLink href={DocsLinks.PROPOSALS_GUIDE}>
@@ -155,7 +140,6 @@ export const ProposalsList = ({
           </div>
         )}
       </div>
-
       <p className="mb-8">
         {t(
           `The Vega network is governed by the community. View active proposals, vote on them or propose changes to the network. Network upgrades are proposed and approved by validators.`
@@ -168,37 +152,20 @@ export const ProposalsList = ({
           {t(`Find out more about Vega governance`)}
         </ExternalLink>
       </p>
-
       {proposals.length > 0 && (
-        <ProposalsListFilter
-          filterString={filterString}
-          setFilterString={(value) => {
-            setFilterString(value);
-            if (value.length > 0) {
-              // If the filter is engaged, ensure the user is viewing governance proposals,
-              // as network upgrades do not have IDs to filter by and will be excluded.
-              setClosedProposalsView(
-                ClosedProposalsViewOptions.NetworkGovernance
-              );
-            }
-          }}
-        />
+        <ProposalsListFilter setFilterString={setFilterString} />
       )}
-
       <section className="-mx-4 p-4 mb-8 bg-vega-dark-100">
         <SubHeading title={t('openProposals')} />
-
         {sortedProposals.open.length > 0 ||
         sortedProtocolUpgradeProposals.open.length > 0 ? (
           <ul data-testid="open-proposals">
-            {filterString.length < 1 &&
-              sortedProtocolUpgradeProposals.open.map((proposal) => (
-                <ProtocolUpgradeProposalsListItem
-                  key={proposal.upgradeBlockHeight}
-                  proposal={proposal}
-                />
-              ))}
-
+            {sortedProtocolUpgradeProposals.open.map((proposal) => (
+              <ProtocolUpgradeProposalsListItem
+                key={proposal.upgradeBlockHeight}
+                proposal={proposal}
+              />
+            ))}
             {sortedProposals.open.filter(filterPredicate).map((proposal) => (
               <ProposalsListItem key={proposal?.id} proposal={proposal} />
             ))}
@@ -209,81 +176,22 @@ export const ProposalsList = ({
           </p>
         )}
       </section>
-
-      <section className="relative">
+      <section>
         <SubHeading title={t('closedProposals')} />
         {sortedProposals.closed.length > 0 ||
         sortedProtocolUpgradeProposals.closed.length > 0 ? (
-          <>
-            {
-              // We need both the closed proposals and closed protocol upgrade
-              // proposals to be present for there to be a toggle. It also gets
-              // hidden if the user has filtered the list, as the upgrade proposals
-              // do not have the necessary fields for filtering.
-              sortedProposals.closed.length > 0 &&
-                sortedProtocolUpgradeProposals.closed.length > 0 &&
-                filterString.length < 1 && (
-                  <div
-                    className="grid w-full justify-end xl:-mt-12 pb-6"
-                    data-testid="toggle-closed-proposals"
-                  >
-                    <div className="w-[440px]">
-                      <Toggle
-                        name="closed-proposals-toggle"
-                        toggles={[
-                          {
-                            label: t(
-                              ClosedProposalsViewOptions.NetworkGovernance
-                            ),
-                            value: ClosedProposalsViewOptions.NetworkGovernance,
-                          },
-                          {
-                            label: t(
-                              ClosedProposalsViewOptions.NetworkUpgrades
-                            ),
-                            value: ClosedProposalsViewOptions.NetworkUpgrades,
-                          },
-                        ]}
-                        checkedValue={closedProposalsView}
-                        onChange={(e) =>
-                          setClosedProposalsView(
-                            e.target.value as ClosedProposalsViewOptions
-                          )
-                        }
-                      />
-                    </div>
-                  </div>
-                )
-            }
+          <ul data-testid="closed-proposals">
+            {sortedProtocolUpgradeProposals.closed.map((proposal) => (
+              <ProtocolUpgradeProposalsListItem
+                key={proposal.upgradeBlockHeight}
+                proposal={proposal}
+              />
+            ))}
 
-            <ul data-testid="closed-proposals">
-              {closedProposalsView ===
-                ClosedProposalsViewOptions.NetworkUpgrades && (
-                <div data-testid="closed-upgrade-proposals">
-                  {sortedProtocolUpgradeProposals.closed.map((proposal) => (
-                    <ProtocolUpgradeProposalsListItem
-                      key={proposal.upgradeBlockHeight}
-                      proposal={proposal}
-                    />
-                  ))}
-                </div>
-              )}
-
-              {closedProposalsView ===
-                ClosedProposalsViewOptions.NetworkGovernance && (
-                <div data-testid="closed-governance-proposals">
-                  {sortedProposals.closed
-                    .filter(filterPredicate)
-                    .map((proposal) => (
-                      <ProposalsListItem
-                        key={proposal?.id}
-                        proposal={proposal}
-                      />
-                    ))}
-                </div>
-              )}
-            </ul>
-          </>
+            {sortedProposals.closed.filter(filterPredicate).map((proposal) => (
+              <ProposalsListItem key={proposal?.id} proposal={proposal} />
+            ))}
+          </ul>
         ) : (
           <p className="mb-0" data-testid="no-closed-proposals">
             {t('noClosedProposals')}

apps/governance/src/routes/proposals/components/proposals-list/rejected-proposals-list.tsx

@@ -23,10 +23,7 @@ export const RejectedProposalsList = ({ proposals }: ProposalsListProps) => {
   return (
     <>
       <Heading title={t('pageTitleRejectedProposals')} />
-      <ProposalsListFilter
-        filterString={filterString}
-        setFilterString={setFilterString}
-      />
+      <ProposalsListFilter setFilterString={setFilterString} />
       <section>
         {proposals.length > 0 ? (
           <ul data-testid="rejected-proposals">

apps/governance/src/routes/proposals/components/propose/proposal-form-vote-and-enactment-deadline.spec.tsx

@@ -224,47 +224,7 @@ describe('Proposal form vote, validation and enactment deadline', () => {
     expect(
       screen.getByTestId('enactment-before-voting-deadline')
     ).toHaveTextContent(
-      'The proposal will fail if enactment is earlier than the voting deadline'
-    );
-  });
-
-  it('displays error text if the vote deadline is set earlier than the minimum allowed', () => {
-    renderComponent();
-    const voteDeadlineInput = screen.getByTestId('proposal-vote-deadline');
-    fireEvent.change(voteDeadlineInput, { target: { value: 0.01 } });
-    expect(screen.getByTestId('voting-less-than-min')).toHaveTextContent(
-      'The proposal will fail if voting deadline is below the minimum'
-    );
-  });
-
-  it('displays error text if the vote deadline is set later than the maximum allowed', () => {
-    renderComponent();
-    const voteDeadlineInput = screen.getByTestId('proposal-vote-deadline');
-    fireEvent.change(voteDeadlineInput, { target: { value: 100000 } });
-    expect(screen.getByTestId('voting-greater-than-max')).toHaveTextContent(
-      'The proposal will fail if voting deadline is above the maximum'
-    );
-  });
-
-  it('displays error text if the enactment deadline is set earlier than the minimum allowed', () => {
-    renderComponent();
-    const enactmentDeadlineInput = screen.getByTestId(
-      'proposal-enactment-deadline'
-    );
-    fireEvent.change(enactmentDeadlineInput, { target: { value: 0.01 } });
-    expect(screen.getByTestId('enactment-less-than-min')).toHaveTextContent(
-      'The proposal will fail if enactment deadline is below the minimum'
-    );
-  });
-
-  it('displays error text if the enactment deadline is set later than the maximum allowed', () => {
-    renderComponent();
-    const enactmentDeadlineInput = screen.getByTestId(
-      'proposal-enactment-deadline'
-    );
-    fireEvent.change(enactmentDeadlineInput, { target: { value: 100000 } });
-    expect(screen.getByTestId('enactment-greater-than-max')).toHaveTextContent(
-      'The proposal will fail if enactment deadline is above the maximum'
+      'Proposal will fail if enactment is earlier than the voting deadline'
     );
   });
 });

apps/governance/src/routes/proposals/components/propose/proposal-form-vote-and-enactment-deadline.tsx

@@ -220,41 +220,21 @@ const EnactmentForm = ({
           <span data-testid="enactment-date" className="pl-2">
             {getDateTimeFormat().format(deadlineDates.enactment)}
           </span>
-          {deadlines.enactment && (
-            <>
-              {deadlines.enactment === minEnactmentHours && (
-                <span
-                  data-testid="enactment-2-mins-extra"
-                  className="block mt-4 font-light"
-                >
-                  {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
-                </span>
-              )}
-              {deadlines.enactment < deadlines.vote && (
-                <span
-                  data-testid="enactment-before-voting-deadline"
-                  className="block mt-4 text-vega-pink"
-                >
-                  {t('ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline')}
-                </span>
-              )}
-              {deadlines.enactment < minEnactmentHours && (
-                <span
-                  data-testid="enactment-less-than-min"
-                  className="block mt-4 text-vega-pink"
-                >
-                  {t('ProposalWillFailIfEnactmentIsBelowTheMinimumDeadline')}
-                </span>
-              )}
-              {deadlines.enactment > maxEnactmentHours && (
-                <span
-                  data-testid="enactment-greater-than-max"
-                  className="block mt-4 text-vega-pink"
-                >
-                  {t('ProposalWillFailIfEnactmentIsAboveTheMaximumDeadline')}
-                </span>
-              )}
-            </>
+          {deadlines.enactment === minEnactmentHours && (
+            <span
+              data-testid="enactment-2-mins-extra"
+              className="block mt-4 font-light"
+            >
+              {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
+            </span>
+          )}
+          {deadlines.enactment && deadlines.enactment < deadlines.vote && (
+            <span
+              data-testid="enactment-before-voting-deadline"
+              className="block mt-4 text-vega-pink"
+            >
+              {t('ProposalWillFailIfEnactmentIsEarlierThanVotingDeadline')}
+            </span>
           )}
         </p>
       )}
@@ -520,33 +500,13 @@ export function ProposalFormVoteAndEnactmentDeadline({
             <span data-testid="voting-date" className="pl-2">
               {getDateTimeFormat().format(deadlineDates.vote)}
             </span>
-            {deadlines.vote && (
-              <>
-                {deadlines.vote === minVoteHours && (
-                  <span
-                    data-testid="voting-2-mins-extra"
-                    className="block mt-4 font-light"
-                  >
-                    {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
-                  </span>
-                )}
-                {deadlines.vote < minVoteHours && (
-                  <span
-                    data-testid="voting-less-than-min"
-                    className="block mt-4 text-vega-pink"
-                  >
-                    {t('ProposalWillFailIfVotingIsBelowTheMinimumDeadline')}
-                  </span>
-                )}
-                {deadlines.vote > maxVoteHours && (
-                  <span
-                    data-testid="voting-greater-than-max"
-                    className="block mt-4 text-vega-pink"
-                  >
-                    {t('ProposalWillFailIfVotingIsAboveTheMaximumDeadline')}
-                  </span>
-                )}
-              </>
+            {deadlines.vote === minVoteHours && (
+              <span
+                data-testid="voting-2-mins-extra"
+                className="block mt-4 font-light"
+              >
+                {t('ThisWillAdd2MinutesToAllowTimeToConfirmInWallet')}
+              </span>
             )}
           </p>
         )}

apps/governance/src/routes/proposals/components/vote-details/use-user-vote.tsx

@@ -1,10 +1,11 @@
 import { captureMessage } from '@sentry/minimal';
+
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { VoteValue } from '@vegaprotocol/types';
 import { useEffect, useState } from 'react';
 import { useUserVoteQuery } from './__generated__/Vote';
-import { removePaginationWrapper } from '@vegaprotocol/utils';
 import type { FinalizedVote } from '@vegaprotocol/proposals';
+import { removePaginationWrapper } from '@vegaprotocol/utils';
 
 export enum VoteState {
   NotCast = 'NotCast',
@@ -44,23 +45,21 @@ export function useUserVote(
   );
 
   useEffect(() => {
-    if (finalizedVote?.vote.value && finalizedVote.pubKey === pubKey) {
+    if (finalizedVote?.vote.value) {
       setUserVote(finalizedVote);
-    } else if (data?.party?.votesConnection?.edges && pubKey) {
-      const vote = removePaginationWrapper(
-        data?.party?.votesConnection?.edges
-      ).find(({ proposalId: pId }) => proposalId === pId);
-
-      if (vote) {
-        setUserVote({ ...vote, pubKey });
-      }
+    } else if (data?.party?.votesConnection?.edges) {
+      // This sets the vote (if any) when the user first loads the page
+      setUserVote(
+        removePaginationWrapper(data?.party?.votesConnection?.edges).find(
+          ({ proposalId: pId }) => proposalId === pId
+        )
+      );
     }
   }, [
     finalizedVote?.vote.value,
     data?.party?.votesConnection?.edges,
     finalizedVote,
     proposalId,
-    pubKey,
   ]);
 
   // If user vote changes update the vote state
@@ -95,8 +94,6 @@ export function useUserVote(
   return {
     voteState,
     userVote,
-    voteDatetime: userVote?.vote?.datetime
-      ? new Date(userVote.vote.datetime)
-      : null,
+    voteDatetime: userVote ? new Date(userVote.vote.datetime) : null,
   };
 }

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

@@ -7,9 +7,6 @@ import { ProposalNotFound } from '../components/proposal-not-found';
 import { useProposalQuery } from './__generated__/Proposal';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { ENV } from '../../../config';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
-import { useAssetQuery } from '@vegaprotocol/assets';
 
 export const ProposalContainer = () => {
   const params = useParams<{ proposalId: string }>();
@@ -23,60 +20,15 @@ export const ProposalContainer = () => {
     skip: !params.proposalId,
   });
 
-  const {
-    data: newMarketData,
-    loading: newMarketLoading,
-    error: newMarketError,
-  } = useDataProvider({
-    dataProvider: marketInfoWithDataProvider,
-    skipUpdates: true,
-    variables: {
-      marketId: data?.proposal?.id || '',
-      skip: !data?.proposal?.id,
-    },
-  });
-
-  const {
-    data: assetData,
-    loading: assetLoading,
-    error: assetError,
-  } = useAssetQuery({
-    fetchPolicy: 'network-only',
-    variables: {
-      assetId:
-        (data?.proposal?.terms.change.__typename === 'NewAsset' &&
-          data?.proposal?.id) ||
-        (data?.proposal?.terms.change.__typename === 'UpdateAsset' &&
-          data.proposal.terms.change.assetId) ||
-        '',
-    },
-    skip: !['NewAsset', 'UpdateAsset'].includes(
-      data?.proposal?.terms?.change?.__typename || ''
-    ),
-  });
-
   useEffect(() => {
-    const interval = setInterval(refetch, 2000);
+    const interval = setInterval(refetch, 1000);
     return () => clearInterval(interval);
   }, [refetch]);
 
   return (
-    <AsyncRenderer
-      loading={loading || newMarketLoading || assetLoading}
-      error={error || newMarketError || assetError}
-      data={{
-        ...data,
-        ...(newMarketData ? { newMarketData } : {}),
-        ...(assetData ? { assetData } : {}),
-      }}
-    >
+    <AsyncRenderer loading={loading} error={error} data={data}>
       {data?.proposal ? (
-        <Proposal
-          proposal={data.proposal}
-          restData={restData}
-          newMarketData={newMarketData}
-          assetData={assetData}
-        />
+        <Proposal proposal={data.proposal} restData={restData} />
       ) : (
         <ProposalNotFound />
       )}

apps/governance/src/routes/proposals/test-helpers/generate-proposals.ts

@@ -1,5 +1,4 @@
 import * as Schema from '@vegaprotocol/types';
-import { ProtocolUpgradeProposalStatus } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import * as faker from 'faker';
 import isArray from 'lodash/isArray';
@@ -7,40 +6,6 @@ import mergeWith from 'lodash/mergeWith';
 
 import type { PartialDeep } from 'type-fest';
 import type { ProposalQuery } from '../proposal/__generated__/Proposal';
-import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-
-export function generateProtocolUpgradeProposal(
-  override: PartialDeep<ProtocolUpgradeProposalFieldsFragment> = {}
-): ProtocolUpgradeProposalFieldsFragment {
-  const defaultProposal: ProtocolUpgradeProposalFieldsFragment = {
-    __typename: 'ProtocolUpgradeProposal',
-    upgradeBlockHeight: '3917600',
-    vegaReleaseTag: 'v0.71.6',
-    approvers: [
-      '0ac70c4ccc7f961614fe49b93e639ddf916269b7dcf8391db264cefeadf5a6b7',
-      '63a1755006642bda9ab1bfa84660f944d30a113d1609590ca90c50b24aede472',
-      '68ed0770fc3e67b74d09c05443243d27e29a8513dc0e8628beb98338cd509159',
-      'a6e6f7daf8610f9242ab6ab46b394f6fb79cf9533d48051ca7a2f142b8b700a8',
-      'aad2be546ba83cbcab4c1d57ebe22b4a942f294f54333f1a7c2c9ef0e9fe19bb',
-      'acc55c7205cfcd5480e0235acab56a01487a39dc858a641fc04df6ba016870ee',
-      'b7e500deb24cc19bd6ebb2311997f0904ca0d9e51541249e9650ab41fd8ac376',
-      'cf295dff6d9506e8a905d168a44dfcff2f64bd0a6671783a469f8322959c62e2',
-      'f4686749895bf51c6df4092ef6be4279c384a3c380c24ea7a2fd20afc602a35d',
-    ],
-    status:
-      ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_APPROVED,
-  };
-
-  return mergeWith<
-    ProtocolUpgradeProposalFieldsFragment,
-    PartialDeep<ProtocolUpgradeProposalFieldsFragment>
-  >(defaultProposal, override, (objValue, srcValue) => {
-    if (!isArray(objValue)) {
-      return;
-    }
-    return srcValue;
-  });
-}
 
 export function generateProposal(
   override: PartialDeep<ProposalQuery['proposal']> = {}

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

@@ -48,22 +48,15 @@ export const EpochIndividualRewards = ({
     return removePaginationWrapper(data.party.rewardsConnection.edges);
   }, [data]);
 
-  const epochRewardSummaries = useMemo(() => {
-    if (!data?.epochRewardSummaries) return [];
-
-    return removePaginationWrapper(data.epochRewardSummaries.edges);
-  }, [data]);
-
   const epochIndividualRewardSummaries = useMemo(() => {
     if (!data?.party) return [];
     return generateEpochIndividualRewardsList({
       rewards,
       epochId,
-      epochRewardSummaries,
       page,
       size: EPOCHS_PAGE_SIZE,
     });
-  }, [data?.party, epochId, epochRewardSummaries, page, rewards]);
+  }, [data?.party, epochId, page, rewards]);
 
   const refetchData = useCallback(
     async (toPage?: number) => {

apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.spec.ts

@@ -65,11 +65,7 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('should return an empty array if no rewards are provided', () => {
     expect(
-      generateEpochIndividualRewardsList({
-        rewards: [],
-        epochId: 1,
-        epochRewardSummaries: [],
-      })
+      generateEpochIndividualRewardsList({ rewards: [], epochId: 1 })
     ).toEqual([
       {
         epoch: 1,
@@ -82,7 +78,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const result = generateEpochIndividualRewardsList({
       rewards: [rewardWrongType],
       epochId: 1,
-      epochRewardSummaries: [],
     });
 
     expect(result).toEqual([
@@ -97,15 +92,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const result = generateEpochIndividualRewardsList({
       rewards: [reward1],
       epochId: 1,
-      epochRewardSummaries: [
-        {
-          __typename: 'EpochRewardSummary',
-          epoch: 1,
-          assetId: 'usd',
-          amount: '100000',
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-        },
-      ],
     });
 
     expect(result[0]).toEqual({
@@ -148,11 +134,7 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('should return an array sorted by epoch descending', () => {
     const rewards = [reward1, reward2, reward3, reward4];
-    const result1 = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 2,
-      epochRewardSummaries: [],
-    });
+    const result1 = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
 
     expect(result1[0].epoch).toEqual(2);
     expect(result1[1].epoch).toEqual(1);
@@ -161,7 +143,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const result2 = generateEpochIndividualRewardsList({
       rewards: reorderedRewards,
       epochId: 2,
-      epochRewardSummaries: [],
     });
 
     expect(result2[0].epoch).toEqual(2);
@@ -170,11 +151,7 @@ describe('generateEpochIndividualRewardsList', () => {
 
   it('correctly calculates the total value of rewards for an asset', () => {
     const rewards = [reward1, reward4];
-    const result = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 1,
-      epochRewardSummaries: [],
-    });
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 1 });
 
     expect(result[0].rewards[0].totalAmount).toEqual('200');
   });
@@ -182,11 +159,7 @@ describe('generateEpochIndividualRewardsList', () => {
   it('returns data in the expected shape', () => {
     // Just sanity checking the whole structure here
     const rewards = [reward1, reward2, reward3, reward4];
-    const result = generateEpochIndividualRewardsList({
-      rewards,
-      epochId: 2,
-      epochRewardSummaries: [],
-    });
+    const result = generateEpochIndividualRewardsList({ rewards, epochId: 2 });
 
     expect(result).toEqual([
       {
@@ -300,7 +273,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const resultPageOne = generateEpochIndividualRewardsList({
       rewards,
       epochId: 3,
-      epochRewardSummaries: [],
       page: 1,
       size: 2,
     });
@@ -414,7 +386,6 @@ describe('generateEpochIndividualRewardsList', () => {
     const resultPageTwo = generateEpochIndividualRewardsList({
       rewards,
       epochId: 3,
-      epochRewardSummaries: [],
       page: 2,
       size: 2,
     });
@@ -458,69 +429,4 @@ describe('generateEpochIndividualRewardsList', () => {
       },
     ]);
   });
-
-  it('correctly calculates the percentage of two or more rewards by referencing the total rewards amount', () => {
-    const result = generateEpochIndividualRewardsList({
-      rewards: [
-        // reward1 is 100 usd, which is 10% of the total rewards amount
-        reward1,
-        {
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-          amount: '200',
-          percentageOfTotal: '0.2',
-          receivedAt: new Date(),
-          asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
-          party: { id: 'blah' },
-          epoch: { id: '1' },
-        },
-      ],
-      epochId: 1,
-      epochRewardSummaries: [
-        {
-          __typename: 'EpochRewardSummary',
-          epoch: 1,
-          assetId: 'usd',
-          amount: '1000',
-          rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
-        },
-      ],
-    });
-
-    expect(result[0]).toEqual({
-      epoch: 1,
-      rewards: [
-        {
-          asset: 'USD',
-          decimals: 6,
-          totalAmount: '300',
-          rewardTypes: {
-            [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_GLOBAL_REWARD]: {
-              amount: '300',
-              percentageOfTotal: '30',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-            [AccountType.ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS]: {
-              amount: '0',
-              percentageOfTotal: '0',
-            },
-          },
-        },
-      ],
-    });
-  });
 });

apps/governance/src/routes/rewards/epoch-individual-rewards/generate-epoch-individual-rewards-list.ts

@@ -1,9 +1,6 @@
 import { BigNumber } from '../../../lib/bignumber';
 import { RowAccountTypes } from '../shared-rewards-table-assets/shared-rewards-table-assets';
-import type {
-  EpochRewardSummaryFieldsFragment,
-  RewardFieldsFragment,
-} from '../home/__generated__/Rewards';
+import type { RewardFieldsFragment } from '../home/__generated__/Rewards';
 import type { AccountType } from '@vegaprotocol/types';
 import { calculateEpochOffset } from '../../../lib/epoch-pagination';
 
@@ -35,13 +32,11 @@ const emptyRowAccountTypes = accountTypes.map((type) => [
 export const generateEpochIndividualRewardsList = ({
   rewards,
   epochId,
-  epochRewardSummaries,
   page = 1,
   size = 10,
 }: {
   rewards: RewardFieldsFragment[];
   epochId: number;
-  epochRewardSummaries: EpochRewardSummaryFieldsFragment[];
   page?: number;
   size?: number;
 }) => {
@@ -59,7 +54,6 @@ export const generateEpochIndividualRewardsList = ({
   const epochIndividualRewards = rewards.reduce((acc, reward) => {
     const epochId = reward.epoch.id;
     const assetName = reward.asset.name;
-    const assetId = reward.asset.id;
     const assetDecimals = reward.asset.decimals;
     const rewardType = reward.rewardType;
     const amount = reward.amount;
@@ -76,14 +70,6 @@ export const generateEpochIndividualRewardsList = ({
 
     const epoch = acc.get(epochId);
 
-    // matchingTotalReward is the total awarded for all users for the reward type in the epoch of the asset
-    const matchingTotalRewardAmount = epochRewardSummaries.find(
-      (summary) =>
-        summary.epoch === Number(epochId) &&
-        summary.assetId === assetId &&
-        summary.rewardType === rewardType
-    )?.amount;
-
     let asset = epoch?.rewards.find((r) => r.asset === assetName);
 
     if (!asset) {
@@ -100,24 +86,22 @@ export const generateEpochIndividualRewardsList = ({
       asset.rewardTypes[rewardType] = { amount, percentageOfTotal };
     } else {
       const previousAmount = asset.rewardTypes[rewardType]?.amount;
-      const newAmount = previousAmount
-        ? new BigNumber(previousAmount).plus(amount).toString()
-        : amount;
+      const previousPercentageOfTotal =
+        asset.rewardTypes[rewardType]?.percentageOfTotal;
 
       asset.rewardTypes[rewardType] = {
-        amount: newAmount,
-        percentageOfTotal: matchingTotalRewardAmount
-          ? new BigNumber(newAmount)
-              .dividedBy(matchingTotalRewardAmount)
-              .multipliedBy(100)
+        amount: previousAmount
+          ? new BigNumber(previousAmount).plus(amount).toString()
+          : amount,
+        percentageOfTotal: previousPercentageOfTotal
+          ? new BigNumber(previousPercentageOfTotal)
+              .plus(percentageOfTotal)
               .toString()
-          : // this should never be reached, if there's an individual reward there should
-            // always be a reward total from the api too, but set it as a fallback just in case
-            percentageOfTotal,
+          : percentageOfTotal,
       };
     }
 
-    // totalAmount is the sum of all individual rewardTypes amounts
+    // totalAmount is the sum of all rewardTypes amounts
     asset.totalAmount = Object.values(asset.rewardTypes).reduce(
       (sum, rewardType) => {
         return new BigNumber(sum).plus(rewardType.amount).toString();

apps/governance/src/routes/rewards/home/Rewards.graphql

@@ -22,13 +22,6 @@ fragment DelegationFields on Delegation {
   epoch
 }
 
-fragment EpochRewardSummaryFields on EpochRewardSummary {
-  epoch
-  assetId
-  amount
-  rewardType
-}
-
 query Rewards(
   $partyId: ID!
   $fromEpoch: Int
@@ -57,16 +50,13 @@ query Rewards(
       }
     }
   }
-  epochRewardSummaries(
-    filter: { fromEpoch: $fromEpoch, toEpoch: $toEpoch }
-    pagination: $rewardsPagination
-  ) {
-    edges {
-      node {
-        ...EpochRewardSummaryFields
-      }
-    }
-  }
+}
+
+fragment EpochRewardSummaryFields on EpochRewardSummary {
+  epoch
+  assetId
+  amount
+  rewardType
 }
 
 query EpochAssetsRewards(

apps/governance/src/routes/rewards/home/__generated__/Rewards.ts

@@ -7,8 +7,6 @@ export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.Ac
 
 export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number };
 
-export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
-
 export type RewardsQueryVariables = Types.Exact<{
   partyId: Types.Scalars['ID'];
   fromEpoch?: Types.InputMaybe<Types.Scalars['Int']>;
@@ -18,7 +16,9 @@ export type RewardsQueryVariables = Types.Exact<{
 }>;
 
 
-export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epochRewardSummaries?: { __typename?: 'EpochRewardSummaryConnection', edges?: Array<{ __typename?: 'EpochRewardSummaryEdge', node: { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType } } | null> | null } | null };
+export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null };
+
+export type EpochRewardSummaryFieldsFragment = { __typename?: 'EpochRewardSummary', epoch: number, assetId: string, amount: string, rewardType: Types.AccountType };
 
 export type EpochAssetsRewardsQueryVariables = Types.Exact<{
   epochRewardSummariesFilter?: Types.InputMaybe<Types.RewardSummaryFilter>;
@@ -102,20 +102,9 @@ export const RewardsDocument = gql`
       }
     }
   }
-  epochRewardSummaries(
-    filter: {fromEpoch: $fromEpoch, toEpoch: $toEpoch}
-    pagination: $rewardsPagination
-  ) {
-    edges {
-      node {
-        ...EpochRewardSummaryFields
-      }
-    }
-  }
 }
     ${RewardFieldsFragmentDoc}
-${DelegationFieldsFragmentDoc}
-${EpochRewardSummaryFieldsFragmentDoc}`;
+${DelegationFieldsFragmentDoc}`;
 
 /**
  * __useRewardsQuery__

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

@@ -36,7 +36,6 @@ import {
   toBigNum,
 } from '@vegaprotocol/utils';
 import { VALIDATOR_LOGO_MAP } from './logo-map';
-import { getMultisigStatusInfo } from '../../../../lib/get-multisig-status-info';
 
 interface CanonisedConsensusNodeProps {
   id: string;
@@ -138,10 +137,6 @@ export const ConsensusValidatorsTable = ({
     [totalStake]
   );
 
-  const multisigStatus = previousEpochData
-    ? getMultisigStatusInfo(previousEpochData)
-    : undefined;
-
   const allNodesInPreviousEpoch = removePaginationWrapper(
     previousEpochData?.epoch.validatorsConnection?.edges
   );
@@ -228,8 +223,6 @@ export const ConsensusValidatorsTable = ({
             [ValidatorFields.USER_STAKE_SHARE]: userStakeShare
               ? formatNumberPercentage(new BigNumber(userStakeShare), 2)
               : undefined,
-            [ValidatorFields.MULTISIG_ERROR]:
-              multisigStatus?.showMultisigStatusError,
           };
         }
       );
@@ -339,7 +332,6 @@ export const ConsensusValidatorsTable = ({
     data,
     decimals,
     hideTopThird,
-    multisigStatus?.showMultisigStatusError,
     previousEpochData,
     thirdOfTotalStake,
     validatorsView,

apps/governance/src/routes/staking/home/validator-tables/shared.tsx

@@ -39,7 +39,6 @@ export enum ValidatorFields {
   STAKED_BY_USER = 'stakedByUser',
   PENDING_USER_STAKE = 'pendingUserStake',
   USER_STAKE_SHARE = 'userStakeShare',
-  MULTISIG_ERROR = 'multisigError',
 }
 
 export const addUserDataToValidator = (
@@ -327,7 +326,6 @@ interface TotalPenaltiesRendererProps {
     overstakedAmount: string;
     overstakingPenalty: string;
     totalPenalties: string;
-    multisigError?: boolean;
   };
 }
 
@@ -346,11 +344,10 @@ export const TotalPenaltiesRenderer = ({
           <div data-testid="overstaked-penalty-tooltip">
             {t('overstakedPenalty')}: {data.overstakingPenalty}
           </div>
-          {data.multisigError && (
-            <div data-testid="multisig-error-tooltip">
-              {t('multisigPenalty')}: 100%
-            </div>
-          )}
+          <div data-testid="total-penalty-tooltip">
+            {t('totalPenalties')}:{' '}
+            <span className="font-bold">{data.totalPenalties}</span>
+          </div>
         </>
       }
     >

apps/governance/src/routes/staking/node/node.tsx

@@ -107,7 +107,7 @@ export const StakingNode = ({ data, previousEpochData }: StakingNodeProps) => {
       <div className="flex items-center gap-1">
         <Icon name={'chevron-left'} />
         <Link className="underline" to={Routes.VALIDATORS}>
-          {t('AllValidators')}
+          {t('All validators')}
         </Link>
       </div>
       <Heading

apps/governance/src/styles.css

@@ -1,5 +1,6 @@
-@import 'ag-grid-community/styles/ag-grid.css';
-@import 'ag-grid-community/styles/ag-theme-balham.css';
+@import 'ag-grid-community/dist/styles/ag-grid.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
 
 @tailwind base;
 @tailwind components;

apps/liquidity-provision-dashboard/src/app/components/dashboard/market-list/market-list.tsx

@@ -21,14 +21,11 @@ import {
   HealthBar,
   TooltipCellComponent,
 } from '@vegaprotocol/ui-toolkit';
-import type {
-  GetRowIdParams,
-  RowClickedEvent,
-  ColDef,
-} from 'ag-grid-community';
-import 'ag-grid-community/styles/ag-grid.css';
-import 'ag-grid-community/styles/ag-theme-alpine.css';
-import { useCallback, useState, useMemo } from 'react';
+import type { GetRowIdParams, RowClickedEvent } from 'ag-grid-community';
+import 'ag-grid-community/dist/styles/ag-grid.css';
+import 'ag-grid-community/dist/styles/ag-theme-alpine.css';
+import { AgGridColumn } from 'ag-grid-react';
+import { useCallback, useState } from 'react';
 
 import { Grid } from '../../grid';
 import { HealthDialog } from '../../health-dialog';
@@ -42,234 +39,6 @@ export const MarketList = () => {
   const consoleLink = useLinks(DApp.Console);
 
   const getRowId = useCallback(({ data }: GetRowIdParams) => data.id, []);
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('Market (futures)'),
-        field: 'tradableInstrument.instrument.name',
-        cellRenderer: ({ value, data }: { value: string; data: Market }) => {
-          return (
-            <>
-              <span className="leading-3">{value}</span>
-              <span className="leading-3">
-                {
-                  data?.tradableInstrument?.instrument?.product?.settlementAsset
-                    ?.symbol
-                }
-              </span>
-            </>
-          );
-        },
-        minWidth: 100,
-        flex: 1,
-        headerTooltip: t('The market name and settlement asset'),
-      },
-
-      {
-        headerName: t('Market Code'),
-        headerTooltip: t(
-          'The market code is a unique identifier for this market'
-        ),
-        field: 'tradableInstrument.instrument.code',
-      },
-
-      {
-        headerName: t('Type'),
-        headerTooltip: t('Type'),
-        field: 'tradableInstrument.instrument.product.__typename',
-      },
-
-      {
-        headerName: t('Last Price'),
-        headerTooltip: t('Latest price for this market'),
-        field: 'data.markPrice',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'data.markPrice'>) =>
-          value && data
-            ? formatWithAsset(
-                value,
-                data.tradableInstrument.instrument.product.settlementAsset
-              )
-            : '-',
-      },
-
-      {
-        headerName: t('Change (24h)'),
-        headerTooltip: t('Change in price over the last 24h'),
-        cellRenderer: ({
-          data,
-        }: VegaValueFormatterParams<Market, 'data.candles'>) => {
-          if (data && data.candles) {
-            const prices = data.candles.map((candle) => candle.close);
-            return (
-              <PriceChangeCell
-                candles={prices}
-                decimalPlaces={data?.decimalPlaces}
-              />
-            );
-          } else return <div>{t('-')}</div>;
-        },
-      },
-
-      {
-        headerName: t('Volume (24h)'),
-        field: 'dayVolume',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'dayVolume'>) =>
-          value && data
-            ? `${addDecimalsFormatNumber(
-                value,
-                data.tradableInstrument.instrument.product.settlementAsset
-                  .decimals
-              )} (${displayChange(data.volumeChange)})`
-            : '-',
-        headerTooltip: t('The trade volume over the last 24h'),
-      },
-
-      {
-        headerName: t('Total staked by LPs'),
-        field: 'liquidityCommitted',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'liquidityCommitted'>) =>
-          data && value
-            ? formatWithAsset(
-                value.toString(),
-                data.tradableInstrument.instrument.product.settlementAsset
-              )
-            : '-',
-        headerTooltip: t('The amount of funds allocated to provide liquidity'),
-      },
-
-      {
-        headerName: t('Target stake'),
-        field: 'target',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Market, 'target'>) =>
-          data && value
-            ? formatWithAsset(
-                value,
-                data.tradableInstrument.instrument.product.settlementAsset
-              )
-            : '-',
-        headerTooltip: t(
-          'The ideal committed liquidity to operate the market.  If total commitment currently below this level then LPs can set the fee level with new commitment.'
-        ),
-      },
-
-      {
-        headerName: t('% Target stake met'),
-        valueFormatter: ({ data }: VegaValueFormatterParams<Market, ''>) => {
-          if (data) {
-            const roundedPercentage =
-              parseInt(
-                (data.liquidityCommitted / parseFloat(data.target)).toFixed(0)
-              ) * 100;
-            const display = Number.isNaN(roundedPercentage)
-              ? 'N/A'
-              : formatNumberPercentage(toBigNum(roundedPercentage, 0), 0);
-            return display;
-          } else return '-';
-        },
-        headerTooltip: t('% Target stake met'),
-      },
-
-      {
-        headerName: t('Fee levels'),
-        field: 'fees',
-        valueFormatter: ({ value }: VegaValueFormatterParams<Market, 'fees'>) =>
-          value ? `${value.factors.liquidityFee}%` : '-',
-        headerTooltip: t('Fee level for this market'),
-      },
-
-      {
-        headerName: t('Status'),
-        field: 'tradingMode',
-        cellRenderer: ({
-          value,
-          data,
-        }: {
-          value: Schema.MarketTradingMode;
-          data: Market;
-        }) => {
-          return <Status trigger={data.data?.trigger} tradingMode={value} />;
-        },
-        headerTooltip: t(
-          'The current market status - those below the target stake mark are most in need of liquidity'
-        ),
-      },
-
-      {
-        headerComponent: () => {
-          return (
-            <div>
-              <span>{t('Health')}</span>{' '}
-              <button
-                onClick={() => setIsHealthDialogOpen(true)}
-                aria-label={t('open tooltip')}
-              >
-                <Icon name="info-sign" />
-              </button>
-            </div>
-          );
-        },
-        field: 'tradingMode',
-        cellRenderer: ({
-          value,
-          data,
-        }: {
-          value: Schema.MarketTradingMode;
-          data: Market;
-        }) => (
-          <HealthBar
-            target={data.target}
-            decimals={
-              data.tradableInstrument.instrument.product.settlementAsset
-                .decimals
-            }
-            levels={data.feeLevels}
-            intent={intentForStatus(value)}
-          />
-        ),
-        sortable: false,
-        cellStyle: { overflow: 'unset' },
-      },
-      {
-        headerName: t('Age'),
-        field: 'marketTimestamps.open',
-        headerTooltip: t('Age of the market'),
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<Market, 'marketTimestamps.open'>) => {
-          return value ? formatDistanceToNow(new Date(value)) : '-';
-        },
-      },
-      {
-        headerName: t('Closing Time'),
-        field: 'tradableInstrument.instrument.metadata.tags',
-        headerTooltip: t('Closing time of the market'),
-        valueFormatter: ({ data }: VegaValueFormatterParams<Market, ''>) => {
-          let expiry;
-          if (data?.tradableInstrument.instrument.metadata.tags) {
-            expiry = getExpiryDate(
-              data?.tradableInstrument.instrument.metadata.tags,
-              data?.marketTimestamps.close,
-              data?.state
-            );
-          }
-          return expiry ? expiry : '-';
-        },
-      },
-    ],
-    []
-  );
 
   return (
     <AsyncRenderer loading={loading} error={error} data={data}>
@@ -295,11 +64,258 @@ export const MarketList = () => {
             cellClass: ['flex', 'flex-col', 'justify-center'],
             tooltipComponent: TooltipCellComponent,
           }}
-          columnDefs={columnDefs}
           getRowId={getRowId}
           isRowClickable
           tooltipShowDelay={500}
-        />
+        >
+          <AgGridColumn
+            headerName={t('Market (futures)')}
+            field="tradableInstrument.instrument.name"
+            cellRenderer={({
+              value,
+              data,
+            }: {
+              value: string;
+              data: Market;
+            }) => {
+              return (
+                <>
+                  <span className="leading-3">{value}</span>
+                  <span className="leading-3">
+                    {
+                      data?.tradableInstrument?.instrument?.product
+                        ?.settlementAsset?.symbol
+                    }
+                  </span>
+                </>
+              );
+            }}
+            minWidth={100}
+            flex="1"
+            headerTooltip={t('The market name and settlement asset')}
+          />
+
+          <AgGridColumn
+            headerName={t('Market Code')}
+            headerTooltip={t(
+              'The market code is a unique identifier for this market'
+            )}
+            field="tradableInstrument.instrument.code"
+          />
+
+          <AgGridColumn
+            headerName={t('Type')}
+            headerTooltip={t('Type')}
+            field="tradableInstrument.instrument.product.__typename"
+          />
+
+          <AgGridColumn
+            headerName={t('Last Price')}
+            headerTooltip={t('Latest price for this market')}
+            field="data.markPrice"
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'data.markPrice'>) =>
+              value && data
+                ? formatWithAsset(
+                    value,
+                    data.tradableInstrument.instrument.product.settlementAsset
+                  )
+                : '-'
+            }
+          />
+
+          <AgGridColumn
+            headerName={t('Change (24h)')}
+            headerTooltip={t('Change in price over the last 24h')}
+            cellRenderer={({
+              data,
+            }: VegaValueFormatterParams<Market, 'data.candles'>) => {
+              if (data && data.candles) {
+                const prices = data.candles.map((candle) => candle.close);
+                return (
+                  <PriceChangeCell
+                    candles={prices}
+                    decimalPlaces={data?.decimalPlaces}
+                  />
+                );
+              } else return <div>{t('-')}</div>;
+            }}
+          />
+
+          <AgGridColumn
+            headerName={t('Volume (24h)')}
+            field="dayVolume"
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'dayVolume'>) =>
+              value && data
+                ? `${addDecimalsFormatNumber(
+                    value,
+                    data.tradableInstrument.instrument.product.settlementAsset
+                      .decimals
+                  )} (${displayChange(data.volumeChange)})`
+                : '-'
+            }
+            headerTooltip={t('The trade volume over the last 24h')}
+          />
+
+          <AgGridColumn
+            headerName={t('Total staked by LPs')}
+            field="liquidityCommitted"
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'liquidityCommitted'>) =>
+              data && value
+                ? formatWithAsset(
+                    value.toString(),
+                    data.tradableInstrument.instrument.product.settlementAsset
+                  )
+                : '-'
+            }
+            headerTooltip={t(
+              'The amount of funds allocated to provide liquidity'
+            )}
+          />
+
+          <AgGridColumn
+            headerName={t('Target stake')}
+            field="target"
+            valueFormatter={({
+              value,
+              data,
+            }: VegaValueFormatterParams<Market, 'target'>) =>
+              data && value
+                ? formatWithAsset(
+                    value,
+                    data.tradableInstrument.instrument.product.settlementAsset
+                  )
+                : '-'
+            }
+            headerTooltip={t(
+              'The ideal committed liquidity to operate the market.  If total commitment currently below this level then LPs can set the fee level with new commitment.'
+            )}
+          />
+
+          <AgGridColumn
+            headerName={t('% Target stake met')}
+            valueFormatter={({
+              data,
+            }: VegaValueFormatterParams<Market, ''>) => {
+              if (data) {
+                const roundedPercentage =
+                  parseInt(
+                    (data.liquidityCommitted / parseFloat(data.target)).toFixed(
+                      0
+                    )
+                  ) * 100;
+                const display = Number.isNaN(roundedPercentage)
+                  ? 'N/A'
+                  : formatNumberPercentage(toBigNum(roundedPercentage, 0), 0);
+                return display;
+              } else return '-';
+            }}
+            headerTooltip={t('% Target stake met')}
+          />
+
+          <AgGridColumn
+            headerName={t('Fee levels')}
+            field="fees"
+            valueFormatter={({
+              value,
+            }: VegaValueFormatterParams<Market, 'fees'>) =>
+              value ? `${value.factors.liquidityFee}%` : '-'
+            }
+            headerTooltip={t('Fee level for this market')}
+          />
+
+          <AgGridColumn
+            headerName={t('Status')}
+            field="tradingMode"
+            cellRenderer={({
+              value,
+              data,
+            }: {
+              value: Schema.MarketTradingMode;
+              data: Market;
+            }) => {
+              return (
+                <Status trigger={data.data?.trigger} tradingMode={value} />
+              );
+            }}
+            headerTooltip={t(
+              'The current market status - those below the target stake mark are most in need of liquidity'
+            )}
+          />
+
+          <AgGridColumn
+            headerComponent={() => {
+              return (
+                <div>
+                  <span>{t('Health')}</span>{' '}
+                  <button
+                    onClick={() => setIsHealthDialogOpen(true)}
+                    aria-label={t('open tooltip')}
+                  >
+                    <Icon name="info-sign" />
+                  </button>
+                </div>
+              );
+            }}
+            field="tradingMode"
+            cellRenderer={({
+              value,
+              data,
+            }: {
+              value: Schema.MarketTradingMode;
+              data: Market;
+            }) => (
+              <HealthBar
+                target={data.target}
+                decimals={
+                  data.tradableInstrument.instrument.product.settlementAsset
+                    .decimals
+                }
+                levels={data.feeLevels}
+                intent={intentForStatus(value)}
+              />
+            )}
+            sortable={false}
+            cellStyle={{ overflow: 'unset' }}
+          />
+          <AgGridColumn
+            headerName={t('Age')}
+            field="marketTimestamps.open"
+            headerTooltip={t('Age of the market')}
+            valueFormatter={({
+              value,
+            }: VegaValueFormatterParams<Market, 'marketTimestamps.open'>) => {
+              return value ? formatDistanceToNow(new Date(value)) : '-';
+            }}
+          />
+          <AgGridColumn
+            headerName={t('Closing Time')}
+            field="tradableInstrument.instrument.metadata.tags"
+            headerTooltip={t('Closing time of the market')}
+            valueFormatter={({
+              data,
+            }: VegaValueFormatterParams<Market, ''>) => {
+              let expiry;
+              if (data?.tradableInstrument.instrument.metadata.tags) {
+                expiry = getExpiryDate(
+                  data?.tradableInstrument.instrument.metadata.tags,
+                  data?.marketTimestamps.close,
+                  data?.state
+                );
+              }
+              return expiry ? expiry : '-';
+            }}
+          />
+        </Grid>
+
         <HealthDialog
           isOpen={isHealthDialogOpen}
           onChange={() => {

apps/liquidity-provision-dashboard/src/app/components/detail/detail.tsx

@@ -7,30 +7,31 @@ import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import {
   getFeeLevels,
   sumLiquidityCommitted,
+  marketLiquidityDataProvider,
   lpAggregatedDataProvider,
 } from '@vegaprotocol/liquidity';
-import { marketWithDataProvider } from '@vegaprotocol/markets';
-import type { MarketWithData } from '@vegaprotocol/markets';
+import type { MarketLpQuery } from '@vegaprotocol/liquidity';
 
 import { Market } from './market';
 import { Header } from './header';
 import { LPProvidersGrid } from './providers';
 
-const formatMarket = (market: MarketWithData) => {
+const formatMarket = (data: MarketLpQuery) => {
   return {
-    name: market?.tradableInstrument.instrument.name,
+    name: data?.market?.tradableInstrument.instrument.name,
     symbol:
-      market?.tradableInstrument.instrument.product.settlementAsset.symbol,
+      data?.market?.tradableInstrument.instrument.product.settlementAsset
+        .symbol,
     settlementAsset:
-      market?.tradableInstrument.instrument.product.settlementAsset,
-    targetStake: market?.data?.targetStake,
-    tradingMode: market?.data?.marketTradingMode,
-    trigger: market?.data?.trigger,
+      data?.market?.tradableInstrument.instrument.product.settlementAsset,
+    targetStake: data?.market?.data?.targetStake,
+    tradingMode: data?.market?.data?.marketTradingMode,
+    trigger: data?.market?.data?.trigger,
   };
 };
 
 export const lpDataProvider = makeDerivedDataProvider(
-  [marketWithDataProvider, lpAggregatedDataProvider],
+  [marketLiquidityDataProvider, lpAggregatedDataProvider],
   ([market, lpAggregatedData]) => ({
     market: { ...formatMarket(market) },
     liquidityProviders: lpAggregatedData || [],

apps/liquidity-provision-dashboard/src/app/components/detail/providers/providers.tsx

@@ -1,6 +1,7 @@
-import { useCallback, useMemo } from 'react';
+import { useCallback } from 'react';
+import { AgGridColumn } from 'ag-grid-react';
 
-import type { GetRowIdParams, ColDef } from 'ag-grid-community';
+import type { GetRowIdParams } from 'ag-grid-community';
 import { t } from '@vegaprotocol/i18n';
 
 import type {
@@ -35,75 +36,6 @@ export const LPProvidersGrid = ({
   };
 }) => {
   const getRowId = useCallback(({ data }: GetRowIdParams) => data.party.id, []);
-  const columnDefs = useMemo<ColDef[]>(
-    () => [
-      {
-        headerName: t('LPs'),
-        field: 'party.id',
-        flex: 1,
-        minWidth: 100,
-        headerTooltip: t('Liquidity providers'),
-      },
-      {
-        headerName: t('Duration'),
-        valueFormatter: formatToHours,
-        field: 'createdAt',
-        headerTooltip: t('Time in market'),
-      },
-      {
-        headerName: t('Equity-like share'),
-        field: 'equityLikeShare',
-        valueFormatter: ({ value }: { value?: string | null }) => {
-          return value
-            ? `${parseFloat(parseFloat(value).toFixed(2)) * 100}%`
-            : '';
-        },
-        headerTooltip: t(
-          'The share of the markets liquidity held - the earlier you commit liquidity the greater % fees you earn'
-        ),
-        minWidth: 140,
-      },
-      {
-        headerName: t('committed bond'),
-        field: 'commitmentAmount',
-        valueFormatter: ({ value }: { value?: string | null }) =>
-          value ? formatWithAsset(value, settlementAsset) : '0',
-        headerTooltip: t('The amount of funds allocated to provide liquidity'),
-        minWidth: 140,
-      },
-      {
-        headerName: t('Margin Req.'),
-        field: 'margin',
-        headerTooltip: t(
-          'Margin required for arising positions based on liquidity commitment'
-        ),
-      },
-      {
-        headerName: t('24h Fees'),
-        field: 'fees',
-        headerTooltip: t(
-          'Total fees earned by the liquidity provider in the last 24 hours'
-        ),
-      },
-      {
-        headerName: t('Fee level'),
-        valueFormatter: ({ value }: { value?: string | null }) => `${value}%`,
-        field: 'fee',
-        headerTooltip: t(
-          "The market's liquidity fee, or the percentage of a trade's value which is collected from the price taker for every trade"
-        ),
-      },
-
-      {
-        headerName: t('APY'),
-        field: 'apy',
-        headerTooltip: t(
-          'An annualised estimate based on the total liquidity provision fees and maker fees collected by liquidity providers, the maximum margin needed and maximum commitment (bond) over the course of 7 epochs'
-        ),
-      },
-    ],
-    [settlementAsset]
-  );
 
   return (
     <Grid
@@ -117,9 +49,74 @@ export const LPProvidersGrid = ({
         tooltipComponent: TooltipCellComponent,
         minWidth: 100,
       }}
-      columnDefs={columnDefs}
       getRowId={getRowId}
       rowHeight={92}
-    />
+    >
+      <AgGridColumn
+        headerName={t('LPs')}
+        field="party.id"
+        flex="1"
+        minWidth={100}
+        headerTooltip={t('Liquidity providers')}
+      />
+      <AgGridColumn
+        headerName={t('Duration')}
+        valueFormatter={formatToHours}
+        field="createdAt"
+        headerTooltip={t('Time in market')}
+      />
+      <AgGridColumn
+        headerName={t('Equity-like share')}
+        field="equityLikeShare"
+        valueFormatter={({ value }: { value?: string | null }) => {
+          return value
+            ? `${parseFloat(parseFloat(value).toFixed(2)) * 100}%`
+            : '';
+        }}
+        headerTooltip={t(
+          'The share of the markets liquidity held - the earlier you commit liquidity the greater % fees you earn'
+        )}
+        minWidth={140}
+      />
+      <AgGridColumn
+        headerName={t('committed bond')}
+        field="commitmentAmount"
+        valueFormatter={({ value }: { value?: string | null }) =>
+          value ? formatWithAsset(value, settlementAsset) : '0'
+        }
+        headerTooltip={t('The amount of funds allocated to provide liquidity')}
+        minWidth={140}
+      />
+      <AgGridColumn
+        headerName={t('Margin Req.')}
+        field="margin"
+        headerTooltip={t(
+          'Margin required for arising positions based on liquidity commitment'
+        )}
+      />
+      <AgGridColumn
+        headerName={t('24h Fees')}
+        field="fees"
+        headerTooltip={t(
+          'Total fees earned by the liquidity provider in the last 24 hours'
+        )}
+      />
+      <AgGridColumn
+        headerName={t('Fee level')}
+        valueFormatter={({ value }: { value?: string | null }) => `${value}%`}
+        field="fee"
+        headerTooltip={t(
+          "The market's liquidity fee, or the percentage of a trade's value which is collected from the price taker for every trade"
+        )}
+      />
+
+      <AgGridColumn
+        headerName={t('APY')}
+        field="apy"
+        headerTooltip={t(
+          'An annualised estimate based on the total liquidity provision fees and maker fees collected by liquidity providers, the maximum margin needed and maximum commitment (bond) over the course of 7 epochs'
+        )}
+      />
+    </Grid>
   );
 };

apps/liquidity-provision-dashboard/src/app/components/grid/grid.tsx

@@ -1,4 +1,5 @@
 import { useRef, useCallback, useEffect } from 'react';
+import type { ReactNode } from 'react';
 import { AgGridReact } from 'ag-grid-react';
 import type {
   AgGridReactProps,
@@ -6,17 +7,18 @@ import type {
   AgGridReact as AgGridReactType,
 } from 'ag-grid-react';
 import classNames from 'classnames';
-import 'ag-grid-community/styles/ag-grid.css';
-import 'ag-grid-community/styles/ag-theme-alpine.css';
+import 'ag-grid-community/dist/styles/ag-grid.css';
+import 'ag-grid-community/dist/styles/ag-theme-alpine.css';
 
 import './grid.scss';
 
 type Props = (AgGridReactProps | AgReactUiProps) & {
   isRowClickable?: boolean;
   style?: React.CSSProperties;
+  children: ReactNode;
 };
 
-export const Grid = ({ isRowClickable, ...props }: Props) => {
+export const Grid = ({ isRowClickable, children, ...props }: Props) => {
   const gridRef = useRef<AgGridReactType | null>(null);
 
   const resizeGrid = useCallback(() => {
@@ -42,6 +44,8 @@ export const Grid = ({ isRowClickable, ...props }: Props) => {
       onGridReady={handleOnGridReady}
       suppressRowClickSelection
       {...props}
-    />
+    >
+      {children}
+    </AgGridReact>
   );
 };

apps/static/README.md

@@ -1,5 +1,3 @@
 # Static
 
-A static CDN for Vega assets: `static.vega.xyz`
-
-prepare assets by running: `yarn nx build static`
+A static CDN for Vega assets

apps/trading-e2e/.env

@@ -14,7 +14,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_SENTRY_DSN=https://dummy@o999999.ingest.sentry.io/9999999
 
 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session

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

@@ -1,5 +1,5 @@
 // #region consts
-const assetColId = '[col-id="asset.symbol"]';
+const asset = 'asset';
 const assetDetailsDialog = 'dialog-content';
 const assetRow = 'key-value-table-row';
 const contractAddress = '7_value';
@@ -108,7 +108,7 @@ beforeEach(() => {
 
 const visitPortfolioAndClickAsset = (assetName: string) => {
   cy.visit('/#/portfolio');
-  cy.get(assetColId).contains(assetName).click();
+  cy.getByTestId(asset).contains(assetName).click();
 };
 
 const testTooltip = (index: number, testId: string, tooltip: string) => {

apps/trading-e2e/src/integration/charts-depth.cy.ts

@@ -1,15 +0,0 @@
-describe('charts', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-    cy.getByTestId('Depth').click();
-  });
-
-  it('can see market depth chart', () => {
-    // 6006-DEPC-001
-    cy.getByTestId('tab-depth').should('be.visible');
-    cy.get('.depth-chart-module_canvas__260De').should('be.visible');
-  });
-});

apps/trading-e2e/src/integration/closed-markets.cy.ts

@@ -450,17 +450,3 @@ describe('Closed markets', { tags: '@smoke' }, () => {
       .should('have.text', 'View on Explorer');
   });
 });
-
-describe('no closed markets', { tags: '@smoke', testIsolation: true }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-    cy.get('[data-testid="Closed markets"]').click();
-  });
-
-  it('can see no markets message', () => {
-    // 6001-MARK-034
-    cy.getByTestId('tab-closed-markets').should('contain.text', 'No markets');
-  });
-});

apps/trading-e2e/src/integration/home-node-network.cy.ts

@@ -1,8 +1,10 @@
 const dialogContent = 'dialog-content';
 const nodeHealth = 'node-health';
+const statusIncidentsLink = 'footer [data-testid=external-link]';
 
 describe('home', { tags: '@regression' }, () => {
   before(() => {
+    cy.clearAllLocalStorage();
     cy.mockTradingPage();
     cy.mockSubscription();
     cy.visit('/');
@@ -74,14 +76,23 @@ describe('home', { tags: '@regression' }, () => {
       cy.visit('/');
     });
 
+    // 0006-NETW-002
+    // 0006-NETW-003
+    // 0006-NETW-011
     it('switch to fairground network and check status & incidents link', () => {
-      // 0006-NETW-002
-      // 0006-NETW-003
       cy.getByTestId('navigation')
         .find('[data-testid="network-switcher"]')
-        .should('have.text', 'Custom')
         .click();
-      cy.getByTestId('network-item').contains('Fairground testnet');
+      cy.getByTestId('network-item').contains('Fairground testnet').click();
+      cy.get('[aria-haspopup="menu"]').should('contain.text', 'Fairground');
+      cy.url().should('include', 'fairground.wtf');
+      cy.contains('Continue').click();
+      cy.get(statusIncidentsLink)
+        .children('span')
+        .should('have.text', 'Mainnet status & incidents');
+      cy.get(statusIncidentsLink)
+        .should('have.attr', 'href')
+        .and('contain', 'https://blog.vega.xyz/tagged/vega-incident-reports');
     });
   });
 });

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

@@ -1,10 +1,7 @@
-import { aliasGQLQuery } from '@vegaprotocol/cypress';
-import type { MarketsQuery } from '@vegaprotocol/markets';
 import * as Schema from '@vegaprotocol/types';
 
 const rowSelector =
   '[data-testid="tab-all-markets"] .ag-center-cols-container .ag-row';
-const colInstrumentCode = '[col-id="tradableInstrument.instrument.code"]';
 
 describe('markets all table', { tags: '@smoke' }, () => {
   beforeEach(() => {
@@ -63,7 +60,7 @@ describe('markets all table', { tags: '@smoke' }, () => {
     // 6001-MARK-035
     cy.get(rowSelector)
       .first()
-      .find(colInstrumentCode)
+      .find('[col-id="tradableInstrument.instrument.code"]')
       .should('have.text', 'SOLUSD');
 
     //  6001-MARK-036
@@ -158,7 +155,6 @@ describe('markets all table', { tags: '@smoke' }, () => {
   });
 
   it('able to open and sort full market list - market page', () => {
-    // 6001-MARK-064
     const ExpectedSortedMarkets = [
       'AAPL.MF21',
       'BTCUSD.MF21',
@@ -171,38 +167,8 @@ describe('markets all table', { tags: '@smoke' }, () => {
     cy.get('.ag-header-cell-label').contains('Market').click(); // sort by market name
     for (let i = 0; i < ExpectedSortedMarkets.length; i++) {
       cy.get(`[row-index=${i}]`)
-        .find(colInstrumentCode)
+        .find('[col-id="tradableInstrument.instrument.code"]')
         .should('have.text', ExpectedSortedMarkets[i]);
     }
   });
-
-  it('can drag and drop columns', () => {
-    // 6001-MARK-065
-    cy.get('.ag-overlay-loading-wrapper').should('not.be.visible');
-    cy.get(colInstrumentCode)
-      .realMouseDown()
-      .realMouseMove(700, 15)
-      .realMouseUp();
-    cy.get(colInstrumentCode).should(($element) => {
-      const attributeValue = $element.attr('aria-colindex');
-      expect(attributeValue).not.to.equal('1');
-    });
-  });
-});
-
-describe('no all markets', { tags: '@smoke', testIsolation: true }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    const markets: MarketsQuery = {};
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'Markets', markets);
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-  });
-
-  it('can see no markets message', () => {
-    // 6001-MARK-048
-    cy.getByTestId('tab-all-markets').should('contain.text', 'No markets');
-  });
 });

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

@@ -182,7 +182,7 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
       .contains('Liquidity monitoring parameters')
       .click();
 
-    validateMarketDataRow(0, 'Triggering Ratio', '0.7');
+    validateMarketDataRow(0, 'Triggering Ratio', '0');
     validateMarketDataRow(1, 'Time Window', '3,600');
     validateMarketDataRow(2, 'Scaling Factor', '10');
   });

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

@@ -1,328 +0,0 @@
-import { checkSorting } from '@vegaprotocol/cypress';
-import * as Schema from '@vegaprotocol/types';
-
-const liquidityTab = 'Liquidity';
-const rowSelector =
-  '[data-testid="tab-liquidity"] .ag-center-cols-container .ag-row';
-const rowSelectorLiquidityActive =
-  '[data-testid="tab-active"] .ag-center-cols-container .ag-row';
-const rowSelectorLiquidityInactive =
-  '[data-testid="tab-inactive"] .ag-center-cols-container .ag-row';
-const marketSummaryBlock = 'header-summary';
-const itemValue = 'item-value';
-const itemHeader = 'item-header';
-const colCommitmentAmount = '[col-id="commitmentAmount"]';
-const colAverageEntryValuation = '[col-id="averageEntryValuation"]';
-const colEquityLikeShare = '[col-id="equityLikeShare"]';
-const colFee = '[col-id="fee"]';
-const colCommitmentAmount_1 = '[col-id="commitmentAmount_1"]';
-const colBalance = '[col-id="balance"]';
-const colStatus = '[col-id="status"]';
-const colCreatedAt = '[col-id="createdAt"] button';
-const colUpdatedAt = '[col-id="updatedAt"] button';
-
-const headers = [
-  'Party',
-  'Commitment (tDAI)',
-  'Share',
-  'Proposed fee',
-  'Market valuation at entry',
-  'Obligation',
-  'Supplied',
-  'Status',
-  'Created',
-  'Updated',
-];
-
-describe('liquidity table - trading', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockSubscription();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.visit('/#/markets/market-0');
-    cy.wait('@MarketData');
-    cy.getByTestId(liquidityTab).click();
-    cy.wait('@LiquidityProvisions');
-  });
-
-  it('can see table headers', () => {
-    // 5002-LIQP-001
-    cy.getByTestId('tab-liquidity').within(($headers) => {
-      cy.wrap($headers)
-        .get('.ag-header-cell-text')
-        .each(($header, i) => {
-          cy.wrap($header).should('have.text', headers[i]);
-        });
-    });
-  });
-
-  it('renders liquidity table correctly', () => {
-    // 5002-LIQP-002
-    cy.get(rowSelector)
-      .first()
-      .find('[col-id="party.id"]')
-      .should(
-        'have.text',
-        '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
-      );
-
-    cy.get(rowSelector)
-      .first()
-      .find(colCommitmentAmount)
-      .should('have.text', '4,000.00');
-
-    cy.get(rowSelector)
-      .first()
-      .find(colEquityLikeShare)
-      .should('have.text', '100.00%');
-
-    cy.get(rowSelector).first().find(colFee).should('have.text', '0.09%');
-
-    // 5002-LIQP-013
-    cy.get(rowSelector)
-      .first()
-      .find(colAverageEntryValuation)
-      .should('have.text', '685,852.93692');
-
-    cy.get(rowSelector)
-      .first()
-      .find(colCommitmentAmount_1)
-      .should('have.text', '4,000.00');
-
-    cy.get(rowSelector)
-      .first()
-      .find(colBalance)
-      .scrollIntoView()
-      .should('have.text', '4,000.00');
-
-    cy.get(rowSelector).first().find(colStatus).should('have.text', 'Active');
-
-    cy.get(rowSelector).first().find(colCreatedAt).should('not.be.empty');
-    cy.get(rowSelector).first().find(colUpdatedAt).should('not.be.empty');
-  });
-  it.skip('liquidity status column should be sorted properly', () => {
-    // 5002-LIQP-003
-    const liquidityColDefault = ['Active', 'Pending'];
-    const liquidityColAsc = ['Active', 'Pending'];
-    const liquidityColDesc = ['Pending', 'Active'];
-    checkSorting(
-      'status',
-      liquidityColDefault,
-      liquidityColAsc,
-      liquidityColDesc
-    );
-  });
-});
-
-describe('liquidity table view', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockSubscription();
-    cy.mockTradingPage(
-      Schema.MarketState.STATE_ACTIVE,
-      Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-      Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY_TARGET_NOT_MET
-    );
-    cy.visit('/#/liquidity/market-0');
-    cy.wait('@LiquidityProvisions');
-  });
-
-  it('can see header title', () => {
-    // 5002-LIQP-004
-    // 5002-LIQP-005
-    cy.getByTestId('header-title')
-      .should('contain.text', 'BTCUSD.MF21 liquidity provision')
-      .and('contain.text', 'Go to trading');
-  });
-
-  it('can see target stake', () => {
-    // 5002-LIQP-006
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('target-stake').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Target stake');
-        cy.getByTestId(itemValue).should('have.text', '10.00 tDAI').realHover();
-      });
-    });
-    cy.getByTestId('tooltip-content').should(
-      'contain.text',
-      `The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.`
-    );
-  });
-
-  it('can see supplied stake', () => {
-    // 5002-LIQP-007
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('supplied-stake').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Supplied stake');
-        cy.getByTestId(itemValue).should('have.text', '0.01 tDAI').realHover();
-      });
-    });
-    cy.getByTestId('tooltip-content').should(
-      'contain.text',
-      'The current amount of liquidity supplied for this market.'
-    );
-  });
-
-  it('can see liquidity supplied', () => {
-    // 5002-LIQP-008
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('liquidity-supplied').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Liquidity supplied');
-        cy.getByTestId('indicator').should('be.visible');
-        cy.getByTestId(itemValue).should('have.text', '0.10%').realHover();
-      });
-    });
-  });
-
-  it('can see market id', () => {
-    // 5002-LIQP-009
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('liquidity-market-id').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Market ID');
-        cy.getByTestId(itemValue).should('have.text', 'market-0');
-      });
-    });
-  });
-
-  it('can see market id', () => {
-    // 5002-LIQP-010
-    cy.getByTestId(marketSummaryBlock).within(() => {
-      cy.getByTestId('liquidity-learn-more').within(() => {
-        cy.getByTestId(itemHeader).should('have.text', 'Learn more');
-        cy.getByTestId(itemValue).should('have.text', 'Providing liquidity');
-        cy.getByTestId('external-link')
-          .should('have.attr', 'href')
-          .and(
-            'include',
-            'https://docs.vega.xyz/testnet/concepts/liquidity/provision'
-          );
-      });
-    });
-  });
-
-  describe('liquidity table view', { tags: '@smoke' }, () => {
-    it('can see table headers', () => {
-      cy.getByTestId('tab-active').within(($headers) => {
-        cy.wrap($headers)
-          .get('.ag-header-cell-text')
-          .each(($header, i) => {
-            cy.wrap($header).should('have.text', headers[i]);
-          });
-      });
-    });
-
-    it('renders liquidity active table correctly', () => {
-      // 5002-LIQP-011
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find('[col-id="party.id"]')
-        .should(
-          'have.text',
-          '69464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
-        );
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colCommitmentAmount)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colEquityLikeShare)
-        .should('have.text', '100.00%');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colFee)
-        .should('have.text', '0.09%');
-
-      // 5002-LIQP-013
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colAverageEntryValuation)
-        .should('have.text', '685,852.93692');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colCommitmentAmount_1)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colBalance)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colStatus)
-        .should('have.text', 'Active');
-
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colCreatedAt)
-        .should('not.be.empty');
-      cy.get(rowSelectorLiquidityActive)
-        .first()
-        .find(colUpdatedAt)
-        .should('not.be.empty');
-    });
-
-    it('renders liquidity inactive table correctly', () => {
-      // 5002-LIQP-012
-      cy.getByTestId('Inactive').click();
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find('[col-id="party.id"]')
-        .should(
-          'have.text',
-          'cc464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6f'
-        );
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colCommitmentAmount)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colEquityLikeShare)
-        .should('have.text', '100.00%');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colFee)
-        .should('have.text', '0.40%');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colAverageEntryValuation)
-        .should('have.text', '685,852.93692');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colCommitmentAmount_1)
-        .should('have.text', '4,000.00');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colBalance)
-        .should('have.text', '2,000.00');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colStatus)
-        .should('have.text', 'Pending');
-
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colCreatedAt)
-        .should('not.be.empty');
-      cy.get(rowSelectorLiquidityInactive)
-        .first()
-        .find(colUpdatedAt)
-        .should('not.be.empty');
-    });
-  });
-});

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

@@ -25,7 +25,6 @@ describe('markets selector', { tags: '@smoke' }, () => {
     cy.wait('@MarketsCandles');
   });
 
-  // 6001-MARK-066
   it('can toggle the sidebar', () => {
     cy.getByTestId('market-selector').should('be.visible');
     cy.getByTestId('sidebar-toggle').click();
@@ -68,7 +67,6 @@ describe('markets selector', { tags: '@smoke' }, () => {
       .each((item, i) => {
         const market = data[i];
         // 6001-MARK-021
-        // 6001-MARK-022
         expect(item.find('h3').text()).equals(market.code);
         expect(
           item.find('[data-testid="market-selector-data-row"]').eq(0).text()
@@ -86,19 +84,8 @@ describe('markets selector', { tags: '@smoke' }, () => {
       });
   });
 
-  it('can see all markets link', () => {
-    // 6001-MARK-026
-    cy.getByTestId('market-selector').within(() => {
-      cy.getByTestId('all-markets-link')
-        .should('be.visible')
-        .and('have.text', 'All markets')
-        .and('have.attr', 'href')
-        .and('contain', '#/markets/all');
-    });
-  });
-
+  // 6001-MARK-27
   it('can use the filter options', () => {
-    // 6001-MARK-027
     // product type
     cy.getByTestId('product-Spot').click();
     cy.getByTestId(list).contains('Spot markets coming soon.');
@@ -107,7 +94,7 @@ describe('markets selector', { tags: '@smoke' }, () => {
     cy.getByTestId('product-Future').click();
     cy.getByTestId(list).find('a').should('have.length', 4);
 
-    // 6001-MARK-029
+    // 6001-MARK-29
     cy.getByTestId(searchInput).clear().type('btc');
     cy.getByTestId(list).find('a').should('have.length', 2);
     cy.getByTestId(list).find('a').eq(1).contains('BTCUSD.MF21');
@@ -116,29 +103,4 @@ describe('markets selector', { tags: '@smoke' }, () => {
     cy.getByTestId(searchInput).clear();
     cy.getByTestId(list).find('a').should('have.length', 4);
   });
-
-  it('can sort by by top gaining and top losing market', () => {
-    // 6001-MARK-030
-    // 6001-MARK-031
-    // 6001-MARK-032
-    // 6001-MARK-033
-    cy.getByTestId(' sort-trigger').click();
-    cy.getByTestId('sort-item-Gained')
-      .contains('Top gaining')
-      .should('be.visible');
-    cy.getByTestId('sort-item-Lost')
-      .contains('Top losing')
-      .should('be.visible');
-    cy.getByTestId('sort-item-New')
-      .contains('New markets')
-      .should('be.visible');
-  });
-
-  it('can filter by settlement asset', () => {
-    // 6001-MARK-028
-    cy.getByTestId('asset-trigger').click();
-    cy.getByTestId('asset-id-asset-3').contains('tBTC').click();
-    cy.getByTestId(list).find('a').should('have.length', 1);
-    cy.getByTestId(list).find('a').eq(0).contains('ETHBTC.QM21');
-  });
 });

apps/trading-e2e/src/integration/markets-proposed.cy.ts

@@ -1,16 +1,16 @@
-import { aliasGQLQuery, checkSorting } from '@vegaprotocol/cypress';
-import type { ProposalsListQuery } from '@vegaprotocol/proposals';
+import { checkSorting } from '@vegaprotocol/cypress';
 
 const rowSelector =
   '[data-testid="tab-proposed-markets"] .ag-center-cols-container .ag-row';
-const colMarketId = '[col-id="market"]';
 
 describe('markets proposed table', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-    cy.get('[data-testid="Proposed markets"]').click();
+  beforeEach(() => {
+    cy.clearLocalStorage().then(() => {
+      cy.mockTradingPage();
+      cy.mockSubscription();
+      cy.visit('/#/markets/all');
+      cy.get('[data-testid="Proposed markets"]').click();
+    });
   });
 
   it('can see table headers', () => {
@@ -35,7 +35,10 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
 
   it('renders markets correctly', () => {
     // 6001-MARK-049
-    cy.get(rowSelector).first().find(colMarketId).should('have.text', 'ETHUSD');
+    cy.get(rowSelector)
+      .first()
+      .find('[col-id="market"]')
+      .should('have.text', 'ETHUSD');
 
     //  6001-MARK-050
     cy.get(rowSelector)
@@ -116,7 +119,6 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
       );
   });
   it('proposed markets tab should be sorted properly', () => {
-    // 6001-MARK-062
     cy.get('[data-testid="Proposed markets"]').click({ force: true });
     const marketColDefault = [
       'ETHUSD',
@@ -194,31 +196,4 @@ describe('markets proposed table', { tags: '@smoke' }, () => {
     ];
     checkSorting('state', stateColDefault, stateColAsc, stateColDesc);
   });
-
-  it('can drag and drop columns', () => {
-    // 6001-MARK-063
-    cy.get(colMarketId).realMouseDown().realMouseMove(700, 15).realMouseUp();
-    cy.get(colMarketId).should(($element) => {
-      const attributeValue = $element.attr('aria-colindex');
-      expect(attributeValue).not.to.equal('1');
-    });
-  });
-});
-
-describe('no markets proposed', { tags: '@smoke', testIsolation: true }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    const proposal: ProposalsListQuery = {};
-    cy.mockGQL((req) => {
-      aliasGQLQuery(req, 'ProposalsList', proposal);
-    });
-    cy.mockSubscription();
-    cy.visit('/#/markets/all');
-    cy.get('[data-testid="Proposed markets"]').click();
-  });
-
-  it('can see no markets message', () => {
-    // 6001-MARK-061
-    cy.getByTestId('tab-proposed-markets').should('contain.text', 'No markets');
-  });
 });

apps/trading-e2e/src/integration/order-book.cy.ts

@@ -1,102 +0,0 @@
-const orderbookTab = 'Orderbook';
-const orderbookTable = 'tab-orderbook';
-const askPrice = 'price-9894585';
-const bidPrice = 'price-9889001';
-const askVolume = 'ask-vol-9894585';
-const bidVolume = 'bid-vol-9889001';
-const askCumulative = 'cumulative-vol-9894585';
-const bidCumulative = 'cumulative-vol-9889001';
-const midPrice = 'middle-mark-price-4612690000';
-const priceResolution = 'resolution';
-const dealTicketPrice = 'order-price';
-const resPrice = 'price-990';
-
-describe('order book', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockTradingPage();
-    cy.mockSubscription();
-    cy.visit('/#/markets/market-0');
-    cy.wait('@Markets');
-  });
-
-  beforeEach(() => {
-    cy.mockTradingPage();
-  });
-
-  it('show order book', () => {
-    // 6003-ORDB-001
-    // 6003-ORDB-002
-    cy.getByTestId(orderbookTab).click();
-    cy.getByTestId(orderbookTable).should('be.visible');
-    cy.getByTestId(orderbookTable).should('not.be.empty');
-  });
-
-  it('show orders prices', () => {
-    // 6003-ORDB-003
-    cy.getByTestId(askPrice).should('have.text', '98.94585');
-    cy.getByTestId(bidPrice).should('have.text', '98.89001');
-  });
-
-  it('show prices volumes', () => {
-    // 6003-ORDB-004
-    cy.getByTestId(askVolume).should('have.text', '1');
-    cy.getByTestId(bidVolume).should('have.text', '1');
-  });
-
-  it('show prices cumulative volumes', () => {
-    // 6003-ORDB-005
-    cy.getByTestId(askCumulative).should('have.text', '39');
-    cy.getByTestId(bidCumulative).should('have.text', '7');
-  });
-
-  it('show mid price', () => {
-    // 6003-ORDB-006
-    cy.getByTestId(midPrice).should('have.text', '46,126.90');
-  });
-
-  it('sort prices descending', () => {
-    // 6003-ORDB-007
-    const prices: number[] = [];
-    cy.getByTestId(orderbookTable).within(() => {
-      cy.get('[data-testid*=price]')
-        .each(($el) => {
-          prices.push(Number($el.text()));
-        })
-        .then(() => {
-          expect(prices).to.deep.equal(prices.sort((a, b) => b - a));
-        });
-    });
-  });
-
-  it('copy price to deal ticket form', () => {
-    // 6003-ORDB-009
-    cy.getByTestId(askPrice).click();
-    cy.getByTestId(dealTicketPrice).should('have.value', '98.94585');
-  });
-
-  it('change price resolution', () => {
-    // 6003-ORDB-008
-    const resolutions = [
-      '0.00000',
-      '0.0000',
-      '0.000',
-      '0.00',
-      '0.0',
-      '0',
-      '10',
-      '100',
-      '1,000',
-      '10,000',
-    ];
-    cy.getByTestId(priceResolution)
-      .find('option')
-      .each(($el, index) => {
-        expect($el.text()).to.equal(resolutions[index]);
-      });
-
-    cy.getByTestId(priceResolution).select('0.0');
-    cy.getByTestId(resPrice).should('have.text', '99.0');
-    cy.getByTestId(askPrice).should('not.exist');
-    cy.getByTestId(bidPrice).should('not.exist');
-  });
-});

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

@@ -20,7 +20,6 @@ describe('accounts', { tags: '@smoke' }, () => {
     // 7001-COLL-006
     // 7001-COLL-007
     // 1003-TRAN-001
-    // 7001-COLL-012
 
     const tradingAccountRowId = '[row-id="t-0"]';
     cy.getByTestId('Collateral').click();
@@ -35,23 +34,28 @@ describe('accounts', { tags: '@smoke' }, () => {
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="used"]')
-      .should('have.text', '1.01' + '1.00%');
+      .should('have.text', '1.010.00%');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="available"]')
-      .should('have.text', '100.00');
+      .should('have.text', '100,000.00');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="total"]')
-      .should('have.text', '101.01');
+      .should('have.text', '100,001.01');
 
     cy.getByTestId('tab-accounts')
       .get(tradingAccountRowId)
       .find('[col-id="accounts-actions"]')
       .should('have.text', '');
 
+    cy.getByTestId('tab-accounts')
+      .get(tradingAccountRowId)
+      .find('[col-id="total"]')
+      .should('have.text', '100,001.01');
+
     cy.getByTestId('tab-accounts')
       .get('[col-id="accounts-actions"]')
       .find('[data-testid="dropdown-menu"]')
@@ -97,7 +101,7 @@ describe('accounts', { tags: '@smoke' }, () => {
       'Liquidity provision fee reward account balance',
       'Market proposer reward account balance',
     ];
-    cy.get('[col-id="asset.symbol"]').contains('tEURO').click();
+    cy.getByTestId('asset').contains('tEURO').click();
     cy.get('[data-testid$="_label"]').should('have.length', 16);
     cy.get('[data-testid$="_label"]').each((element, index) => {
       cy.wrap(element).should('have.text', titles[index]);
@@ -108,8 +112,8 @@ describe('accounts', { tags: '@smoke' }, () => {
 
   it('should open usage breakdown dialog when clicked on used', () => {
     // 7001-COLL-009
-    cy.get('[col-id="used"]').contains('1.01').click();
-    const headers = ['Market', 'Account type', 'Balance', 'Margin health'];
+    cy.getByTestId('breakdown').contains('1.01').click();
+    const headers = ['Market', 'Account type', 'Balance'];
     cy.getByTestId('usage-breakdown').within(($headers) => {
       cy.wrap($headers)
         .get('.ag-header-cell-text')
@@ -128,14 +132,12 @@ describe('accounts', { tags: '@smoke' }, () => {
           cy.wrap(btn).click();
         });
       }
-      cy.contains('Loading...').should('not.exist');
     });
-    // 7001-COLL-010
     it('sorting by asset', () => {
       cy.getByTestId('Collateral').click();
       const marketsSortedDefault = ['tBTC', 'tEURO', 'tDAI', 'tBTC'];
       const marketsSortedAsc = ['tBTC', 'tBTC', 'tDAI', 'tEURO'];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
+      const marketsSortedDesc = ['tEURO', 'tDAI', 'tBTC', 'tBTC'];
       checkSorting(
         'asset.symbol',
         marketsSortedDefault,
@@ -158,8 +160,12 @@ describe('accounts', { tags: '@smoke' }, () => {
         '1,000.00002',
         '1,000.01',
       ];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
-
+      const marketsSortedDesc = [
+        '1,000.01',
+        '1,000.00002',
+        '1,000.00001',
+        '1,000.00',
+      ];
       checkSorting(
         'total',
         marketsSortedDefault,
@@ -170,22 +176,24 @@ describe('accounts', { tags: '@smoke' }, () => {
 
     it('sorting by used', () => {
       cy.getByTestId('Collateral').click();
-      // concat actual value with percentage value
-      // as cypress will pick up the entire cell contes
-      // textContent
       const marketsSortedDefault = [
-        '0.00' + '0.00%',
-        '0.01' + '0.00%',
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
+        '0.000.00%',
+        '0.010.00%',
+        '0.000.00%',
+        '0.000.00%',
       ];
       const marketsSortedAsc = [
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
-        '0.00' + '0.00%',
-        '0.01' + '0.00%',
+        '0.000.00%',
+        '0.000.00%',
+        '0.000.00%',
+        '0.010.00%',
+      ];
+      const marketsSortedDesc = [
+        '0.010.00%',
+        '0.000.00%',
+        '0.000.00%',
+        '0.000.00%',
       ];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
       checkSorting(
         'used',
         marketsSortedDefault,
@@ -194,24 +202,29 @@ describe('accounts', { tags: '@smoke' }, () => {
       );
     });
 
-    it('sorting by available', () => {
+    it('sorting by total', () => {
       cy.getByTestId('Collateral').click();
       const marketsSortedDefault = [
         '1,000.00002',
-        '1,000.00',
+        '1,000.01',
         '1,000.00',
         '1,000.00001',
       ];
       const marketsSortedAsc = [
-        '1,000.00',
         '1,000.00',
         '1,000.00001',
         '1,000.00002',
+        '1,000.01',
+      ];
+      const marketsSortedDesc = [
+        '1,000.01',
+        '1,000.00002',
+        '1,000.00001',
+        '1,000.00',
       ];
-      const marketsSortedDesc = Array.from(marketsSortedAsc).reverse();
 
       checkSorting(
-        'available',
+        'total',
         marketsSortedDefault,
         marketsSortedAsc,
         marketsSortedDesc