Merge remote-tracking branch 'origin/develop' into chore/3667-refactor-docs-links-etc

.github/ISSUE_TEMPLATE/chore.md

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

.github/ISSUE_TEMPLATE/user-story.md

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

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

@@ -1,75 +0,0 @@
-name: After Release
-
-on:
-  release:
-    types: [published]
-
-jobs:
-  after-release:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 30
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (ghcr)
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - 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 }}"
-          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:${{ 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"
-          which ipfs
-          echo IPFS_V0=$(cat ipfs-hash) >> $GITHUB_ENV
-          echo IPFS_V1=$(ipfs cid format -v 1 -b base32 $(cat ipfs-hash)) >> $GITHUB_ENV
-
-      - name: Edit Release
-        uses: irongut/EditRelease@v1.2.0
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          id: ${{ github.event.release.id }}
-          body: |
-
-            ___
-
-            # Deployments
-            * https://explorer.vega.xyz
-            * https://governance.vega.xyz
-
-            # IPFS releases
-            Tye IPFS hash of this release of the Trading app is:
-
-            CIDv0: ${{ env.IPFS_V0 }}
-            CIDv1: ${{ env.IPFS_V1 }}
-
-            You can always access the latest IPFS release by visiting [console.vega.xyz](https://console.vega.xyz).
-
-            You can also access Trading directly from an IPFS gateway.
-            BEWARE: The Trading interface uses [localStorage](https://developer.mozilla.org/en-US/docs/Web/API/Window/localStorage) to remember your settings, such as which tokens you have imported. You should always use an IPFS gateway that enforces [origin separation](https://ipfs.github.io/public-gateway-checker/).
-
-            Your settings are not remembered across different URLs.
-
-            IPFS gateways:
-
-            https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
-            https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
-            ipfs://${{ env.IPFS_V0 }}/

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

@@ -5,7 +5,6 @@ on:
     branches:
       - release/*
       - develop
-      - main
     tags:
       - v*
   pull_request:
@@ -99,37 +98,36 @@ jobs:
       # See affected apps
       - name: See affected apps
         run: |
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
-
           echo ">>>> debug"
           echo "NX_BASE: ${{ env.NX_BASE }}"
           echo "NX_HEAD: ${{ env.NX_HEAD }}"
-          echo "Affected: ${affected}"
-          echo "Branch slug: ${branch_slug}"
           echo ">>>> eof debug"
 
+          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
+
+          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
           projects_e2e=""
           preview_governance="not deployed"
           preview_trading="not deployed"
           preview_explorer="not deployed"
-          if [[ $affected == *"governance"* ]]; then
-            projects_e2e+='"governance-e2e" '
-            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-          fi
-          if [[ $affected == *"trading"* ]]; then
-            projects_e2e+='"trading-e2e" '
-            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-          fi
-          if [[ $affected == *"explorer"* ]]; then
-            projects_e2e+='"explorer-e2e" '
-            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          fi
           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")
+          else
+            if [[ $affected == *"governance"* ]]; then
+              projects_e2e+='"governance-e2e" '
+              preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+            fi
+            if [[ $affected == *"trading"* ]]; then
+              projects_e2e+='"trading-e2e" '
+              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+            fi
+            if [[ $affected == *"explorer"* ]]; then
+              projects_e2e+='"explorer-e2e" '
+              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+            fi
           fi
           projects_e2e=${projects_e2e%?}
           projects_e2e=[${projects_e2e// /,}]
@@ -171,7 +169,6 @@ jobs:
       - publish-dist
       - lint-test-build
     if: ${{ github.event_name == 'pull_request' }}
-    timeout-minutes: 60
     name: '(CD) comment preview links'
     steps:
       - name: Find Comment
@@ -181,29 +178,6 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Previews
 
-      - name: Wait for deployments
-        run: |
-          # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
-          regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
-          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
-              echo "waiting for governance preview"
-              sleep 5
-            done
-          fi
-          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
-              echo "waiting for explorer preview"
-              sleep 5
-            done
-          fi
-          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
-              echo "waiting for trading preview"
-              sleep 5
-            done
-          fi
-
       - name: Create comment
         uses: peter-evans/create-or-update-comment@v3
         if: ${{ steps.fc.outputs.comment-id == 0 }}
@@ -215,9 +189,15 @@ jobs:
             * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
             * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
 
-  # Report single result at the end, to avoid mess with required checks in PR
   cypress-check:
     name: '(CI) cypress - check'
+    runs-on: ubuntu-latest
+    needs: cypress
+    steps:
+      - run: echo Done!
+
+  # Report single result at the end, to avoid mess with required checks in PR
+  cypress-result:
     if: ${{ always() }}
     needs: cypress
     runs-on: ubuntu-22.04

.github/workflows/cypress-run.yml

@@ -20,7 +20,7 @@ jobs:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
     runs-on: self-hosted-runner
-    timeout-minutes: 60
+    timeout-minutes: 40
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag
@@ -98,4 +98,4 @@ jobs:
         if: ${{ failure() }}
         with:
           name: test-report-${{ matrix.project }}
-          path: frontend-monorepo/apps/${{ matrix.project }}/cypress/reports
+          path: frontend-monorepo/apps/trading-e2e/cypress/reports

.github/workflows/process-tranches.yml

@@ -0,0 +1,32 @@
+name: Generate tranches
+
+on:
+  schedule:
+    - cron: '0 */6 * * *'
+
+jobs:
+  master:
+    name: Generate Queries
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          fetch-depth: 0
+      - name: Use Node.js 16
+        id: Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.15.1
+      - name: Install root dependencies
+        run: yarn install
+      - name: Generate queries
+        run: node ./scripts/get-tranches.js
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: 'chore: update tranches'
+          commit_options: '--no-verify --signoff'
+          skip_fetch: true
+          skip_checkout: true

.github/workflows/publish-dist.yml

@@ -59,39 +59,24 @@ jobs:
           key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
 
       # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Define dist variables
-        if: ${{ github.event_name == 'push' }}
+      - name: Define variables
         run: |
           envName=''
-          domain="vega.rocks"
-          bucketName=''
-
-          if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-            envName="stagnet1"
-          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
-            domain="vega.xyz"
-            bucketName="${{ matrix.app }}.${domain}"
-          elif [[ "${envName}" = "testnet" ]]; then
-            domain="fairground.wtf"
-            bucketName="${{ matrix.app }}.${domain}"
-          fi
-
-          if [[ -z "${bucketName}" ]]; then
+          if [[ "${{ github.event_name }}" = "push" ]]; then
+            domain="vega.rocks"
+            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
+              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
+                domain="vega.community"
+              fi
+            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+              envName="stagnet1"
+            elif [[ "${{ matrix.app}}" = "trading" ]] && [[ ${{ startsWith(github.ref, 'refs/tags/v') && 'true' || 'false' }} = "true" ]]; then
+              envName="mainnet"
+            fi
             bucketName="${{ matrix.app }}.${envName}.${domain}"
+            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
           fi
-
-          echo "bucket name: ${bucketName}"
-          echo "env name: ${envName}"
-
-          echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
           echo ENV_NAME=${envName} >> $GITHUB_ENV
 
       - name: Build local dist
@@ -168,7 +153,7 @@ jobs:
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') && ( matrix.app != 'trading' || (matrix.app == 'trading' && !endsWith(github.ref, 'main') ) ) }}
+        if: ${{ github.event_name == 'push' && !startsWith(github.ref, 'refs/tags/v') }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -185,6 +170,12 @@ jobs:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
 
+      - name: Add ipfs hash to release
+        uses: softprops/action-gh-release@v1
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
+        with:
+          files: ${{ matrix.app }}-ipfs-hash
+
       - name: Trigger fleek deployment
         if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         run: |
@@ -200,16 +191,15 @@ jobs:
             -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
             https://api.fleek.co/graphql
 
-      - name: Check out ipfs-redirect
+      - name: Checkout vega.xyz
         if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         uses: actions/checkout@v3
         with:
-          repository: 'vegaprotocol/ipfs-redirect'
-          path: 'ipfs-redirect'
-          fetch-depth: '0'
+          repository: vegaprotocol/vega.xyz
+          path: './vega-xyz'
           token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
 
-      - name: Update console.vega.xyz DNS to redirect to the new console
+      - name: Update hash on interstitial page
         if: ${{ matrix.app == 'trading' && github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') }}
         env:
           GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
@@ -219,54 +209,19 @@ jobs:
           export PATH="$PATH:$PWD/kubo"
           which ipfs
           new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
+          cd vega-xyz
+          ./interstital-allow-update.sh ${new_hash}
+          git config --global user.email "vega-ci-bot@vega.xyz"
+          git config --global user.name "vega-ci-bot"
+          git add interstitial-allow.json netlify.toml
+          commit_msg="feat(ci): Update CID for console release @ ${{ github.ref }}"
+          git commit -m "${commit_msg}"
+          git push origin main
 
-          ls -al ipfs-redirect
-
-          echo $new_hash > ipfs-redirect/cidv0.txt
-          echo $new_cid > ipfs-redirect/cidv1.txt
-
-          (
-            cd ipfs-redirect
-
-            git status
-            cat .git/config
-            git config --global user.email "vega-ci-bot@vega.xyz"
-            git config --global user.name "vega-ci-bot"
-
-            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 "$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}
+          # branch_name=${{ github.ref_name }}-hash-update
+          # git checkout -b "${branch_name}"
+          # git add interstitial-allow.json netlify.toml
+          # git push -u origin "${branch_name}"
+          # pr_url="$(gh pr create --title "${commit_msg}" --body 'update ipfs hash for console @ ${{ github.ref }}')"
+          # echo $pr_url
+          # gh pr merge --admin --auto $pr_url

.github/workflows/rollback-console.yml

@@ -1,84 +0,0 @@
-name: 'Rollback console'
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: 'Version that should be set on rollback'
-        required: true
-        type: string
-
-jobs:
-  rollback:
-    runs-on: ubuntu-22.04
-    timeout-minutes: 10
-    steps:
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Log in to the Container registry (docker hub)
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Retag mainnet
-        run: |
-          docker pull vegaprotocol/trading:${{ inputs.version }}
-          docker tag vegaprotocol/trading:${{ inputs.version }} vegaprotocol/trading:mainnet
-          docker push vegaprotocol/trading:mainnet
-          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
-
-      - name: Trigger fleek deployment
-        run: |
-          # 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 -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
-        uses: actions/checkout@v3
-        with:
-          repository: 'vegaprotocol/ipfs-redirect'
-          path: 'ipfs-redirect'
-          fetch-depth: '0'
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-
-      - name: Update console.vega.xyz DNS to redirect to the new console
-        env:
-          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-        run: |
-          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
-          tar -xzf kubo.tgz
-          export PATH="$PATH:$PWD/kubo"
-          which ipfs
-          new_hash=$(cat ipfs-hash)
-          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
-          git config --global user.email "vega-ci-bot@vega.xyz"
-          git config --global user.name "vega-ci-bot"
-          echo $new_hash > ipfs-redirect/cidv0.txt
-          echo $new_cid > ipfs-redirect/cidv1.txt
-
-          (
-            cd ipfs-redirect
-
-            git status
-            branch_name="rollback-to-$new_hash"
-            git checkout -b "$branch_name"
-            commit_msg="hash rollback to $new_hash"
-            git add cidv0.txt cidv1.txt
-            git commit -m "$commit_msg"
-            git push -u origin "$branch_name" --force-with-lease
-            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
-          )

.gitignore

@@ -49,4 +49,4 @@ cypress.env.json
 .next
 
 #cypress
-/apps/**/cypress/reports/
+/apps/trading-e2e/cypress/reports/

apps/explorer-e2e/cypress.config.js

@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',
 
   e2e: {
     setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },

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

@@ -15,6 +15,5 @@
 
 import '@vegaprotocol/cypress';
 import './common.functions.js';
-import 'cypress-mochawesome-reporter/register';
 import registerCypressGrep from '@cypress/grep';
 registerCypressGrep();

apps/explorer/.env

@@ -3,18 +3,17 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-NX_VEGA_TOKEN_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
+NX_VEGA_TOKEN_URL=https://stagnet1.governance.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-NX_VEGA_GOVERNANCE_URL=https://governance.stagnet1.vega.rocks
+NX_VEGA_GOVERNANCE_URL=https://stagnet1.governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.jsoo
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.mainnet

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

apps/explorer/.env.testnet

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

apps/explorer/.env.validator-testnet

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

apps/explorer/src/app/app.tsx

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

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

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

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

@@ -1,8 +1,8 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import type { MarketInfoWithData } from '@vegaprotocol/market-info';
+import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
+import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
 import {
-  LiquidityInfoPanel,
-  LiquidityMonitoringParametersInfoPanel,
   InstrumentInfoPanel,
   KeyDetailsInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -12,18 +12,20 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-} from '@vegaprotocol/markets';
-import { MarketInfoTable } from '@vegaprotocol/markets';
+} from '@vegaprotocol/market-info';
+import { MarketInfoTable } from '@vegaprotocol/market-info';
 import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';
 
 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   if (!market) return null;
 
-  const settlementData = market.tradableInstrument.instrument.product
-    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
-  const terminationData = market.tradableInstrument.instrument.product
-    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+  const settlementData =
+    market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+      .data;
+  const terminationData =
+    market.tradableInstrument.instrument.product
+      .dataSourceSpecForTradingTermination.data;
 
   const getSigners = (data: DataSourceDefinition) => {
     if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {

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

@@ -1,4 +1,4 @@
-import type { MarketFieldsFragment } from '@vegaprotocol/markets';
+import type { MarketFieldsFragment } from '@vegaprotocol/market-list';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
@@ -84,17 +84,15 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
       <AgGridColumn
         colId="asset"
         headerName={t('Settlement asset')}
-        field="tradableInstrument.instrument.product.settlementAsset.symbol"
+        field="tradableInstrument.instrument.product.settlementAsset"
         hide={window.innerWidth <= BREAKPOINT_MD}
         cellRenderer={({
-          data,
+          value,
         }: VegaICellRendererParams<
           MarketFieldsFragment,
-          'tradableInstrument.instrument.product.settlementAsset.symbol'
-        >) => {
-          const value =
-            data?.tradableInstrument.instrument.product.settlementAsset;
-          return value ? (
+          'tradableInstrument.instrument.product.settlementAsset'
+        >) =>
+          value ? (
             <ButtonLink
               onClick={(e) => {
                 openAssetDetailsDialog(value.id, e.target as HTMLElement);
@@ -104,8 +102,8 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
             </ButtonLink>
           ) : (
             ''
-          );
-        }}
+          )
+        }
       />
       <AgGridColumn
         flex={2}

apps/explorer/src/app/components/txs/details/tx-proposal.spec.tsx

@@ -1,56 +0,0 @@
-import type { Proposal } from './tx-proposal';
-import { proposalRequiresSignatureBundle } from './tx-proposal';
-
-describe('proposalRequiresSignatureBundle', () => {
-  it('should return false for freeform proposals, which do not require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newFreeform: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
-  });
-
-  it('should return false for newMarket proposals, which do not require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newMarket: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(false);
-  });
-
-  it('should return true for newAsset proposals, which do require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        newAsset: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
-  });
-
-  it('should return true for updateAsset proposals, which do require a signature bundle to enact', () => {
-    const mock = {
-      terms: {
-        updateAsset: {},
-      },
-    };
-
-    expect(proposalRequiresSignatureBundle(mock)).toEqual(true);
-  });
-
-  it('should return false when bad data is supplied', () => {
-    expect(
-      proposalRequiresSignatureBundle(false as unknown as Proposal)
-    ).toEqual(false);
-    expect(
-      proposalRequiresSignatureBundle(undefined as unknown as Proposal)
-    ).toEqual(false);
-    expect(
-      proposalRequiresSignatureBundle({ test: false } as unknown as Proposal)
-    ).toEqual(false);
-  });
-});

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

@@ -28,16 +28,11 @@ interface TxProposalProps {
  * @returns boolean True if a signature bundle is required. Used to fetch a signature bundle
  */
 export function proposalRequiresSignatureBundle(proposal?: Proposal): boolean {
-  const proposalsThatRequireBundles = ['newAsset', 'updateAsset'];
-
   if (!proposal?.terms) {
     return false;
   }
-
-  return (
-    proposalsThatRequireBundles.filter((requiredIfExists) =>
-      has(proposal.terms, requiredIfExists)
-    ).length > 0
+  return !!['newAsset', 'updateAsset'].filter((requiredIfExists) =>
+    has(proposal.terms, requiredIfExists)
   );
 }
 
@@ -86,7 +81,6 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
 
   const tx = proposal.terms?.newAsset || proposal.terms?.updateAsset;
 
-  // This component is not rendered if no bundle is required
   const SignatureBundleComponent = proposal.terms?.newAsset
     ? ProposalSignatureBundleNewAsset
     : ProposalSignatureBundleUpdateAsset;

apps/explorer/src/app/routes/markets/market-page.tsx

@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 import compact from 'lodash/compact';
 import { JsonViewerDialog } from '../../components/dialogs/json-viewer-dialog';
-import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
+import { marketInfoWithDataProvider } from '@vegaprotocol/market-info';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
 export const MarketPage = () => {

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

@@ -1,6 +1,6 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/markets';
+import { marketsProvider } from '@vegaprotocol/market-list';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';

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

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

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

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

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

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

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

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

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

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

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

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

apps/explorer/src/styles.css

@@ -32,9 +32,9 @@
   line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
 }
 
-.vega-ag-grid .ag-row,
-.vega-ag-grid .ag-cell {
-  border-width: 0;
+.vega-ag-grid .ag-row {
+  border-width: 1px 0;
+  border-bottom: 1px solid transparent;
 }
 
 /* Light variables */
@@ -46,6 +46,7 @@
   --ag-header-column-separator-color: theme(colors.neutral[300]);
   --ag-row-border-color: theme(colors.white);
   --ag-row-hover-color: theme(colors.neutral[100]);
+  --ag-font-size: 12px;
 }
 
 /* Dark variables */
@@ -57,6 +58,7 @@
   --ag-header-column-separator-color: theme(colors.neutral[600]);
   --ag-row-border-color: theme(colors.black);
   --ag-row-hover-color: theme(colors.neutral[800]);
+  --ag-font-size: 12px;
 }
 
 .voteicon svg {

apps/governance-e2e/.env

@@ -17,7 +17,6 @@ NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance-e2e/cypress.config.js

@@ -1,11 +1,10 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  reporter: '../../node_modules/cypress-mochawesome-reporter',
+  projectId: 'et4snf',
 
   e2e: {
     setupNodeEvents(on, config) {
-      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },

apps/governance-e2e/src/fixtures/proposals/new-market-raw.json

@@ -1,113 +0,0 @@
-{
-  "rationale": {
-    "title": "New Market Proposal E2E submission",
-    "description": "E2E new market proposal"
-  },
-  "terms": {
-    "newMarket": {
-      "changes": {
-        "decimalPlaces": "5",
-        "positionDecimalPlaces": "5",
-        "linearSlippageFactor": "0.001",
-        "quadraticSlippageFactor": "0",
-        "lpPriceRange": "10",
-        "instrument": {
-          "name": "Token test market",
-          "code": "TEST.24h",
-          "future": {
-            "settlementAsset": "73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0",
-            "quoteName": "fBTC",
-            "dataSourceSpecForSettlementData": {
-              "external": {
-                "oracle": {
-                  "signers": [
-                    {
-                      "pubKey": {
-                        "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                      }
-                    }
-                  ],
-                  "filters": [
-                    {
-                      "key": {
-                        "name": "prices.ETH.value",
-                        "type": "TYPE_INTEGER",
-                        "numberDecimalPlaces": "0"
-                      },
-                      "conditions": [
-                        {
-                          "operator": "OPERATOR_GREATER_THAN",
-                          "value": "0"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            },
-            "dataSourceSpecForTradingTermination": {
-              "external": {
-                "oracle": {
-                  "signers": [
-                    {
-                      "pubKey": {
-                        "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
-                      }
-                    }
-                  ],
-                  "filters": [
-                    {
-                      "key": {
-                        "name": "trading.terminated.ETH5",
-                        "type": "TYPE_BOOLEAN"
-                      },
-                      "conditions": [
-                        {
-                          "operator": "OPERATOR_EQUALS",
-                          "value": "true"
-                        }
-                      ]
-                    }
-                  ]
-                }
-              }
-            },
-            "dataSourceSpecBinding": {
-              "settlementDataProperty": "prices.ETH.value",
-              "tradingTerminationProperty": "trading.terminated.ETH5"
-            }
-          }
-        },
-        "metadata": ["sector:energy", "sector:tech", "source:docs.vega.xyz"],
-        "priceMonitoringParameters": {
-          "triggers": [
-            {
-              "horizon": "43200",
-              "probability": "0.9999999",
-              "auctionExtension": "600"
-            }
-          ]
-        },
-        "liquidityMonitoringParameters": {
-          "targetStakeParameters": {
-            "timeWindow": "3600",
-            "scalingFactor": 10
-          },
-          "triggeringRatio": "0.7",
-          "auctionExtension": "1"
-        },
-        "logNormal": {
-          "tau": 0.0001140771161,
-          "riskAversionParameter": 0.01,
-          "params": {
-            "mu": 0,
-            "r": 0.016,
-            "sigma": 0.5
-          }
-        }
-      }
-    },
-    "closingTimestamp": 0,
-    "enactmentTimestamp": 0
-  }
-}

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

@@ -7,12 +7,17 @@ import {
 import {
   createRawProposal,
   createTenDigitUnixTimeStampForSpecifiedDays,
+  enterUniqueFreeFormProposalBody,
   generateFreeFormProposalTitle,
   getDateFormatForSpecifiedDays,
-  getProposalFromTitle,
+  getProposalIdFromList,
   getProposalInformationFromTable,
-  submitUniqueRawProposal,
+  getSubmittedProposalFromProposalList,
+  goToMakeNewProposal,
+  governanceProposalType,
   voteForProposal,
+  waitForProposalSubmitted,
+  waitForProposalSync,
 } from '../../../../governance-e2e/src/support/governance.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../../../governance-e2e/src/support/staking.functions';
 import { ethereumWalletConnect } from '../../../../governance-e2e/src/support/wallet-eth.functions';
@@ -33,9 +38,6 @@ 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';
 
 describe(
   'Governance flow for proposal details',
@@ -60,61 +62,61 @@ describe(
 
     // 3001-VOTE-050 3001-VOTE-054 3001-VOTE-055 3002-PROP-019
     it('Newly created raw proposal details - shows proposal title and full description', function () {
-      const proposalDescription =
-        'I propose that everyone evaluate the following IPFS document and vote Yes if they agree. bafybeigwwctpv37xdcwacqxvekr6e4kaemqsrv34em6glkbiceo3fcy4si';
-
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        cy.get(openProposals).within(() => {
-          getProposalFromTitle(rawProposal.rationale.title).within(() => {
-            cy.get(viewProposalButton).should('be.visible').click();
+        getProposalIdFromList(rawProposal.rationale.title);
+        cy.get('@proposalIdText').then((proposalId) => {
+          cy.get(openProposals).within(() => {
+            cy.get(`#${proposalId}`).within(() => {
+              cy.get(viewProposalButton).should('be.visible').click();
+            });
           });
         });
-        cy.get(proposalDetailsTitle).should(
-          'contain.text',
-          rawProposal.rationale.title
-        );
-        cy.getByTestId(proposalDescriptionToggle).click();
-        cy.getByTestId('proposal-description-toggle');
+        cy.get(proposalDetailsTitle)
+          .should('contain', rawProposal.rationale.title)
+          .and('be.visible');
         cy.get(proposalDetailsDescription)
-          .find('p')
-          .should('have.text', proposalDescription);
+          .should('contain', rawProposal.rationale.description)
+          .and('be.visible');
       });
-      cy.getByTestId(proposalTermsToggle).click();
       // 3001-VOTE-052
       cy.get('code.language-json')
         .should('exist')
         .within(() => {
-          cy.get('.hljs-attr').eq(0).should('have.text', '"id"');
+          cy.get('.hljs-string').eq(0).should('have.text', '"ProposalTerms"');
         });
     });
 
     // 3001-VOTE-043
     it('Newly created freeform proposal details - shows proposed and closing dates', function () {
+      const closingVoteHrs = '72';
       const proposalTitle = generateFreeFormProposalTitle();
       const proposalTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-      // const currentDate = new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
-      // const proposedDate = new Date(currentDate.getTime() + 60000)
 
-      submitUniqueRawProposal({
-        proposalTitle: proposalTitle,
-        closingTimestamp: proposalTimeStamp,
-      });
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody(closingVoteHrs, proposalTitle);
+      waitForProposalSubmitted();
+      waitForProposalSync();
       navigateTo(navigation.proposals);
-      getProposalFromTitle(proposalTitle).within(() =>
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
         cy.get(viewProposalButton).click()
       );
       cy.wrap(
         formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
       ).then((closingDate) => {
-        getProposalInformationFromTable('Closes on').should(
-          'have.text',
-          closingDate
-        );
+        getProposalInformationFromTable('Closes on')
+          .contains(closingDate)
+          .should('be.visible');
+      });
+      cy.wrap(
+        formatDateWithLocalTimezone(
+          new Date(createTenDigitUnixTimeStampForSpecifiedDays(0) * 1000)
+        )
+      ).then((proposalDate) => {
+        getProposalInformationFromTable('Proposed on')
+          .contains(proposalDate)
+          .should('be.visible');
       });
-      getProposalInformationFromTable('Proposed on')
-        .invoke('text')
-        .should('not.be.empty');
     });
 
     it('Newly created proposal details - shows default status set to fail', function () {
@@ -123,14 +125,13 @@ describe(
       // 3001-VOTE-067
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
       });
       cy.contains('Participation: Not Met 0.00 0.00%(0.00% Required)').should(
         'be.visible'
       );
-      cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Expected to pass')
         .contains('👎')
         .should('be.visible');
@@ -150,9 +151,9 @@ describe(
     it('Newly created proposal details - ability to vote for and against proposal - with minimum required tokens associated', function () {
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
       });
       // 3001-VOTE-080
       cy.getByTestId('vote-buttons').contains('against').should('be.visible');
@@ -178,7 +179,6 @@ describe(
       cy.get(proposalVoteProgressAgainstTokens)
         .contains('0.00')
         .and('be.visible');
-      cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Tokens for proposal')
         .should('have.text', (1).toFixed(2))
         .and('be.visible');
@@ -220,15 +220,14 @@ describe(
       vegaWalletSetSpecifiedApprovalAmount('1000');
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
       });
       voteForProposal('for');
       // 3001-VOTE-079
       cy.contains('You voted: For').should('be.visible');
       cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
-      cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Total Supply')
         .invoke('text')
         .then((totalSupply) => {
@@ -236,15 +235,14 @@ describe(
             (Number(totalSupply.replace(/,/g, '')) * 0.001) /
             100
           ).toFixed(2);
-          ethereumWalletConnect();
           ensureSpecifiedUnstakedTokensAreAssociated(
             tokensRequiredToAchieveResult
           );
           navigateTo(navigation.proposals);
           cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-            getProposalFromTitle(rawProposal.rationale.title).within(() =>
-              cy.get(viewProposalButton).click()
-            );
+            getSubmittedProposalFromProposalList(
+              rawProposal.rationale.title
+            ).within(() => cy.get(viewProposalButton).click());
           });
           cy.get(proposalVoteProgressForPercentage)
             .contains('100.00%')
@@ -261,7 +259,6 @@ describe(
           cy.get(proposalVoteProgressAgainstTokens)
             .contains('0.00')
             .and('be.visible');
-          cy.getByTestId(voteBreakdownToggle).click();
           getProposalInformationFromTable('Total tokens voted percentage')
             .should('have.text', '0.00%')
             .and('be.visible');

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

@@ -58,12 +58,14 @@ context(
           .parentsUntil(proposalListItem)
           .last()
           .within(() => {
-            cy.get(proposalStatus).should('have.text', 'Enacted');
+            cy.get(proposalStatus).should('have.text', 'Enacted ');
             cy.get(viewProposalButton).click();
           });
       });
       cy.getByTestId('proposal-type').should('have.text', 'New market');
-      cy.get(proposalStatus).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State')
+        .contains('Enacted')
+        .and('be.visible');
       cy.get(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
@@ -85,10 +87,16 @@ context(
           .last()
           .within(() => cy.get(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
       voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Passed');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State') // 3001-VOTE-047
+        .contains('Passed', proposalTimeout)
+        .and('be.visible');
+      getProposalInformationFromTable('State')
+        .contains('Enacted', proposalTimeout)
+        .and('be.visible');
       cy.get(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
@@ -113,9 +121,13 @@ context(
           .last()
           .within(() => cy.get(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
       voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      getProposalInformationFromTable('State')
+        .contains('Enacted', proposalTimeout)
+        .and('be.visible');
     });
 
     // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -132,8 +144,12 @@ context(
           .last()
           .within(() => cy.get(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Declined');
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
+      getProposalInformationFromTable('State') // 3001-VOTE-047
+        .contains('Declined', proposalTimeout)
+        .and('be.visible');
       getProposalInformationFromTable('Rejection reason')
         .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
         .and('be.visible');

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

@@ -5,11 +5,10 @@ import {
   enterRawProposalBody,
   enterUniqueFreeFormProposalBody,
   generateFreeFormProposalTitle,
-  getProposalFromTitle,
   getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
   goToMakeNewProposal,
   governanceProposalType,
-  submitUniqueRawProposal,
   voteForProposal,
   waitForProposalSubmitted,
   waitForProposalSync,
@@ -82,6 +81,7 @@ context(
       });
 
       vegaWalletSetSpecifiedApprovalAmount('1000');
+      cy.associateTokensToVegaWallet('1');
     });
 
     beforeEach('visit governance tab', function () {
@@ -95,8 +95,7 @@ context(
       navigateTo(navigation.proposals);
     });
 
-    // Test can only pass if run before other proposal tests.
-    it.skip('Should be able to see that no proposals exist', function () {
+    it('Should be able to see that no proposals exist', function () {
       // 3001-VOTE-003
       cy.get(noOpenProposals)
         .should('be.visible')
@@ -108,7 +107,7 @@ context(
 
     // 3002-PROP-002
     // 3002-PROP-003
-    it('Proposal form - shows how many vega tokens are required to make a proposal', function () {
+    it('Submit a proposal form - shows how many vega tokens are required to make a proposal', function () {
       // 3002-PROP-005
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
       cy.contains(
@@ -116,9 +115,8 @@ context(
       ).should('be.visible');
     });
 
-    // Skipping as currently unable to propose using forms other than raw
     // 3002-PROP-011
-    it.skip('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
+    it('Able to submit a valid freeform proposal - with minimum required tokens associated', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       cy.get(minVoteButton).should('be.visible'); // 3002-PROP-008
       cy.get(maxVoteButton).should('be.visible');
@@ -142,13 +140,16 @@ context(
       closeStakingDialog();
 
       cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
-      createRawProposal();
+
+      navigateTo(navigation.proposals);
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', generateFreeFormProposalTitle());
+      waitForProposalSubmitted();
     });
 
-    it.skip('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
+    it('Creating a proposal - proposal rejected - when closing time sooner than system default', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       enterUniqueFreeFormProposalBody('0.1', generateFreeFormProposalTitle());
-
       cy.contains('Awaiting network confirmation', epochTimeout).should(
         'not.exist'
       );
@@ -157,7 +158,7 @@ context(
         .should('equal', 'Value must be greater than or equal to 1.');
     });
 
-    it.skip('Creating a proposal - proposal rejected - when closing time later than system default', function () {
+    it('Creating a proposal - proposal rejected - when closing time later than system default', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       enterUniqueFreeFormProposalBody(
         '100000',
@@ -184,13 +185,17 @@ context(
       navigateTo(navigation.proposals);
       cy.get(rejectProposalsLink).click();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() => {
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => {
           cy.contains('Rejected').should('be.visible');
           cy.contains('Close time too late').should('be.visible');
           cy.get(viewProposalButton).click();
         });
       });
-      cy.getByTestId('proposal-status').should('have.text', 'Rejected');
+      getProposalInformationFromTable('State')
+        .contains('Rejected')
+        .and('be.visible');
       getProposalInformationFromTable('Rejection reason')
         .contains('PROPOSAL_ERROR_CLOSE_TIME_TOO_LATE')
         .and('be.visible');
@@ -285,19 +290,18 @@ context(
       const proposalTitle = generateFreeFormProposalTitle();
 
       ensureSpecifiedUnstakedTokensAreAssociated('1');
-      submitUniqueRawProposal({ proposalTitle: proposalTitle });
-      ethereumWalletConnect();
+      goToMakeNewProposal(governanceProposalType.FREEFORM);
+      enterUniqueFreeFormProposalBody('50', proposalTitle);
+      waitForProposalSubmitted();
       stakingPageDisassociateTokens('0.0001');
-      cy.get(vegaWallet)
-        .first()
-        .within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
-            'contain',
-            '0.9999'
-          );
-        });
+      cy.get(vegaWallet).within(() => {
+        cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+          'contain',
+          '0.9999'
+        );
+      });
       navigateTo(navigation.proposals);
-      getProposalFromTitle(proposalTitle).within(() =>
+      getSubmittedProposalFromProposalList(proposalTitle).within(() =>
         cy.get(viewProposalButton).click()
       );
       cy.contains('Vote breakdown').should('be.visible', {
@@ -315,9 +319,9 @@ context(
       cy.get('[data-testid="manage-vega-wallet"]:visible').click();
       cy.get('[data-testid="disconnect"]').click();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
-        );
+        getSubmittedProposalFromProposalList(
+          rawProposal.rationale.title
+        ).within(() => cy.get(viewProposalButton).click());
       });
       // 3001-VOTE-075
       // 3001-VOTE-076

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

@@ -8,7 +8,6 @@ import {
 import {
   getProposalInformationFromTable,
   goToMakeNewProposal,
-  governanceProposalType,
   voteForProposal,
   waitForProposalSubmitted,
 } from '../../support/governance.functions';
@@ -57,8 +56,18 @@ const fUSDCId =
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
 
+const governanceProposalType = {
+  NETWORK_PARAMETER: 'Network parameter',
+  NEW_MARKET: 'New market',
+  UPDATE_MARKET: 'Update market',
+  NEW_ASSET: 'New asset',
+  UPDATE_ASSET: 'Update asset',
+  FREEFORM: 'Freeform',
+  RAW: 'raw proposal',
+};
+
 // 3001-VOTE-007
-context.skip(
+context(
   'Governance flow - form validations for different governance proposals',
   { tags: '@slow' },
   function () {

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

@@ -6,15 +6,16 @@ import {
   waitForSpinner,
 } from '../../support/common.functions';
 import {
+  createFreeformProposal,
   createRawProposal,
   createTenDigitUnixTimeStampForSpecifiedDays,
   enterRawProposalBody,
   generateFreeFormProposalTitle,
-  getProposalFromTitle,
+  getProposalIdFromList,
   getProposalInformationFromTable,
+  getSubmittedProposalFromProposalList,
   goToMakeNewProposal,
   governanceProposalType,
-  submitUniqueRawProposal,
   voteForProposal,
   waitForProposalSubmitted,
   waitForProposalSync,
@@ -23,14 +24,10 @@ import { ensureSpecifiedUnstakedTokensAreAssociated } from '../../support/stakin
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-teardown.functions';
 
-const proposalListItem = 'proposals-list-item';
 const openProposals = '[data-testid="open-proposals"]';
-const voteStatus = 'vote-status';
-const proposalType = 'proposal-type';
-const proposalStatus = 'proposal-status';
+const voteStatus = '[data-testid="vote-status"]';
 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 () {
   before('connect wallets and set approval limit', function () {
@@ -63,12 +60,12 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
 
     navigateTo(navigation.proposals);
     cy.get(openProposals).within(() => {
+      cy.get(proposalClosingDate).first().should('contain.text', 'year');
+      cy.get(proposalClosingDate).should('contain.text', 'months');
       cy.get(proposalClosingDate)
-        .first()
+        .last()
         .invoke('text')
         .should('match', /days|minutes/);
-      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate).last().should('contain.text', 'year');
     });
   });
 
@@ -76,27 +73,36 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     const proposerId = Cypress.env('vegaWalletPublicKey');
     const proposalTitle = generateFreeFormProposalTitle();
 
-    submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    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');
-    cy.get('[data-testid="filter-input"]').type('123');
-    cy.getByTestId(proposalListItem).should('not.exist');
+    createFreeformProposal(proposalTitle);
+    getProposalIdFromList(proposalTitle);
+    cy.get('@proposalIdText').then((proposalId) => {
+      cy.get('[data-testid="set-proposals-filter-visible"]').click();
+      cy.get('[data-testid="filter-input"]').type(proposerId);
+      cy.get(`#${proposalId}`).should('contain', proposalId);
+    });
   });
 
   it('Newly created proposals list - shows title and portion of summary', function () {
-    const proposalPath = '/proposals/new-market-raw.json';
-    const enactmentTimestamp = createTenDigitUnixTimeStampForSpecifiedDays(3);
-    submitUniqueRawProposal({
-      proposalBody: proposalPath,
-      enactmentTimestamp: enactmentTimestamp,
-    }); // 3001-VOTE-052
-    // 3001-VOTE-008
-    // 3001-VOTE-034
-    // 3001-VOTE-097
-    cy.contains('New Market Proposal E2E submission');
-    cy.contains('Code: TEST.24h. fBTC settled future.').should('be.visible');
+    createRawProposal(this.minProposerBalance); // 3001-VOTE-052
+    cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+      getProposalIdFromList(rawProposal.rationale.title);
+      cy.get('@proposalIdText').then((proposalId) => {
+        cy.get(openProposals).within(() => {
+          // 3001-VOTE-008
+          // 3001-VOTE-034
+          cy.get(`#${proposalId}`)
+            // 3001-VOTE-097
+            .should('contain', rawProposal.rationale.title)
+            .and('be.visible');
+          cy.get(`#${proposalId}`)
+            .should(
+              'contain',
+              rawProposal.rationale.description.substring(0, 59)
+            )
+            .and('be.visible');
+        });
+      });
+    });
   });
 
   it('Newly created proposals list - shows open proposals in an open state', function () {
@@ -104,11 +110,23 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     // 3001-VOTE-035
     createRawProposal(this.minProposerBalance);
     cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-      getProposalFromTitle(rawProposal.rationale.title).within(() => {
-        cy.get(viewProposalButton).should('be.visible');
-        cy.getByTestId(proposalType).should('have.text', 'Freeform');
-        cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      getSubmittedProposalFromProposalList(rawProposal.rationale.title).within(
+        () => {
+          cy.get(viewProposalButton).should('be.visible').click();
+        }
+      );
+
+      cy.get('@proposalIdText').then((proposalId) => {
+        getProposalInformationFromTable('ID')
+          .contains(String(proposalId))
+          .and('be.visible');
       });
+      getProposalInformationFromTable('State')
+        .contains('Open')
+        .and('be.visible');
+      getProposalInformationFromTable('Type')
+        .contains('Freeform')
+        .and('be.visible');
     });
   });
 
@@ -116,22 +134,18 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
   it('Newly created freeform proposals list - shows proposal participation - both met and not', function () {
     const proposalTitle = generateFreeFormProposalTitle();
 
-    submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    getProposalFromTitle(proposalTitle).within(() => {
+    createFreeformProposal(proposalTitle);
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
       // 3001-VOTE-039
-      cy.getByTestId(voteStatus).should(
-        'have.text',
-        'Participation not reached'
-      );
+      cy.get(voteStatus).should('have.text', 'Participation not reached');
       cy.get(viewProposalButton).click();
     });
     voteForProposal('for');
     navigateTo(navigation.proposals);
-    getProposalFromTitle(proposalTitle).within(() => {
-      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
+    getSubmittedProposalFromProposalList(proposalTitle).within(() => {
+      cy.get(voteStatus).should('have.text', 'Set to pass');
       cy.get(viewProposalButton).click();
     });
-    cy.getByTestId(voteBreakDownToggle).click();
     getProposalInformationFromTable('Token participation met')
       .contains('👍')
       .should('be.visible');

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

@@ -7,6 +7,7 @@ import {
 import {
   clickOnValidatorFromList,
   closeStakingDialog,
+  stakingPageAssociateTokens,
   stakingValidatorPageAddStake,
   waitForBeginningOfEpoch,
 } from '../../support/staking.functions';
@@ -30,17 +31,19 @@ context('rewards - flow', { tags: '@slow' }, function () {
     cy.visit('/');
     waitForSpinner();
     depositAsset(vegaAssetAddress, '1000', 18);
+    cy.validatorsSelfDelegate();
     ethereumWalletConnect();
     cy.connectVegaWallet();
-    vegaWalletTeardown();
-    cy.associateTokensToVegaWallet('6000');
     cy.VegaWalletTopUpRewardsPool(30, 200);
     navigateTo(navigation.validators);
+    vegaWalletTeardown();
+    stakingPageAssociateTokens('6000');
     cy.get(vegaWalletUnstakedBalance, txTimeout).should(
       'contain',
       '6,000.0',
       txTimeout
     );
+    cy.get('button').contains('Select a validator to nominate').click();
     clickOnValidatorFromList(0);
     stakingValidatorPageAddStake('3000');
     closeStakingDialog();

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

@@ -96,7 +96,7 @@ context(
         navigateTo(navigation.validators);
 
         // 2002-SINC-007
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
       it('Able to view validators staked by me', function () {
@@ -146,7 +146,7 @@ context(
         verifyThisEpochValue(2.0);
         closeStakingDialog();
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
       it('Able to stake against a validator - using vega from both wallet and vesting contract', function () {
@@ -166,11 +166,10 @@ context(
         verifyThisEpochValue(6.0);
         closeStakingDialog();
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,006.00', '50.05%');
+        validateValidatorListTotalStakeAndShare('0', '6.00', '100.00%');
       });
 
       it('Able to stake against multiple validators', function () {
-        vegaWalletTeardown();
         stakingPageAssociateTokens('5');
         verifyUnstakedBalance(5.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -198,10 +197,14 @@ context(
           .eq(1)
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
-              .should('have.text', '3,002.00')
+              .should('have.text', '2.00')
               .and('be.visible');
             cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '50.01%')
+              .should('have.text', '66.67%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '2.00')
               .and('be.visible');
           });
         cy.get(`[row-id="${1}"]`)
@@ -209,10 +212,14 @@ context(
           .within(() => {
             cy.getByTestId(stakeValidatorListTotalStake)
               .scrollIntoView()
-              .should('have.text', '3,001.00')
+              .should('have.text', '1.00')
               .and('be.visible');
             cy.getByTestId(stakeValidatorListTotalShare)
-              .should('have.text', '49.99%')
+              .should('have.text', '33.33%')
+              .and('be.visible');
+            cy.getByTestId(stakeValidatorListTotalStake)
+              .scrollIntoView()
+              .should('have.text', '1.00')
               .and('be.visible');
           });
       });
@@ -275,7 +282,7 @@ context(
           txTimeout
         );
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
 
         cy.getByTestId(userStakeBtn).should('not.exist');
         cy.getByTestId(userStake).should('not.exist');
@@ -347,7 +354,7 @@ context(
           txTimeout
         );
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
       });
 
       it('Disassociating all vesting contract tokens max - removes all staked tokens', function () {
@@ -375,7 +382,7 @@ context(
           txTimeout
         );
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,000.00', '50.00%');
+        validateValidatorListTotalStakeAndShare('0', '0.00', '0.00%');
       });
 
       it('Disassociating some tokens - prioritizes unstaked tokens', function () {
@@ -397,7 +404,7 @@ context(
         });
         verifyStakedBalance(2.0);
         navigateTo(navigation.validators);
-        validateValidatorListTotalStakeAndShare('0', '3,002.00', '50.02%');
+        validateValidatorListTotalStakeAndShare('0', '2.00', '100.00%');
       });
 
       it('Associating wallet tokens - when some already staked - auto stakes tokens to staked validator', function () {

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

@@ -24,7 +24,6 @@ const ethWalletContainer = '[data-testid="ethereum-wallet"]';
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
 const vegaWalletUnstakedBalance =
   '[data-testid="vega-wallet-balance-unstaked"]';
-const currencyTitle = '[data-testid="currency-title"]:visible';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
 const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
@@ -80,11 +79,14 @@ context(
         //0005-ETXN-005
         stakingPageAssociateTokens('2', { skipConfirmation: true });
 
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
 
         // 0005-ETXN-002
         verifyEthWalletAssociatedBalance('2.0');
@@ -109,29 +111,31 @@ context(
         // 1004-ASSO-028
         // 1004-ASSO-029
         // 1004-ASSO-031
-        vegaWalletTeardown();
+
         stakingPageAssociateTokens('2');
         verifyEthWalletAssociatedBalance('2.0');
-        verifyEthWalletTotalAssociatedBalance('6,002.00');
+        verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get('button').contains('Select a validator to nominate').click();
         stakingPageDisassociateTokens('2');
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
-        cy.get(
-          '[data-testid="eth-wallet-associated-balances"]:visible',
-          txTimeout
-        ).should('have.length', 2);
-        verifyEthWalletTotalAssociatedBalance('6,000.00');
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
+        cy.getByTestId('eth-wallet-associated-balances', txTimeout).should(
+          'not.exist'
+        );
+        verifyEthWalletTotalAssociatedBalance('0.00');
       });
 
       it('Able to associate more tokens than the approved amount of 1000 - requires re-approval', function () {
         //1004-ASSO-011
         stakingPageAssociateTokens('1001', { approve: true });
         verifyEthWalletAssociatedBalance('1,001.00');
-        verifyEthWalletTotalAssociatedBalance('7,001.00');
+        verifyEthWalletTotalAssociatedBalance('1,001.00');
         cy.get(vegaWallet)
           .last()
           .within(() => {
@@ -220,11 +224,14 @@ context(
           skipConfirmation: true,
         });
 
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get(vegaWallet)
@@ -240,11 +247,14 @@ context(
           type: 'contract',
           skipConfirmation: true,
         });
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '1.00');
         validateWalletCurrency('Total associated after pending', '1.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         verifyEthWalletAssociatedBalance('1.0');
         verifyEthWalletTotalAssociatedBalance('1.0');
       });
@@ -328,11 +338,14 @@ context(
       // 1004-ASSO-004
       it('Pending association outside of app is shown', function () {
         vegaWalletAssociate('2');
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '0.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '2.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         validateWalletCurrency('Associated', '2.00');
       });
 
@@ -341,11 +354,14 @@ context(
         cy.wrap(validateWalletCurrency('Associated', '2.00')).then(() => {
           vegaWalletDisassociate('2');
         });
-        cy.get(currencyTitle, txTimeout).should('have.length.above', 4);
+        cy.getByTestId('currency-title', txTimeout).should(
+          'have.length.above',
+          6
+        );
         validateWalletCurrency('Associated', '2.00');
         validateWalletCurrency('Pending association', '2.00');
         validateWalletCurrency('Total associated after pending', '0.00');
-        cy.get(currencyTitle, txTimeout).should('have.length.at.least', 6);
+        cy.getByTestId('currency-title', txTimeout).should('have.length', 6);
         validateWalletCurrency('Associated', '0.00');
       });
 

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

@@ -15,7 +15,13 @@ const balanceAvailable = 'BALANCE_AVAILABLE_value';
 const withdrawalThreshold = 'WITHDRAWAL_THRESHOLD_value';
 const delayTime = 'DELAY_TIME_value';
 const submitWithdrawalButton = 'submit-withdrawal';
+const dialogTitle = 'dialog-title';
 const dialogClose = 'dialog-close';
+const txExplorerLink = 'tx-block-explorer';
+const withdrawalAssetSymbol = 'withdrawal-asset-symbol';
+const withdrawalAmount = 'withdrawal-amount';
+const withdrawalRecipient = 'withdrawal-recipient';
+const withdrawFundsButton = 'withdraw-funds';
 const completeWithdrawalButton = 'complete-withdrawal';
 const tableTxHash = '[col-id="txHash"]';
 const tableAssetSymbol = '[col-id="asset.symbol"]';
@@ -24,16 +30,14 @@ const tableReceiverAddress = '[col-id="details.receiverAddress"]';
 const tableWithdrawnTimeStamp = '[col-id="withdrawnTimestamp"]';
 const tableWithdrawnStatus = '[col-id="status"]';
 const tableCreatedTimeStamp = '[col-id="createdTimestamp"]';
-const toast = 'toast';
+const toastContent = 'toast-content';
 const toastPanel = 'toast-panel';
-const toastClose = 'toast-close';
-const withdrawalDialogContent = 'dialog-content';
-const toastCompleteWithdrawal = 'toast-complete-withdrawal';
 const usdtName = 'USDC (local)';
 const usdcEthAddress = '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0';
 const usdcSymbol = 'tUSDC';
 const usdtSelectValue =
   '993ed98f4f770d91a796faab1738551193ba45c62341d20597df70fea6704ede';
+const truncatedWithdrawalEthAddress = '0xEe7D…22d94F';
 const formValidationError = 'input-error-text';
 const txTimeout = Cypress.env('txTimeout');
 
@@ -43,8 +47,11 @@ context(
   function () {
     before('visit withdrawals and connect vega wallet', function () {
       cy.visit('/');
-      ethereumWalletConnect();
-      depositAsset(usdcEthAddress, '1000', 5);
+      // When running tests locally, will fail if run without restarting capsule
+      cy.updateCapsuleMultiSig().then(() => {
+        ethereumWalletConnect();
+        depositAsset(usdcEthAddress, '1000', 5);
+      });
     });
 
     beforeEach('Navigate to withdrawal page', function () {
@@ -103,35 +110,29 @@ context(
         cy.getByTestId(amountInput).click().type('120');
         cy.getByTestId(submitWithdrawalButton).click();
       });
+
+      cy.contains('Awaiting network confirmation').should('be.visible');
       // 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();
-        });
+      cy.getByTestId(dialogTitle, txTimeout).should(
+        'have.text',
+        'Transaction complete'
+      );
+      cy.getByTestId(txExplorerLink)
+        .should('have.attr', 'href')
+        .and('contain', '/txs/');
+      cy.getByTestId(withdrawalAssetSymbol).should('have.text', usdcSymbol);
+      cy.getByTestId(withdrawalAmount).should('have.text', '120.00');
+      cy.getByTestId(withdrawalRecipient)
+        .should('have.text', truncatedWithdrawalEthAddress)
+        .and('have.attr', 'href')
+        .and('contain', `/address/${Cypress.env('ethWalletPublicKey')}`);
+      cy.getByTestId(withdrawFundsButton).click();
       // withdrawal complete
-      cy.getByTestId(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');
-        });
+      cy.getByTestId(dialogTitle, txTimeout).should(
+        'have.text',
+        'Withdraw asset complete'
+      );
+      cy.getByTestId(dialogClose).click();
       // withdrawal history for complete withdrawal displayed
       cy.get(tableWithdrawnStatus)
         .eq(1, txTimeout)
@@ -170,17 +171,13 @@ context(
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'Funds unlocked')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 110.00 tUSDC'
-          );
-          cy.getByTestId(toastClose).click();
-        });
+      cy.contains('Awaiting network confirmation').should('be.visible');
+      // assert withdrawal request
+      cy.getByTestId(dialogTitle, txTimeout).should(
+        'have.text',
+        'Transaction complete'
+      );
+      cy.getByTestId(dialogClose).click();
       cy.get(tableTxHash)
         .eq(1)
         .should('have.text', 'Complete withdrawal')
@@ -195,75 +192,28 @@ context(
           cy.get(tableCreatedTimeStamp).should('not.be.empty');
         });
       ethereumWalletConnect();
-      cy.getByTestId(completeWithdrawalButton).first().click();
-      cy.getByTestId(toast)
-        .last(txTimeout)
+      cy.getByTestId(completeWithdrawalButton).click();
+      cy.getByTestId(toastContent)
+        .last()
         .should('contain.text', 'Awaiting confirmation')
         .within(() => {
           cy.getByTestId('external-link').should('exist');
         });
-      cy.getByTestId(toast)
-        .first(txTimeout)
+      cy.getByTestId(toastContent)
+        .first()
         .should('contain.text', 'The withdrawal has been approved.')
         .within(() => {
           cy.getByTestId(toastPanel).should('contain.text', '110.00', 'tUSDC');
         });
-      cy.getByTestId(toast)
-        .last(txTimeout)
+      cy.getByTestId(toastContent)
+        .last()
         .should('contain.text', 'Transaction confirmed')
         .within(() => {
           cy.getByTestId('external-link').should('exist');
         });
     });
 
-    it('Should be able to see withdrawal details from toast', function () {
-      cy.getByTestId(withdraw).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(amountInput).click().type('50');
-        cy.getByTestId(submitWithdrawalButton).click();
-      });
-      cy.getByTestId(toast)
-        .first(txTimeout)
-        .should('contain.text', 'Funds unlocked')
-        .within(() => {
-          cy.getByTestId('external-link').should('exist');
-          cy.getByTestId(toastPanel).should(
-            'contain.text',
-            'Withdraw 50.00 tUSDC'
-          );
-          cy.contains('save your withdrawal details').click();
-        });
-      cy.getByTestId(withdrawalDialogContent)
-        .last()
-        .within(() => {
-          cy.getByTestId('assetSource_value').should(
-            'have.text',
-            '0x1b8a1B6CBE5c93609b46D1829Cc7f3Cb8eeE23a0'
-          );
-          cy.getByTestId('amount_value').should('have.text', '5000000');
-          cy.getByTestId('nonce_value').invoke('text').should('not.be.empty');
-          cy.getByTestId('signatures_value')
-            .invoke('text')
-            .should('not.be.empty');
-          cy.getByTestId('targetAddress_value').should(
-            'have.text',
-            Cypress.env('ethWalletPublicKey')
-          );
-          cy.getByTestId('creation_value')
-            .invoke('text')
-            .should('not.be.empty');
-        });
-      cy.getByTestId(dialogClose).click();
-    });
-
-    // Skipping test due to bug #3882
-    it.skip('Unable to withdraw asset on pub key view', function () {
+    it('Unable to withdraw asset on pub key view', function () {
       const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
       const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 
@@ -277,11 +227,10 @@ context(
         cy.get('select').select(usdtSelectValue, { force: true });
         cy.getByTestId(balanceAvailable, txTimeout).should('exist');
         cy.getByTestId(amountInput).click().type('100');
-        cy.pause();
         cy.getByTestId(submitWithdrawalButton).click();
       });
 
-      cy.getByTestId(withdrawalDialogContent)
+      cy.getByTestId('dialog-content')
         .last()
         .within(() => {
           cy.get('h1').should('have.text', 'Transaction failed');

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

@@ -128,7 +128,6 @@ context(
         .first()
         .find('[data-testid="view-proposal-btn"]')
         .click();
-      cy.url().should('contain', '/protocol-upgrades/v1');
       cy.getByTestId('protocol-upgrade-proposal').within(() => {
         cy.get('h1').should('have.text', 'Vega Release v1');
         cy.getByTestId('protocol-upgrade-block-height').should(

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

@@ -9,7 +9,6 @@ import {
 import {
   enterUniqueFreeFormProposalBody,
   goToMakeNewProposal,
-  governanceProposalType,
 } from '../../support/governance.functions';
 import { vegaWalletFaucetAssetsWithoutCheck } from '../../support/wallet-vega.functions';
 
@@ -51,7 +50,7 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
     const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
 
     navigateTo(navigation.proposals);
-    goToMakeNewProposal(governanceProposalType.FREEFORM);
+    goToMakeNewProposal('Freeform');
     enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
     cy.getByTestId('dialog-content')
       .first()

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

@@ -63,6 +63,7 @@ context(
       });
 
       it('should have option to go to last and newest page', function () {
+        waitForBeginningOfEpoch();
         cy.getByTestId('goto-last-page').click();
         cy.getByTestId('epoch-total-rewards-table')
           .last()

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

@@ -1,12 +1,8 @@
 import { format } from 'date-fns';
-import {
-  closeDialog,
-  navigateTo,
-  navigation,
-  waitForSpinner,
-} from './common.functions';
+import { closeDialog, navigateTo, navigation } from './common.functions';
 import { ensureSpecifiedUnstakedTokensAreAssociated } from './staking.functions';
 
+const newProposalButton = '[data-testid="new-proposal-link"]';
 const proposalInformationTableRows = '[data-testid="key-value-table-row"]';
 const proposalListItem = '[data-testid="proposals-list-item"]';
 const newProposalTitle = '[data-testid="proposal-title"]';
@@ -50,53 +46,6 @@ export function enterRawProposalBody(timestamp: number) {
   });
 }
 
-export function submitUniqueRawProposal(proposalFields: {
-  proposalBody?: string;
-  proposalTitle?: string;
-  proposalDescription?: string;
-  closingTimestamp?: number;
-  enactmentTimestamp?: number;
-  submit?: boolean;
-}) {
-  goToMakeNewProposal(governanceProposalType.RAW);
-  let proposalBodyPath = '/proposals/raw.json';
-  if (proposalFields.proposalBody) {
-    proposalBodyPath = proposalFields.proposalBody;
-  }
-  cy.fixture(proposalBodyPath).then((rawProposal) => {
-    if (proposalFields.proposalTitle) {
-      rawProposal.rationale.title = proposalFields.proposalTitle;
-      cy.wrap(proposalFields.proposalTitle).as('proposalTitle');
-    }
-    if (proposalFields.proposalDescription) {
-      rawProposal.rationale.description = proposalFields.proposalDescription;
-    }
-    if (proposalFields.closingTimestamp) {
-      rawProposal.terms.closingTimestamp = proposalFields.closingTimestamp;
-    } else {
-      const minTimeStamp = createTenDigitUnixTimeStampForSpecifiedDays(2);
-      rawProposal.terms.closingTimestamp = minTimeStamp;
-    }
-    if (proposalFields.enactmentTimestamp) {
-      rawProposal.terms.enactmentTimestamp = proposalFields.enactmentTimestamp;
-    }
-
-    const proposalPayload = JSON.stringify(rawProposal);
-    cy.get(rawProposalData).type(proposalPayload, {
-      parseSpecialCharSequences: false,
-      delay: 2,
-    });
-
-    if (proposalFields.submit !== false) {
-      cy.get(newProposalSubmitButton).should('be.visible').click();
-      cy.wrap(rawProposal).as('rawProposal');
-      waitForProposalSubmitted();
-      waitForProposalSync();
-      navigateTo(navigation.proposals);
-    }
-  });
-}
-
 export function enterUniqueFreeFormProposalBody(
   timestamp: string,
   proposalTitle: string
@@ -109,10 +58,6 @@ export function enterUniqueFreeFormProposalBody(
   cy.getByTestId('proposal-submit').should('be.visible').click();
 }
 
-export function getProposalFromTitle(proposalTitle: string) {
-  return cy.contains(proposalTitle).parentsUntil(proposalListItem).last();
-}
-
 export function getSubmittedProposalFromProposalList(proposalTitle: string) {
   getProposalIdFromList(proposalTitle);
   cy.get('@proposalIdText').then((proposalId) => {
@@ -175,17 +120,13 @@ export function waitForProposalSync() {
   });
 }
 
-export function goToMakeNewProposal(proposalType: governanceProposalType) {
-  cy.visit('/proposals/propose');
-  waitForSpinner();
+export function goToMakeNewProposal(proposalType: string) {
+  navigateTo(navigation.proposals);
+  cy.get(newProposalButton).should('be.visible').click();
   cy.url().should('include', '/proposals/propose');
   cy.get(navigation.pageSpinner, { timeout: 20000 }).should('not.exist');
-  if (proposalType == governanceProposalType.RAW) {
-    cy.get('[href="/proposals/propose/raw"]').click();
-  } else {
-    cy.get('li').should('contain.text', proposalType).and('be.visible');
-    cy.get('li').contains(proposalType).click();
-  }
+  cy.get('li').should('contain.text', proposalType).and('be.visible');
+  cy.get('li').contains(proposalType).click();
 }
 
 export function waitForProposalSubmitted() {
@@ -222,12 +163,11 @@ export function createFreeformProposal(proposalTitle: string) {
   navigateTo(navigation.proposals);
 }
 
-export enum governanceProposalType {
-  NETWORK_PARAMETER = 'Network parameter',
-  NEW_MARKET = 'New market',
-  UPDATE_MARKET = 'Update market',
-  NEW_ASSET = 'New asset',
-  UPDATE_ASSET = 'Update asset',
-  FREEFORM = 'Freeform',
-  RAW = 'raw proposal',
-}
+export const governanceProposalType = {
+  NETWORK_PARAMETER: 'Network parameter',
+  NEW_MARKET: 'New market',
+  UPDATE_MARKET: 'Update market',
+  NEW_ASSET: 'New asset',
+  FREEFORM: 'Freeform',
+  RAW: 'raw proposal',
+};

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

@@ -8,7 +8,6 @@ import './wallet-eth.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';
 import { aliasGQLQuery } from '@vegaprotocol/cypress';
 import { chainIdQuery, statisticsQuery } from '@vegaprotocol/mock';

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

@@ -85,132 +85,6 @@ export function createFreeFormProposalTxBody(): ProposalSubmissionBody {
   };
 }
 
-export function createNewMarketProposalTxBody(): ProposalSubmissionBody {
-  const MIN_CLOSE_SEC = 5;
-  const MIN_ENACT_SEC = 7;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
-  return {
-    proposalSubmission: {
-      rationale: {
-        title: 'New Market Proposal E2E submission',
-        description: 'E2E new market proposal',
-      },
-      terms: {
-        newMarket: {
-          changes: {
-            decimalPlaces: '5',
-            positionDecimalPlaces: '5',
-            linearSlippageFactor: '0.001',
-            quadraticSlippageFactor: '0',
-            lpPriceRange: '10',
-            instrument: {
-              name: 'Token test market',
-              code: 'TEST.24h',
-              future: {
-                settlementAsset:
-                  '73174a6fb1d5802ba0ac7bd7ab79e0a3a4837b262de0a4e80815a55442692bd0',
-                quoteName: 'fBTC',
-                dataSourceSpecForSettlementData: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'prices.ETH.value',
-                            type: 'TYPE_INTEGER' as const,
-                            numberDecimalPlaces: '0',
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_GREATER_THAN' as const,
-                              value: '0',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecForTradingTermination: {
-                  external: {
-                    oracle: {
-                      signers: [
-                        {
-                          pubKey: {
-                            key: '70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680',
-                          },
-                        },
-                      ],
-                      filters: [
-                        {
-                          key: {
-                            name: 'trading.terminated.ETH5',
-                            type: 'TYPE_BOOLEAN' as const,
-                          },
-                          conditions: [
-                            {
-                              operator: 'OPERATOR_EQUALS' as const,
-                              value: 'true',
-                            },
-                          ],
-                        },
-                      ],
-                    },
-                  },
-                },
-                dataSourceSpecBinding: {
-                  settlementDataProperty: 'prices.ETH.value',
-                  tradingTerminationProperty: 'trading.terminated.ETH5',
-                },
-              },
-            },
-            metadata: ['sector:energy', 'sector:tech', 'source:docs.vega.xyz'],
-            priceMonitoringParameters: {
-              triggers: [
-                {
-                  horizon: '43200',
-                  probability: '0.9999999',
-                  auctionExtension: '600',
-                },
-              ],
-            },
-            liquidityMonitoringParameters: {
-              targetStakeParameters: {
-                timeWindow: '3600',
-                scalingFactor: 10,
-              },
-              triggeringRatio: '0.7',
-              auctionExtension: '1',
-            },
-            logNormal: {
-              tau: 0.0001140771161,
-              riskAversionParameter: 0.01,
-              params: {
-                mu: 0,
-                r: 0.016,
-                sigma: 0.5,
-              },
-            },
-          },
-        },
-        closingTimestamp,
-        enactmentTimestamp,
-      },
-    },
-  };
-}
-
 export function mockNetworkUpgradeProposal() {
   cy.mockGQL((req) => {
     aliasGQLQuery(req, 'Nodes', nodeData);

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

@@ -221,7 +221,7 @@ export function ensureSpecifiedUnstakedTokensAreAssociated(
 }
 
 export function closeStakingDialog() {
-  cy.getByTestId('dialog-title', txTimeout).should(
+  cy.getByTestId('dialog-title').should(
     'contain.text',
     'At the beginning of the next epoch'
   );

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

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

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

@@ -67,6 +67,7 @@ export async function faucetAsset(assetEthAddress: string) {
 
 export async function vegaWalletTeardown() {
   cy.get(associatedAmountInWallet)
+    .should('be.visible')
     .invoke('text')
     .then((associatedAmount) => {
       cy.get('body').then(($body) => {
@@ -81,11 +82,9 @@ export async function vegaWalletTeardown() {
       cy.get(vegaWalletContainer).within(() => {
         cy.get(associatedAmountInWallet, {
           timeout: transactionTimeout,
-        })
-          .should('have.length', 1, { timeout: transactionTimeout })
-          .contains('0.00', {
-            timeout: transactionTimeout,
-          });
+        }).contains('0.00', {
+          timeout: transactionTimeout,
+        });
       });
     });
 }

apps/governance/.env

@@ -5,18 +5,16 @@ NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_FAIRGROUND=false
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
-
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/main/announcements.json
 NX_WALLETCONNECT_PROJECT_ID=fe8091dc35738863e509fc4947525c72
-NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance/.env.capsule

@@ -17,7 +17,6 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
-NX_VEGA_REST_URL=http://localhost:3008/api/v2/
 
 #Test configuration variables
 CYPRESS_FAIRGROUND=false

apps/governance/.env.devnet

@@ -11,5 +11,3 @@ NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-devnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n00.devnet1.vega.xyz/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/.env.mainnet

@@ -3,14 +3,12 @@ NX_VEGA_ENV=MAINNET
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
-NX_ETHEREUM_PROVIDER_URL=https://eth-mainnet.gateway.pokt.network/v1/lb/6684b914570bbfa533ba9324
+NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
 NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-mainnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
-NX_VEGA_REST_URL=https://api.vega.community/api/v2/

apps/governance/.env.stagnet1

@@ -1,11 +1,10 @@
 # App configuration variables
 NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET1
-NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://governance.stagnet1.vega.rocks","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
+NX_VEGA_NETWORKS='{"DEVNET":"https://dev.governance.vega.xyz","STAGNET1":"https://stagnet1.governance.vega.xyz","TESTNET":"https://governance.fairground.wtf","MAINNET":"https://governance.vega.xyz"}'
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet1/vegawallet-stagnet1.toml
-NX_VEGA_EXPLORER_URL=https://explorer.stagnet1.vega.rocks
+NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-stagnet1-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n00.stagnet1.vega.xyz/api/v2/

apps/governance/.env.testnet

@@ -12,5 +12,3 @@ NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_DELEGATIONS_PAGINATION=50
 NX_TRANCHES_SERVICE_URL=https://tranches-testnet-k8s.ops.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api.n07.testnet.vega.xyz/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/.env.validator-testnet

@@ -9,5 +9,3 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
-NX_VEGA_REST_URL=https://api-validators-testnet.vega.rocks/api/v2/
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996

apps/governance/src/app.tsx

@@ -16,7 +16,6 @@ import { AppStateProvider } from './contexts/app-state/app-state-provider';
 import { ContractsProvider } from './contexts/contracts/contracts-provider';
 import { AppRouter } from './routes';
 import type { EthereumConfig } from '@vegaprotocol/web3';
-import { WithdrawalApprovalDialogContainer } from '@vegaprotocol/web3';
 import {
   createConnectors,
   useEthTransactionManager,
@@ -44,7 +43,7 @@ import {
 } from '@vegaprotocol/environment';
 import { ENV } from './config';
 import type { InMemoryCacheConfig } from '@apollo/client';
-import { CreateWithdrawalDialog } from '@vegaprotocol/withdraws';
+import { WithdrawalDialog } from '@vegaprotocol/withdraws';
 import { SplashLoader } from './components/splash-loader';
 import { ToastsManager } from './toasts-manager';
 import {
@@ -53,7 +52,6 @@ import {
 } from './components/telemetry-dialog/telemetry-dialog';
 import { useLocalStorage } from '@vegaprotocol/react-helpers';
 import { useTranslation } from 'react-i18next';
-import { isPartyNotFoundError } from './lib/party';
 
 const cache: InMemoryCacheConfig = {
   typePolicies: {
@@ -159,8 +157,7 @@ const Web3Container = ({
                   <InitializeHandlers />
                   <VegaWalletDialogs />
                   <TransactionModal />
-                  <CreateWithdrawalDialog />
-                  <WithdrawalApprovalDialogContainer />
+                  <WithdrawalDialog />
                   <TelemetryDialog />
                 </>
               </BalanceManager>
@@ -214,36 +211,24 @@ const AppContainer = () => {
         enabled: true,
         environment: VEGA_ENV,
         release: GIT_COMMIT_HASH,
-        beforeSend(event, hint) {
-          const error = hint?.originalException;
-          const errorIsString = typeof error === 'string';
-          const errorIsObject = error instanceof Error;
+        beforeSend(event) {
           const requestUrl = event.request?.url;
           const transaction = event.transaction;
 
-          if (
-            (errorIsString && isPartyNotFoundError({ message: error })) ||
-            (errorIsObject && isPartyNotFoundError(error))
-          ) {
-            // This error is caused by a pubkey making an API request before
-            // it has interacted with the chain. This isn't needed in Sentry.
-            return null;
-          }
-
           const updatedRequest =
-            requestUrl && requestUrl.includes('/claim?')
+            requestUrl && requestUrl.includes('/test?')
               ? { ...event.request, url: removeQueryParams(requestUrl) }
               : event.request;
 
           const updatedTransaction =
-            transaction && transaction.includes('/claim?')
+            transaction && transaction.includes('/test?')
               ? removeQueryParams(transaction)
               : transaction;
 
           const updatedBreadcrumbs = event.breadcrumbs?.map((breadcrumb) => {
             if (
               breadcrumb.type === 'navigation' &&
-              breadcrumb.data?.to?.includes('/claim?')
+              breadcrumb.data?.to?.includes('/test?')
             ) {
               return {
                 ...breadcrumb,

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

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

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

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

apps/governance/src/components/vega-wallet/hooks.ts

@@ -26,7 +26,6 @@ import type {
   WalletDelegationFieldsFragment,
 } from './__generated__/Delegations';
 import { DelegationsDocument } from './__generated__/Delegations';
-import { isPartyNotFoundError } from '../../lib/party';
 
 export const usePollForDelegations = () => {
   const { token: vegaToken } = useContracts();
@@ -76,7 +75,6 @@ export const usePollForDelegations = () => {
           })
           .then((res) => {
             if (!mounted) return;
-
             const canonisedDelegations = removePaginationWrapper(
               res.data.party?.delegationsConnection?.edges
             );
@@ -205,15 +203,6 @@ export const usePollForDelegations = () => {
             setDelegatedNodes(delegatedAmounts);
           })
           .catch((err: Error) => {
-            // if party isn't found, dont log to Sentry, just clear state as, user
-            // will not have any delagations or accounts
-            if (isPartyNotFoundError(err)) {
-              setDelegations([]);
-              setAccounts([]);
-              setDelegatedNodes([]);
-              setCurrentStakeAvailable(new BigNumber(0));
-              return;
-            }
             Sentry.captureException(err);
             // If query fails stop interval. Its almost certain that the query
             // will just continue to fail

apps/governance/src/config/env.ts

@@ -62,7 +62,6 @@ export const ENV = {
   ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'),
   localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
   delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
-  rest: windowOrDefault('NX_VEGA_REST_URL'),
   flags: {
     NETWORK_DOWN: TRUTHY.includes(windowOrDefault('NX_NETWORK_DOWN')),
     MOCK: TRUTHY.includes(windowOrDefault('NX_MOCKED')),

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

@@ -594,9 +594,7 @@
   "numberOfAgainstVotes": "Number of votes against",
   "yesPercentage": "Yes percentage",
   "noPercentage": "No percentage",
-  "proposalJson": "Full proposal JSON",
-  "proposalDetails": "Proposal details",
-  "proposalDescription": "Description",
+  "proposalTerms": "Proposal terms",
   "currentlySetTo": "Currently expected to ",
   "currently": "currently",
   "finalOutcomeMayDiffer": "Final outcome may differ",
@@ -815,11 +813,5 @@
   "NoThanks": "No thanks",
   "ShareData": "Share data",
   "ContinueSharingData": "Continue sharing data",
-  "NodeUnsuitable": "Node: {{url}} is unsuitable",
-  "Disclaimer": "Disclaimer",
-  "disclaimer1": "The Vega Governance App allows the Vega network to arrive at on-chain decisions, where tokenholders can create proposals that other tokenholders can vote to approve or reject.  Vega supports on-chain proposals for creating markets and assets, and changing network parameters, markets and assets. Vega also supports freeform proposals for community suggestions that will not be enacted on-chain.",
-  "disclaimer2": "The Vega Governance App is free, public and open source software.  Software upgrades may contain bugs or security vulnerabilities that might result in loss of functionality.",
-  "disclaimer3": "The Vega Governance App uses data obtained from nodes on the Vega Blockchain. The developers of the Vega Governance App do not operate or run the Vega Blockchain or any other blockchain.",
-  "disclaimer4": "The Vega Governance App is provided “as is”.  The developers of the Vega Governance App make no representations or warranties of any kind, whether express or implied, statutory or otherwise regarding the Vega Governance App.  They disclaim all warranties of merchantability, quality, fitness for purpose.  They disclaim all warranties that the Vega Governance App is free of harmful components or errors.",
-  "disclaimer5": "No developer of the Vega Governance App accepts any responsibility for, or liability to users in connection with their use of the Vega Governance App."
+  "NodeUnsuitable": "Node: {{url}} is unsuitable"
 }

apps/governance/src/lib/party.ts

@@ -1,8 +0,0 @@
-export const PARTY_NOT_FOUND = 'failed to get party for ID';
-
-export const isPartyNotFoundError = (error: { message: string }) => {
-  if (error.message.includes(PARTY_NOT_FOUND)) {
-    return true;
-  }
-  return false;
-};

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

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

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

@@ -27,10 +27,6 @@ import type { ProposalFieldsFragment } from '../proposals/proposals/__generated_
 import type { NodesFragmentFragment } from '../staking/home/__generated__/Nodes';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
-import {
-  orderByDate,
-  orderByUpgradeBlockHeight,
-} from '../proposals/components/proposals-list/proposals-list';
 
 const nodesToShow = 6;
 
@@ -204,20 +200,17 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
   const proposals = useMemo(
     () =>
       proposalsData
-        ? getNotRejectedProposals(proposalsData.proposalsConnection)
+        ? getNotRejectedProposals<ProposalFieldsFragment>(
+            proposalsData.proposalsConnection
+          )
         : [],
     [proposalsData]
   );
 
-  const sortedProposals = useMemo(
-    () => orderByDate(proposals).reverse(),
-    [proposals]
-  );
-
   const protocolUpgradeProposals = useMemo(
     () =>
       protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals(
+        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
             protocolUpgradesData.protocolUpgradeProposals
           ).filter(
             (p) =>
@@ -228,20 +221,15 @@ const GovernanceHome = ({ name }: RouteChildProps) => {
     [protocolUpgradesData]
   );
 
-  const sortedProtocolUpgradeProposals = useMemo(
-    () => orderByUpgradeBlockHeight(protocolUpgradeProposals),
-    [protocolUpgradeProposals]
-  );
-
   const totalProposalsDesired = 4;
-  const protocolUpgradeProposalsToShow = sortedProtocolUpgradeProposals.slice(
+  const protocolUpgradeProposalsToShow = protocolUpgradeProposals.slice(
     0,
     totalProposalsDesired
   );
   const proposalsToShow =
     protocolUpgradeProposalsToShow.length === totalProposalsDesired
       ? []
-      : sortedProposals.slice(
+      : proposals.slice(
           0,
           totalProposalsDesired - protocolUpgradeProposalsToShow.length
         );

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

@@ -1 +0,0 @@
-export { ProposalDescription } from './proposal-description';

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

@@ -1,51 +0,0 @@
-import ReactMarkdown from 'react-markdown';
-import classnames from 'classnames';
-import { useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Icon, RoundedWrapper } from '@vegaprotocol/ui-toolkit';
-import { SubHeading } from '../../../../components/heading';
-
-export const ProposalDescription = ({
-  description,
-}: {
-  description: string;
-}) => {
-  const { t } = useTranslation();
-  const [showDescription, setShowDescription] = useState(false);
-  const showDescriptionIconClasses = classnames('mb-4', {
-    'rotate-180': showDescription,
-  });
-
-  return (
-    <section data-testid="proposal-description">
-      <button
-        onClick={() => setShowDescription(!showDescription)}
-        data-testid="proposal-description-toggle"
-      >
-        <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}>
-          <div className="p-2">
-            <ReactMarkdown
-              className="react-markdown-container"
-              /* Prevents HTML embedded in the description from rendering */
-              skipHtml={true}
-              /* Stops users embedding images which could be used for tracking  */
-              disallowedElements={['img']}
-              linkTarget="_blank"
-            >
-              {description}
-            </ReactMarkdown>
-          </div>
-        </RoundedWrapper>
-      )}
-    </section>
-  );
-};

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

@@ -124,7 +124,7 @@ describe('Proposal header', () => {
       })
     );
     expect(screen.getByTestId('proposal-title')).toHaveTextContent(
-      'New asset proposal'
+      'Unknown proposal'
     );
     expect(screen.getByTestId('proposal-type')).toHaveTextContent('New asset');
     expect(screen.getByTestId('proposal-details')).toHaveTextContent(
@@ -206,6 +206,28 @@ describe('Proposal header', () => {
     ).not.toBeInTheDocument();
   });
 
+  it('Renders Freeform proposal - long rationale (105 chars) - details', () => {
+    renderComponent(
+      generateProposal({
+        id: 'long',
+        rationale: {
+          title: '0x0',
+          description:
+            'Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Aenean dolor.',
+        },
+        terms: {
+          change: {
+            __typename: 'NewFreeform',
+          },
+        },
+      }),
+      false
+    );
+    expect(screen.getByTestId('proposal-description')).toHaveTextContent(
+      /Class aptent/
+    );
+  });
+
   // Remove once proposals have rationale and re-enable above tests
   it('Renders Freeform proposal - id for title', () => {
     renderComponent(

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

@@ -5,6 +5,7 @@ import { Heading, SubHeading } from '../../../../components/heading';
 import type { ReactNode } from 'react';
 import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
 import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import ReactMarkdown from 'react-markdown';
 import { truncateMiddle } from '../../../../lib/truncate-middle';
 import { CurrentProposalState } from '../current-proposal-state';
 import { ProposalInfoLabel } from '../proposal-info-label';
@@ -21,16 +22,19 @@ export const ProposalHeader = ({
 
   let details: ReactNode;
   let proposalType = '';
-  let fallbackTitle = '';
 
-  const title = proposal?.rationale.title.trim();
+  let title = proposal?.rationale.title.trim();
+  let description = proposal?.rationale.description.trim();
+  if (title?.length === 0 && description && description.length > 0) {
+    title = description;
+    description = '';
+  }
 
   const titleContent = shorten(title ?? '', 100);
 
   switch (change?.__typename) {
     case 'NewMarket': {
       proposalType = 'NewMarket';
-      fallbackTitle = t('NewMarketProposal');
       details = (
         <>
           <span>
@@ -52,7 +56,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateMarket': {
       proposalType = 'UpdateMarket';
-      fallbackTitle = t('UpdateMarketProposal');
       details = (
         <>
           <span>{t('Market change')}:</span>{' '}
@@ -63,7 +66,6 @@ export const ProposalHeader = ({
     }
     case 'NewAsset': {
       proposalType = 'NewAsset';
-      fallbackTitle = t('NewAssetProposal');
       details = (
         <>
           <span>{t('Symbol')}:</span> <Lozenge>{change.symbol}.</Lozenge>{' '}
@@ -85,7 +87,6 @@ export const ProposalHeader = ({
     }
     case 'UpdateNetworkParameter': {
       proposalType = 'NetworkParameter';
-      fallbackTitle = t('NetworkParameterProposal');
       details = (
         <>
           <span>{t('Change')}:</span>{' '}
@@ -100,13 +101,11 @@ export const ProposalHeader = ({
     }
     case 'NewFreeform': {
       proposalType = 'Freeform';
-      fallbackTitle = t('FreeformProposal');
       details = <span />;
       break;
     }
     case 'UpdateAsset': {
       proposalType = 'UpdateAsset';
-      fallbackTitle = t('UpdateAssetProposal');
       details = (
         <>
           <span>{t('AssetID')}:</span>{' '}
@@ -122,14 +121,10 @@ export const ProposalHeader = ({
       <div data-testid="proposal-title">
         {isListItem ? (
           <header>
-            <SubHeading
-              title={titleContent || fallbackTitle || t('Unknown proposal')}
-            />
+            <SubHeading title={titleContent || t('Unknown proposal')} />
           </header>
         ) : (
-          <Heading
-            title={titleContent || fallbackTitle || t('Unknown proposal')}
-          />
+          <Heading title={titleContent || t('Unknown proposal')} />
         )}
       </div>
 
@@ -150,6 +145,23 @@ export const ProposalHeader = ({
           {details}
         </div>
       )}
+
+      {description && !isListItem && (
+        <div data-testid="proposal-description">
+          {/*<div className="uppercase mr-2">{t('ProposalDescription')}:</div>*/}
+          <SubHeading title={t('ProposalDescription')} />
+          <ReactMarkdown
+            className="react-markdown-container"
+            /* Prevents HTML embedded in the description from rendering */
+            skipHtml={true}
+            /* Stops users embedding images which could be used for tracking  */
+            disallowedElements={['img']}
+            linkTarget="_blank"
+          >
+            {description}
+          </ReactMarkdown>
+        </div>
+      )}
     </>
   );
 };

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

@@ -1 +0,0 @@
-export { ProposalJson } from './proposal-json';

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

@@ -0,0 +1 @@
+export { ProposalTermsJson } from './proposal-terms-json';

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

@@ -1,15 +1,15 @@
-import classnames from 'classnames';
-import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Icon, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { SubHeading } from '../../../../components/heading';
-import type { ProposalFieldsFragment } from '../../proposals/__generated__/Proposals';
-import type { ProposalQuery } from '../../proposal/__generated__/Proposal';
+import type { PartialDeep } from 'type-fest';
+import type * as Schema from '@vegaprotocol/types';
+import { useState } from 'react';
+import classnames from 'classnames';
 
-export const ProposalJson = ({
-  proposal,
+export const ProposalTermsJson = ({
+  terms,
 }: {
-  proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
+  terms: PartialDeep<Schema.ProposalTerms>;
 }) => {
   const { t } = useTranslation();
   const [showDetails, setShowDetails] = useState(false);
@@ -18,20 +18,20 @@ export const ProposalJson = ({
   });
 
   return (
-    <section data-testid="proposal-json">
+    <section>
       <button
         onClick={() => setShowDetails(!showDetails)}
-        data-testid="proposal-json-toggle"
+        data-testid="proposal-terms-toggle"
       >
         <div className="flex items-center gap-3">
-          <SubHeading title={t('proposalJson')} />
+          <SubHeading title={t('proposalTerms')} />
           <div className={showDetailsIconClasses}>
             <Icon name="chevron-down" size={8} />
           </div>
         </div>
       </button>
 
-      {showDetails && <SyntaxHighlighter data={proposal} />}
+      {showDetails && <SyntaxHighlighter data={terms} />}
     </section>
   );
 };

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

@@ -1 +0,0 @@
-export { ProposalTerms } from './proposal-terms';

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

@@ -1,142 +0,0 @@
-import {
-  RoundedWrapper,
-  KeyValueTable,
-  KeyValueTableRow,
-  Icon,
-} from '@vegaprotocol/ui-toolkit';
-import { BigNumber } from '../../../../lib/bignumber';
-import { SubHeading } from '../../../../components/heading';
-import { useTranslation } from 'react-i18next';
-import { useState } from 'react';
-import classnames from 'classnames';
-
-interface ProposalTermsProps {
-  data: Record<string, unknown>;
-}
-
-const getParsedValue = (value: unknown) => {
-  if (typeof value === 'string') {
-    try {
-      // Check if value is a number string - if so use bignumber to maintain precision
-      if (/^\d+(\.\d+)?$/.test(value)) {
-        return new BigNumber(value).toString();
-      } else {
-        // This would convert, for example, a JSON object ('{"key":"value"}')
-        // into an actual JS object ({key: "value"})
-        return JSON.parse(value);
-      }
-    } catch (error) {
-      return value;
-    }
-  } else {
-    return value;
-  }
-};
-
-const RenderKeyValue = ({
-  title,
-  value,
-}: {
-  title: string;
-  value: string | number;
-}) => (
-  <KeyValueTable>
-    <KeyValueTableRow>
-      {title}
-      {value}
-    </KeyValueTableRow>
-  </KeyValueTable>
-);
-
-const RenderArray = ({ title, array }: { title: string; array: unknown[] }) => {
-  if (array.every((item) => typeof item === 'string')) {
-    return <RenderKeyValue title={title} value={array.join(', ')} />;
-  } else {
-    return (
-      <div>
-        <div className="mb-2">{title}</div>
-        {array.map((item, index) => (
-          <div key={index}>
-            <ProposalTermsRenderer data={item as Record<string, unknown>} />
-          </div>
-        ))}
-      </div>
-    );
-  }
-};
-
-// Working with 'unknown' type as a proposal's terms can be in many shapes
-const RenderTerm = ({ title, value }: { title: string; value: unknown }) => {
-  const parsedValue = getParsedValue(value);
-
-  if (parsedValue === null || typeof parsedValue === 'boolean') {
-    return <RenderKeyValue title={title} value={String(parsedValue)} />;
-  } else if (
-    typeof parsedValue === 'string' ||
-    typeof parsedValue === 'number'
-  ) {
-    return <RenderKeyValue title={title} value={parsedValue} />;
-  } else if (typeof parsedValue === 'object') {
-    if (Array.isArray(parsedValue)) {
-      return <RenderArray title={title} array={parsedValue} />;
-    } else {
-      return (
-        <div>
-          <div className="my-2">{title}</div>
-          <ProposalTermsRenderer
-            data={parsedValue as Record<string, unknown>}
-          />
-        </div>
-      );
-    }
-  } else if (parsedValue === undefined) {
-    return <span>{'undefined'}</span>;
-  } else {
-    return <span>{String(parsedValue)}</span>;
-  }
-};
-
-const ProposalTermsRenderer = ({ data }: ProposalTermsProps) => {
-  return (
-    <RoundedWrapper paddingBottom={true}>
-      {Object.keys(data)
-        .filter(
-          (key) =>
-            !['__typename', 'closingDatetime', 'enactmentDatetime'].includes(
-              key
-            )
-        )
-        .map((key, index) => (
-          <div key={index}>
-            <RenderTerm title={key} value={data[key]} />
-          </div>
-        ))}
-    </RoundedWrapper>
-  );
-};
-
-export const ProposalTerms = ({ data }: ProposalTermsProps) => {
-  const { t } = useTranslation();
-  const [showTerms, setShowTerms] = useState(false);
-  const showTermsIconClasses = classnames('mb-4', {
-    'rotate-180': showTerms,
-  });
-
-  return (
-    <section data-testid="proposal-terms">
-      <button
-        onClick={() => setShowTerms(!showTerms)}
-        data-testid="proposal-terms-toggle"
-      >
-        <div className="flex items-center gap-3">
-          <SubHeading title={t('proposalDetails')} />
-          <div className={showTermsIconClasses}>
-            <Icon name="chevron-down" size={8} />
-          </div>
-        </div>
-      </button>
-
-      {showTerms && <ProposalTermsRenderer data={data} />}
-    </section>
-  );
-};

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

@@ -25,11 +25,8 @@ jest.mock('../proposal-detail-header/proposal-header', () => ({
 jest.mock('../proposal-change-table', () => ({
   ProposalChangeTable: () => <div data-testid="proposal-change-table"></div>,
 }));
-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-terms-json', () => ({
+  ProposalTermsJson: () => <div data-testid="proposal-terms-json"></div>,
 }));
 jest.mock('../proposal-votes-table', () => ({
   ProposalVotesTable: () => <div data-testid="proposal-votes-table"></div>,
@@ -43,21 +40,16 @@ jest.mock('../list-asset', () => ({
 
 it('Renders with data-testid', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
   expect(await screen.findByTestId('proposal')).toBeInTheDocument();
 });
 
 it('renders each section', async () => {
   const proposal = generateProposal();
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal 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-terms-json')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-votes-table')).toBeInTheDocument();
   expect(screen.getByTestId('proposal-vote-details')).toBeInTheDocument();
   expect(screen.queryByTestId('proposal-list-asset')).not.toBeInTheDocument();
@@ -80,8 +72,6 @@ it('renders whitelist section if proposal is new asset and source is erc20', asy
       },
     },
   });
-  render(
-    <Proposal restData={{}} proposal={proposal as ProposalQuery['proposal']} />
-  );
+  render(<Proposal proposal={proposal as ProposalQuery['proposal']} />);
   expect(screen.getByTestId('proposal-list-asset')).toBeInTheDocument();
 });

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

@@ -6,10 +6,8 @@ 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 { ProposalTermsJson } from '../proposal-terms-json';
 import { ProposalVotesTable } from '../proposal-votes-table';
 import { VoteDetails } from '../vote-details';
 import { ListAsset } from '../list-asset';
@@ -22,13 +20,11 @@ export enum ProposalType {
   PROPOSAL_NETWORK_PARAMETER = 'PROPOSAL_NETWORK_PARAMETER',
   PROPOSAL_FREEFORM = 'PROPOSAL_FREEFORM',
 }
-export interface ProposalProps {
+interface ProposalProps {
   proposal: ProposalFieldsFragment | ProposalQuery['proposal'];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  restData: any;
 }
 
-export const Proposal = ({ proposal, restData }: ProposalProps) => {
+export const Proposal = ({ proposal }: ProposalProps) => {
   const { params, loading, error } = useNetworkParams([
     NetworkParams.governance_proposal_market_minVoterBalance,
     NetworkParams.governance_proposal_updateMarket_minVoterBalance,
@@ -82,11 +78,9 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
     <AsyncRenderer data={params} loading={loading} error={error}>
       <section data-testid="proposal">
         <ProposalHeader proposal={proposal} isListItem={false} />
-
         <div className="my-10">
           <ProposalChangeTable proposal={proposal} />
         </div>
-
         {proposal.terms.change.__typename === 'NewAsset' &&
         proposal.terms.change.source.__typename === 'ERC20' &&
         proposal.id ? (
@@ -96,23 +90,7 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
             lifetimeLimit={proposal.terms.change.source.lifetimeLimit}
           />
         ) : null}
-
-        <div className="mb-4">
-          <ProposalDescription description={proposal.rationale.description} />
-        </div>
-
-        {proposal.terms.change.__typename !== 'NewMarket' &&
-          proposal.terms.change.__typename !== 'UpdateMarket' && (
-            <div className="mb-4">
-              <ProposalTerms data={proposal.terms} />
-            </div>
-          )}
-
-        <div className="mb-6">
-          <ProposalJson proposal={restData?.data?.proposal} />
-        </div>
-
-        <div className="mb-10">
+        <div className="mb-12">
           <RoundedWrapper paddingBottom={true}>
             <VoteDetails
               proposal={proposal}
@@ -124,10 +102,10 @@ export const Proposal = ({ proposal, restData }: ProposalProps) => {
             />
           </RoundedWrapper>
         </div>
-
         <div className="mb-4">
           <ProposalVotesTable proposal={proposal} proposalType={proposalType} />
         </div>
+        <ProposalTermsJson terms={proposal.terms} />
       </section>
     </AsyncRenderer>
   );

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

@@ -115,6 +115,29 @@ describe('Proposals list', () => {
     );
   });
 
+  it('Orders proposals correctly by closingDateTime', () => {
+    render(
+      renderComponent([
+        failedProposalClosedLastMonth,
+        openProposalClosesNextMonth,
+        openProposalClosesNextWeek,
+        enactedProposalClosedLastWeek,
+      ])
+    );
+    const openProposals = within(screen.getByTestId('open-proposals'));
+    const closedProposals = within(screen.getByTestId('closed-proposals'));
+    const openProposalsItems = openProposals.getAllByTestId(
+      'proposals-list-item'
+    );
+    const closedProposalsItems = closedProposals.getAllByTestId(
+      'proposals-list-item'
+    );
+    expect(openProposalsItems[0]).toHaveAttribute('id', 'proposal1');
+    expect(openProposalsItems[1]).toHaveAttribute('id', 'proposal2');
+    expect(closedProposalsItems[0]).toHaveAttribute('id', 'proposal4');
+    expect(closedProposalsItems[1]).toHaveAttribute('id', 'proposal3');
+  });
+
   it('Displays info on no proposals', () => {
     render(renderComponent([]));
     expect(screen.queryByTestId('open-proposals')).not.toBeInTheDocument();

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

@@ -1,6 +1,5 @@
-import orderBy from 'lodash/orderBy';
 import { isFuture } from 'date-fns';
-import { useState, useMemo } from 'react';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Heading, SubHeading } from '../../../../components/heading';
 import { ProposalsListItem } from '../proposals-list-item';
@@ -31,29 +30,6 @@ interface SortedProtocolUpgradeProposalsProps {
   closed: ProtocolUpgradeProposalFieldsFragment[];
 }
 
-export const orderByDate = (arr: ProposalFieldsFragment[]) =>
-  orderBy(
-    arr,
-    [
-      (p) =>
-        p?.terms?.enactmentDatetime
-          ? new Date(p?.terms?.enactmentDatetime).getTime()
-          : // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered
-            new Date(p?.terms?.closingDatetime || 0).getTime(),
-      (p) => new Date(p?.datetime).getTime(),
-    ],
-    ['asc', 'asc']
-  );
-
-export const orderByUpgradeBlockHeight = (
-  arr: ProtocolUpgradeProposalFieldsFragment[]
-) =>
-  orderBy(
-    arr,
-    [(p) => p?.upgradeBlockHeight, (p) => p.vegaReleaseTag],
-    ['desc', 'desc']
-  );
-
 export const ProposalsList = ({
   proposals,
   protocolUpgradeProposals,
@@ -61,57 +37,35 @@ export const ProposalsList = ({
 }: ProposalsListProps) => {
   const { t } = useTranslation();
   const [filterString, setFilterString] = useState('');
-
-  const sortedProposals: SortedProposalsProps = useMemo(() => {
-    const initialSorting = proposals.reduce(
-      (acc: SortedProposalsProps, proposal) => {
-        if (isFuture(new Date(proposal?.terms.closingDatetime))) {
-          acc.open.push(proposal);
-        } else {
-          acc.closed.push(proposal);
-        }
-        return acc;
-      },
-      {
-        open: [],
-        closed: [],
+  const sortedProposals = proposals.reduce(
+    (acc: SortedProposalsProps, proposal) => {
+      if (isFuture(new Date(proposal?.terms.closingDatetime))) {
+        acc.open.push(proposal);
+      } else {
+        acc.closed.push(proposal);
       }
-    );
-    return {
-      open:
-        initialSorting.open.length > 0
-          ? orderByDate(initialSorting.open as ProposalFieldsFragment[])
-          : [],
-      closed:
-        initialSorting.closed.length > 0
-          ? orderByDate(
-              initialSorting.closed as ProposalFieldsFragment[]
-            ).reverse()
-          : [],
-    };
-  }, [proposals]);
+      return acc;
+    },
+    {
+      open: [],
+      closed: [],
+    }
+  );
 
-  const sortedProtocolUpgradeProposals: SortedProtocolUpgradeProposalsProps =
-    useMemo(() => {
-      const initialSorting = protocolUpgradeProposals.reduce(
-        (acc: SortedProtocolUpgradeProposalsProps, proposal) => {
-          if (Number(proposal?.upgradeBlockHeight) > Number(lastBlockHeight)) {
-            acc.open.push(proposal);
-          } else {
-            acc.closed.push(proposal);
-          }
-          return acc;
-        },
-        {
-          open: [],
-          closed: [],
-        }
-      );
-      return {
-        open: orderByUpgradeBlockHeight(initialSorting.open),
-        closed: orderByUpgradeBlockHeight(initialSorting.closed).reverse(),
-      };
-    }, [protocolUpgradeProposals, lastBlockHeight]);
+  const sortedProtocolUpgradeProposals = protocolUpgradeProposals.reduce(
+    (acc: SortedProtocolUpgradeProposalsProps, proposal) => {
+      if (Number(proposal?.upgradeBlockHeight) > Number(lastBlockHeight)) {
+        acc.open.push(proposal);
+      } else {
+        acc.closed.push(proposal);
+      }
+      return acc;
+    },
+    {
+      open: [],
+      closed: [],
+    }
+  );
 
   const filterPredicate = (
     p: ProposalFieldsFragment | ProposalQuery['proposal']

apps/governance/src/routes/proposals/components/protocol-upgrade-proposals-list-item/protocol-upgrade-proposals-list-item.tsx

@@ -107,7 +107,7 @@ export const ProtocolUpgradeProposalsListItem = ({
           <div className="grid grid-cols-1 mt-3">
             <div className="justify-self-end">
               <Link
-                to={`${Routes.PROTOCOL_UPGRADES}/${stripFullStops(
+                to={`${Routes.PROPOSALS}/protocol-upgrade/${stripFullStops(
                   proposal.vegaReleaseTag
                 )}`}
               >

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

@@ -5,14 +5,9 @@ import { useParams } from 'react-router-dom';
 import { Proposal } from '../components/proposal';
 import { ProposalNotFound } from '../components/proposal-not-found';
 import { useProposalQuery } from './__generated__/Proposal';
-import { useFetch } from '@vegaprotocol/react-helpers';
-import { ENV } from '../../../config';
 
 export const ProposalContainer = () => {
   const params = useParams<{ proposalId: string }>();
-  const {
-    state: { data: restData },
-  } = useFetch(`${ENV.rest}governance?proposalId=${params.proposalId}`);
   const { data, loading, error, refetch } = useProposalQuery({
     fetchPolicy: 'network-only',
     errorPolicy: 'ignore',
@@ -28,7 +23,7 @@ export const ProposalContainer = () => {
   return (
     <AsyncRenderer loading={loading} error={error} data={data}>
       {data?.proposal ? (
-        <Proposal proposal={data.proposal} restData={restData} />
+        <Proposal proposal={data.proposal} />
       ) : (
         <ProposalNotFound />
       )}

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

@@ -1,4 +1,3 @@
-import flow from 'lodash/flow';
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
@@ -7,15 +6,36 @@ import { SplashLoader } from '../../../components/splash-loader';
 import { ProposalsList } from '../components/proposals-list';
 import { useProposalsQuery } from './__generated__/Proposals';
 import { getNodes } from '@vegaprotocol/utils';
+import flow from 'lodash/flow';
 import {
   ProposalState,
   ProtocolUpgradeProposalStatus,
 } from '@vegaprotocol/types';
 import type { NodeConnection, NodeEdge } from '@vegaprotocol/utils';
 import type { ProposalFieldsFragment } from './__generated__/Proposals';
+import orderBy from 'lodash/orderBy';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
 import { useProtocolUpgradeProposalsQuery } from '@vegaprotocol/proposals';
 
+const orderByDate = (arr: ProposalFieldsFragment[]) =>
+  orderBy(
+    arr,
+    [
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
+      (p) => new Date(p?.datetime).getTime(),
+    ],
+    ['asc', 'asc']
+  );
+
+const orderByUpgradeBlockHeight = (
+  arr: ProtocolUpgradeProposalFieldsFragment[]
+) =>
+  orderBy(
+    arr,
+    [(p) => p?.upgradeBlockHeight, (p) => p.vegaReleaseTag],
+    ['desc', 'desc']
+  );
+
 export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
   data?: NodeConnection<NodeEdge<T>> | null
 ): T[] {
@@ -24,6 +44,7 @@ export function getNotRejectedProposals<T extends ProposalFieldsFragment>(
       getNodes<ProposalFieldsFragment>(data, (p) =>
         p ? p.state !== ProposalState.STATE_REJECTED : false
       ),
+    orderByDate,
   ])(data);
 }
 
@@ -38,6 +59,7 @@ export function getNotRejectedProtocolUpgradeProposals<
             ProtocolUpgradeProposalStatus.PROTOCOL_UPGRADE_PROPOSAL_STATUS_REJECTED
           : false
       ),
+    orderByUpgradeBlockHeight,
   ])(data);
 }
 
@@ -60,14 +82,17 @@ export const ProposalsContainer = () => {
   });
 
   const proposals = useMemo(
-    () => getNotRejectedProposals(data?.proposalsConnection),
+    () =>
+      getNotRejectedProposals<ProposalFieldsFragment>(
+        data?.proposalsConnection
+      ),
     [data]
   );
 
   const protocolUpgradeProposals = useMemo(
     () =>
       protocolUpgradesData
-        ? getNotRejectedProtocolUpgradeProposals(
+        ? getNotRejectedProtocolUpgradeProposals<ProtocolUpgradeProposalFieldsFragment>(
             protocolUpgradesData.protocolUpgradeProposals
           )
         : [],

apps/governance/src/routes/proposals/propose/freeform/propose-freeform.tsx

@@ -49,7 +49,6 @@ export const ProposeFreeform = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<FreeformProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -86,13 +85,7 @@ export const ProposeFreeform = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/network-parameter/propose-network-parameter.tsx

@@ -89,7 +89,6 @@ export const ProposeNetworkParameter = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NetworkParameterProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -149,13 +148,7 @@ export const ProposeNetworkParameter = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/new-asset/propose-new-asset.tsx

@@ -61,7 +61,6 @@ export const ProposeNewAsset = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NewAssetProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -118,13 +117,7 @@ export const ProposeNewAsset = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/new-market/propose-new-market.tsx

@@ -59,7 +59,6 @@ export const ProposeNewMarket = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<NewMarketProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -108,13 +107,7 @@ export const ProposeNewMarket = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/update-asset/propose-update-asset.tsx

@@ -59,7 +59,6 @@ export const ProposeUpdateAsset = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<UpdateAssetProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -108,13 +107,7 @@ export const ProposeUpdateAsset = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/propose/update-market/propose-update-market.tsx

@@ -106,7 +106,6 @@ export const ProposeUpdateMarket = () => {
     formState: { errors },
     setValue,
     watch,
-    trigger,
   } = useForm<UpdateMarketProposalFormFields>();
   const { finalizedProposal, submit, Dialog } = useProposalSubmit();
 
@@ -158,13 +157,7 @@ export const ProposeUpdateMarket = () => {
     await submit(assembleProposal(fields));
   };
 
-  const viewJson = async () => {
-    const isValid = await trigger();
-
-    if (!isValid) {
-      return;
-    }
-
+  const viewJson = () => {
     const formData = watch();
     downloadJson(
       JSON.stringify(assembleProposal(formData)),

apps/governance/src/routes/proposals/protocol-upgrade/protocol-upgrade-proposal.tsx

@@ -5,9 +5,6 @@ import { ProtocolUpgradeProposalDetailInfo } from '../components/protocol-upgrad
 import { getNormalisedVotingPower } from '../../staking/shared';
 import type { NodesFragmentFragment } from '../../staking/home/__generated__/Nodes';
 import type { ProtocolUpgradeProposalFieldsFragment } from '@vegaprotocol/proposals';
-import { useVegaRelease } from '@vegaprotocol/environment';
-import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { useTranslation } from 'react-i18next';
 
 export interface ProtocolUpgradeProposalProps {
   proposal: ProtocolUpgradeProposalFieldsFragment;
@@ -45,9 +42,6 @@ export const ProtocolUpgradeProposal = ({
   lastBlockHeight,
   consensusValidators,
 }: ProtocolUpgradeProposalProps) => {
-  const { t } = useTranslation();
-  const releaseInfo = useVegaRelease(proposal.vegaReleaseTag);
-
   const consensusApprovals = useMemo(
     () => getConsensusApprovals(consensusValidators || [], proposal),
     [consensusValidators, proposal]
@@ -84,14 +78,6 @@ export const ProtocolUpgradeProposal = ({
           totalConsensusValidators={consensusValidators.length}
         />
       )}
-
-      {releaseInfo && releaseInfo.htmlUrl && (
-        <div className="mb-10">
-          <ExternalLink href={releaseInfo.htmlUrl}>
-            {t('Explore release on GitHub')}
-          </ExternalLink>
-        </div>
-      )}
     </section>
   );
 };

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

@@ -16,10 +16,11 @@ const orderByDate = (arr: ProposalFieldsFragment[]) =>
   orderBy(
     arr,
     [
-      (p) => new Date(p?.terms?.closingDatetime || 0).getTime(), // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered
+      (p) => new Date(p?.terms?.enactmentDatetime || 0).getTime(), // has to be defaulted to 0 because new Date(null).getTime() -> NaN which is first when ordered.
+      (p) => new Date(p?.terms?.closingDatetime).getTime(),
       (p) => p.id,
     ],
-    ['desc', 'desc']
+    ['desc', 'desc', 'desc']
   );
 
 export function getRejectedProposals<T extends ProposalFieldsFragment>(

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

@@ -8,7 +8,6 @@ const mockData = {
     {
       asset: 'tDAI',
       totalAmount: '5',
-      decimals: 6,
       rewardTypes: {
         ACCOUNT_TYPE_GLOBAL_REWARD: {
           amount: '0',
@@ -26,7 +25,7 @@ const mockData = {
           amount: '0',
           percentageOfTotal: '0',
         },
-        ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: {
+        ACCOUNT_TYPE_FEES_LIQUIDITY: {
           amount: '0',
           percentageOfTotal: '0',
         },
@@ -56,9 +55,7 @@ describe('EpochIndividualRewardsTable', () => {
     expect(
       getByTestId('ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES')
     ).toBeInTheDocument();
-    expect(
-      getByTestId('ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES')
-    ).toBeInTheDocument();
+    expect(getByTestId('ACCOUNT_TYPE_FEES_LIQUIDITY')).toBeInTheDocument();
     expect(
       getByTestId('ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS')
     ).toBeInTheDocument();

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

@@ -1,5 +1,6 @@
 import { formatNumber, toBigNum } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import { useAppState } from '../../../contexts/app-state/app-state-context';
 import {
   rowGridItemStyles,
   RewardsTable,
@@ -12,8 +13,7 @@ interface EpochIndividualRewardsGridProps {
 }
 
 interface RewardItemProps {
-  amount: string;
-  decimals: number;
+  value: string;
   percentageOfTotal?: string;
   dataTestId: string;
   last?: boolean;
@@ -21,14 +21,15 @@ interface RewardItemProps {
 
 const DisplayReward = ({
   reward,
-  decimals,
   percentageOfTotal,
 }: {
   reward: string;
-  decimals: number;
   percentageOfTotal?: string;
 }) => {
   const { t } = useTranslation();
+  const {
+    appState: { decimals },
+  } = useAppState();
 
   if (Number(reward) === 0) {
     return <span className="text-vega-dark-300">-</span>;
@@ -63,8 +64,7 @@ const DisplayReward = ({
 };
 
 const RewardItem = ({
-  amount,
-  decimals,
+  value,
   percentageOfTotal,
   dataTestId,
   last,
@@ -72,11 +72,7 @@ const RewardItem = ({
   <div data-testid={dataTestId} className={rowGridItemStyles(last)}>
     <div className="h-full w-5 absolute right-0 top-0 bg-gradient-to-r from-transparent to-black pointer-events-none" />
     <div className="overflow-auto p-5">
-      <DisplayReward
-        reward={amount}
-        decimals={decimals}
-        percentageOfTotal={percentageOfTotal}
-      />
+      <DisplayReward reward={value} percentageOfTotal={percentageOfTotal} />
     </div>
     <div className="h-full w-5 absolute left-0 top-0 bg-gradient-to-l from-transparent to-black pointer-events-none" />
   </div>
@@ -90,7 +86,7 @@ export const EpochIndividualRewardsTable = ({
       dataTestId="epoch-individual-rewards-table"
       epoch={Number(data.epoch)}
     >
-      {data.rewards.map(({ asset, rewardTypes, totalAmount, decimals }, i) => (
+      {data.rewards.map(({ asset, rewardTypes, totalAmount }, i) => (
         <div className="contents" key={i}>
           <div
             data-testid="individual-rewards-asset"
@@ -102,19 +98,13 @@ export const EpochIndividualRewardsTable = ({
             ([key, { amount, percentageOfTotal }]) => (
               <RewardItem
                 key={key}
-                amount={amount}
-                decimals={decimals}
+                value={amount}
                 percentageOfTotal={percentageOfTotal}
                 dataTestId={key}
               />
             )
           )}
-          <RewardItem
-            dataTestId="total"
-            amount={totalAmount}
-            decimals={decimals}
-            last={true}
-          />
+          <RewardItem dataTestId="total" value={totalAmount} last={true} />
         </div>
       ))}
     </RewardsTable>

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

@@ -8,7 +8,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '100',
     percentageOfTotal: '0.1',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '1' },
   };
@@ -18,37 +18,37 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '50',
     percentageOfTotal: '0.05',
     receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR', name: 'EUR', decimals: 5 },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
 
   const reward3: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
     amount: '200',
     percentageOfTotal: '0.2',
     receivedAt: new Date(),
-    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP', decimals: 7 },
+    asset: { id: 'gbp', symbol: 'GBP', name: 'GBP' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
 
   const reward4: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
     amount: '100',
     percentageOfTotal: '0.1',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '1' },
   };
 
   const reward5: RewardFieldsFragment = {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
     amount: '150',
     percentageOfTotal: '0.15',
     receivedAt: new Date(),
-    asset: { id: 'usd', symbol: 'USD', name: 'USD', decimals: 6 },
+    asset: { id: 'usd', symbol: 'USD', name: 'USD' },
     party: { id: 'blah' },
     epoch: { id: '3' },
   };
@@ -58,7 +58,7 @@ describe('generateEpochIndividualRewardsList', () => {
     amount: '50',
     percentageOfTotal: '0.05',
     receivedAt: new Date(),
-    asset: { id: 'eur', symbol: 'EUR', name: 'EUR', decimals: 5 },
+    asset: { id: 'eur', symbol: 'EUR', name: 'EUR' },
     party: { id: 'blah' },
     epoch: { id: '2' },
   };
@@ -99,14 +99,13 @@ describe('generateEpochIndividualRewardsList', () => {
       rewards: [
         {
           asset: 'USD',
-          decimals: 6,
           totalAmount: '100',
           rewardTypes: {
             [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
               amount: '0',
               percentageOfTotal: '0',
             },
-            [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+            [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
               amount: '0',
               percentageOfTotal: '0',
             },
@@ -168,13 +167,12 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'GBP',
             totalAmount: '200',
-            decimals: 7,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
                 amount: '200',
                 percentageOfTotal: '0.2',
               },
@@ -199,13 +197,12 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'EUR',
             totalAmount: '50',
-            decimals: 5,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
@@ -235,13 +232,12 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'USD',
             totalAmount: '200',
-            decimals: 6,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
                 amount: '100',
                 percentageOfTotal: '0.1',
               },
@@ -283,14 +279,13 @@ describe('generateEpochIndividualRewardsList', () => {
         rewards: [
           {
             asset: 'USD',
-            decimals: 6,
             totalAmount: '150',
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
                 amount: '150',
                 percentageOfTotal: '0.15',
               },
@@ -320,13 +315,12 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'GBP',
             totalAmount: '200',
-            decimals: 7,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
                 amount: '200',
                 percentageOfTotal: '0.2',
               },
@@ -351,13 +345,12 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'EUR',
             totalAmount: '50',
-            decimals: 5,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
@@ -397,13 +390,12 @@ describe('generateEpochIndividualRewardsList', () => {
           {
             asset: 'USD',
             totalAmount: '200',
-            decimals: 6,
             rewardTypes: {
               [AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE]: {
                 amount: '0',
                 percentageOfTotal: '0',
               },
-              [AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES]: {
+              [AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY]: {
                 amount: '100',
                 percentageOfTotal: '0.1',
               },

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

@@ -9,7 +9,6 @@ export interface EpochIndividualReward {
   rewards: {
     asset: string;
     totalAmount: string;
-    decimals: number;
     rewardTypes: {
       [key in AccountType]?: {
         amount: string;
@@ -54,7 +53,6 @@ export const generateEpochIndividualRewardsList = ({
   const epochIndividualRewards = rewards.reduce((acc, reward) => {
     const epochId = reward.epoch.id;
     const assetName = reward.asset.name;
-    const assetDecimals = reward.asset.decimals;
     const rewardType = reward.rewardType;
     const amount = reward.amount;
     const percentageOfTotal = reward.percentageOfTotal;
@@ -75,7 +73,6 @@ export const generateEpochIndividualRewardsList = ({
     if (!asset) {
       asset = {
         asset: assetName,
-        decimals: assetDecimals,
         totalAmount: '0',
         rewardTypes: Object.fromEntries(emptyRowAccountTypes),
       };

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.spec.tsx

@@ -29,7 +29,7 @@ const rewardsList = [
     amount: '0',
   },
   {
-    rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+    rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
     amount: '0',
   },
   {
@@ -52,7 +52,6 @@ const assetRewards: Map<
 assetRewards.set(assetId, {
   assetId,
   name: 'tDAI TEST',
-  decimals: 6,
   rewards,
   totalAmount: '295',
 });
@@ -79,9 +78,7 @@ describe('EpochTotalRewardsTable', () => {
     expect(
       getByTestId('ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES')
     ).toBeInTheDocument();
-    expect(
-      getByTestId('ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES')
-    ).toBeInTheDocument();
+    expect(getByTestId('ACCOUNT_TYPE_FEES_LIQUIDITY')).toBeInTheDocument();
     expect(
       getByTestId('ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS')
     ).toBeInTheDocument();

apps/governance/src/routes/rewards/epoch-total-rewards/epoch-total-rewards-table.tsx

@@ -1,5 +1,6 @@
 import { formatNumber, toBigNum } from '@vegaprotocol/utils';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
+import { useAppState } from '../../../contexts/app-state/app-state-context';
 import {
   rowGridItemStyles,
   RewardsTable,
@@ -11,19 +12,16 @@ interface EpochTotalRewardsGridProps {
 }
 
 interface RewardItemProps {
-  amount: string;
-  decimals: number;
+  value: string;
   dataTestId: string;
   last?: boolean;
 }
 
-const DisplayReward = ({
-  reward,
-  decimals,
-}: {
-  reward: string;
-  decimals: number;
-}) => {
+const DisplayReward = ({ reward }: { reward: string }) => {
+  const {
+    appState: { decimals },
+  } = useAppState();
+
   if (Number(reward) === 0) {
     return <span className="text-vega-dark-300">-</span>;
   }
@@ -35,16 +33,11 @@ const DisplayReward = ({
   );
 };
 
-const RewardItem = ({
-  amount,
-  decimals,
-  dataTestId,
-  last,
-}: RewardItemProps) => (
+const RewardItem = ({ value, dataTestId, last }: RewardItemProps) => (
   <div data-testid={dataTestId} className={rowGridItemStyles(last)}>
     <div className="h-full w-5 absolute right-0 top-0 bg-gradient-to-r from-transparent to-black pointer-events-none" />
     <div className="overflow-auto p-5">
-      <DisplayReward reward={amount} decimals={decimals} />
+      <DisplayReward reward={value} />
     </div>
     <div className="h-full w-5 absolute left-0 top-0 bg-gradient-to-l from-transparent to-black pointer-events-none" />
   </div>
@@ -56,25 +49,15 @@ export const EpochTotalRewardsTable = ({
   return (
     <RewardsTable dataTestId="epoch-total-rewards-table" epoch={data.epoch}>
       {Array.from(data.assetRewards.values()).map(
-        ({ name, rewards, totalAmount, decimals }, i) => (
+        ({ name, rewards, totalAmount }, i) => (
           <div className="contents" key={i}>
             <div data-testid="asset" className={`${rowGridItemStyles()} p-5`}>
               {name}
             </div>
             {Array.from(rewards.values()).map(({ rewardType, amount }, i) => (
-              <RewardItem
-                key={i}
-                dataTestId={rewardType}
-                amount={amount}
-                decimals={decimals}
-              />
+              <RewardItem key={i} dataTestId={rewardType} value={amount} />
             ))}
-            <RewardItem
-              dataTestId="total"
-              amount={totalAmount}
-              decimals={decimals}
-              last={true}
-            />
+            <RewardItem dataTestId="total" value={totalAmount} last={true} />
           </div>
         )
       )}

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

@@ -56,14 +56,12 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               id: '1',
               name: 'Asset 1',
-              decimals: 18,
             },
           },
           {
             node: {
               id: '2',
               name: 'Asset 2',
-              decimals: 6,
             },
           },
         ],
@@ -103,7 +101,6 @@ describe('generateEpochAssetRewardsList', () => {
           {
             node: {
               epoch: 1,
-              decimals: 18,
               assetId: '1',
               rewardType: AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
               amount: '123',
@@ -131,7 +128,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 0,
                   name: '',
                   rewards: new Map([
                     [
@@ -166,10 +162,9 @@ describe('generateEpochAssetRewardsList', () => {
                       },
                     ],
                     [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                       {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                         amount: '0',
                       },
                     ],
@@ -200,14 +195,12 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               id: '1',
               name: 'Asset 1',
-              decimals: 18,
             },
           },
           {
             node: {
               id: '2',
               name: 'Asset 2',
-              decimals: 6,
             },
           },
         ],
@@ -218,7 +211,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
               amount: '123',
             },
@@ -227,7 +219,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
               amount: '100',
             },
@@ -236,8 +227,7 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 2,
               assetId: '1',
-              decimals: 18,
-              rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
               amount: '5',
             },
           },
@@ -263,7 +253,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [
@@ -298,10 +287,9 @@ describe('generateEpochAssetRewardsList', () => {
                       },
                     ],
                     [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                       {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                         amount: '0',
                       },
                     ],
@@ -329,7 +317,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [
@@ -364,10 +351,9 @@ describe('generateEpochAssetRewardsList', () => {
                       },
                     ],
                     [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                       {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                         amount: '5',
                       },
                     ],
@@ -398,14 +384,12 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               id: '1',
               name: 'Asset 1',
-              decimals: 18,
             },
           },
           {
             node: {
               id: '2',
               name: 'Asset 2',
-              decimals: 6,
             },
           },
         ],
@@ -416,7 +400,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES,
               amount: '123',
             },
@@ -425,7 +408,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 1,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
               amount: '100',
             },
@@ -434,8 +416,7 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 2,
               assetId: '1',
-              decimals: 18,
-              rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
               amount: '6',
             },
           },
@@ -443,8 +424,7 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 2,
               assetId: '1',
-              decimals: 18,
-              rewardType: AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+              rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
               amount: '27',
             },
           },
@@ -452,7 +432,6 @@ describe('generateEpochAssetRewardsList', () => {
             node: {
               epoch: 3,
               assetId: '1',
-              decimals: 18,
               rewardType: AccountType.ACCOUNT_TYPE_FEES_INFRASTRUCTURE,
               amount: '15',
             },
@@ -485,7 +464,6 @@ describe('generateEpochAssetRewardsList', () => {
                 {
                   assetId: '1',
                   name: 'Asset 1',
-                  decimals: 18,
                   rewards: new Map([
                     [
                       AccountType.ACCOUNT_TYPE_GLOBAL_REWARD,
@@ -519,10 +497,9 @@ describe('generateEpochAssetRewardsList', () => {
                       },
                     ],
                     [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                       {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                         amount: '33',
                       },
                     ],
@@ -550,7 +527,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [
@@ -585,10 +561,9 @@ describe('generateEpochAssetRewardsList', () => {
                       },
                     ],
                     [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                       {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                         amount: '0',
                       },
                     ],
@@ -628,7 +603,6 @@ describe('generateEpochAssetRewardsList', () => {
                 '1',
                 {
                   assetId: '1',
-                  decimals: 18,
                   name: 'Asset 1',
                   rewards: new Map([
                     [
@@ -663,10 +637,9 @@ describe('generateEpochAssetRewardsList', () => {
                       },
                     ],
                     [
-                      AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                      AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                       {
-                        rewardType:
-                          AccountType.ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES,
+                        rewardType: AccountType.ACCOUNT_TYPE_FEES_LIQUIDITY,
                         amount: '0',
                       },
                     ],

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

@@ -22,7 +22,6 @@ export type AggregatedEpochRewardSummary = {
   name: EpochSummaryWithNamedReward['name'];
   rewards: Map<RewardType, RewardItem>;
   totalAmount: string;
-  decimals: number;
 };
 
 export type EpochTotalSummary = {
@@ -92,7 +91,6 @@ export const generateEpochTotalRewardsList = ({
         assetId: reward.assetId,
         name: matchingAsset?.name || '',
         rewards: rewards || new Map(emptyRowAccountTypes),
-        decimals: matchingAsset?.decimals || 0,
         totalAmount: (
           Number(reward.amount) + Number(assetWithRewards?.totalAmount || 0)
         ).toString(),

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

@@ -4,7 +4,6 @@ fragment RewardFields on Reward {
     id
     symbol
     name
-    decimals
   }
   party {
     id
@@ -68,7 +67,6 @@ query EpochAssetsRewards(
       node {
         id
         name
-        decimals
       }
     }
   }