chore: tidy imports

Co-authored-by: Bartłomiej Głownia <bglownia@gmail.com>

.github/ISSUE_TEMPLATE/chore.md

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

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

@@ -0,0 +1,82 @@
+name: After Release
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  after-release:
+    runs-on: ubuntu-22.04
+    timeout-minutes: 30
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - 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 "Name: ${{ github.event.release.name }}"
+          echo "Description: ${{ github.event.release.body }}"
+          echo "Tag: ${{ github.event.release.tag_name }}"
+          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
+          echo "Commit: $commit"
+          until docker pull vegaprotocol/trading:$commit; do
+            echo "Image not pushed yet, waiting 60 seconds"
+            sleep 60
+          done
+          docker run --rm vegaprotocol/trading:$commit cat /ipfs-hash > ipfs-hash
+          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
+          tar -xzf kubo.tgz
+          export PATH="$PATH:$PWD/kubo"
+          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
+            The 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/branch-length.yml

@@ -0,0 +1,16 @@
+name: 'Check if branch is shorter than 52 chars'
+on: pull_request
+
+jobs:
+  branch-naming-rules:
+    runs-on: ubuntu-latest
+    steps:
+      # echo "branches that are longer than 51 chars can't be parsed by kubernetes to create previews. Each app has prefix of it's name like: 'governance-' (12 chars), what leaves 51 max branch length"
+      # current parsable length: $( git rev-parse --abbrev-ref HEAD | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | wc -c)
+      - uses: deepakputhraya/action-branch-name@master
+        with:
+          # regex: '([a-z])+\/([a-z])+' # Regex the branch should match. This example enforces grouping
+          # allowed_prefixes: 'feature,stable,fix' # All branches should start with the given prefix
+          # ignore: master,develop # Ignore exactly matching branch names from convention
+          min_length: 1 # Min length of the branch name
+          max_length: 51 # Max length of the branch name

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

@@ -5,6 +5,7 @@ on:
     branches:
       - release/*
       - develop
+      - main
   pull_request:
     types:
       - opened
@@ -50,7 +51,7 @@ jobs:
     secrets: inherit
 
   lint-test-build:
-    timeout-minutes: 35
+    timeout-minutes: 60
     needs: node-modules
     runs-on: ubuntu-22.04
     name: '(CI) lint + unit test + build'
@@ -96,46 +97,79 @@ 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 Version: $nx_version"
           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)"
-          echo -n "Affected projects: $affected"
-
-          branch_slug="$(echo ${{ github.head_ref || github.ref_name }} | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g )"
           projects_e2e=""
           preview_governance="not deployed"
           preview_trading="not deployed"
           preview_explorer="not deployed"
+          preview_tools="not deployed"
+          if echo "$affected" | grep -q governance; then
+            echo "Governance is affected"
+            projects_e2e+='"governance-e2e" '
+            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
+          fi
+          if echo "$affected" | grep -q trading; then
+            echo "Trading is affected"
+            projects_e2e+='"trading-e2e" '
+            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+          fi
+          if echo "$affected" | grep -q explorer; then
+            echo "Explorer is affected"
+            projects_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
+          projects="$(echo $projects_e2e | sed 's|-e2e||g')"
+          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
+            if echo "$affected" | grep -q multisig-signer; then
+              echo "Tools are affected"
+              # tools are only applicable to check previews or deploy from develop to mainnet
+              echo "Deploying tools on preview"
+              preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
+              projects+=' "multisig-signer" '
             fi
-            if [[ $affected == *"trading"* ]]; then
-              projects_e2e+='"trading-e2e" '
-              preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
+          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
+            if echo "$affected" | grep -q multisig-signer; then
+              echo "Tools are affected"
+              # tools are only applicable to check previews or deploy from develop to mainnet
+              echo "Deploying tools on s3"
+              projects+=' "multisig-signer" '
             fi
-            if [[ $affected == *"explorer"* ]]; then
-              projects_e2e+='"explorer-e2e" '
-              preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
+            if echo "$affected" | grep -q static; then
+              echo "static is affected"
+              echo "Deploying static on s3"
+              projects+=' "static" '
+            fi
+            if echo "$affected" | grep -q ui-toolkit; then
+              echo "ui-toolkit is affected"
+              echo "Deploying ui-toolkit on s3"
+              projects+=' "ui-toolkit" '
             fi
           fi
+
           projects_e2e=${projects_e2e%?}
           projects_e2e=[${projects_e2e// /,}]
+          projects=[${projects// /,}]
           echo PROJECTS_E2E=$projects_e2e >> $GITHUB_ENV
-          echo PROJECTS=$(echo $projects_e2e | sed 's|-e2e||g') >> $GITHUB_ENV
+          echo PROJECTS=$projects >> $GITHUB_ENV
           echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
           echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
           echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
+          echo PREVIEW_TOOLS=$preview_tools >> $GITHUB_ENV
 
     outputs:
       projects: ${{ env.PROJECTS }}
@@ -143,11 +177,12 @@ jobs:
       preview_governance: ${{ env.PREVIEW_GOVERNANCE }}
       preview_trading: ${{ env.PREVIEW_TRADING }}
       preview_explorer: ${{ env.PREVIEW_EXPLORER }}
+      preview_tools: ${{ env.PREVIEW_TOOLS }}
 
   cypress:
     needs: lint-test-build
     name: '(CI) cypress'
-    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
@@ -169,6 +204,7 @@ jobs:
       - publish-dist
       - lint-test-build
     if: ${{ github.event_name == 'pull_request' }}
+    timeout-minutes: 60
     name: '(CD) comment preview links'
     steps:
       - name: Find Comment
@@ -178,6 +214,35 @@ jobs:
           issue-number: ${{ github.event.pull_request.number }}
           body-includes: Previews
 
+      - name: Wait for deployments
+        run: |
+          # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
+          regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
+          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
+              echo "waiting for governance preview"
+              sleep 5
+            done
+          fi
+          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
+              echo "waiting for explorer preview"
+              sleep 5
+            done
+          fi
+          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
+              echo "waiting for trading preview"
+              sleep 5
+            done
+          fi
+          if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then
+            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
+              echo "waiting for tools preview"
+              sleep 5
+            done
+          fi
+
       - name: Create comment
         uses: peter-evans/create-or-update-comment@v3
         if: ${{ steps.fc.outputs.comment-id == 0 }}
@@ -188,16 +253,11 @@ jobs:
             * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
             * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
             * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
-
-  cypress-check:
-    name: '(CI) cypress - check'
-    runs-on: ubuntu-latest
-    needs: cypress
-    steps:
-      - run: echo Done!
+            * tools: ${{ needs.lint-test-build.outputs.preview_tools }}
 
   # Report single result at the end, to avoid mess with required checks in PR
-  cypress-result:
+  cypress-check:
+    name: '(CI) cypress - check'
     if: ${{ always() }}
     needs: cypress
     runs-on: ubuntu-22.04

.github/workflows/cypress-live-test.yml

@@ -33,5 +33,4 @@ jobs:
           config: baseUrl=${{ github.event.inputs.url }}
           env: grepTags=@live
         env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/cypress-run.yml

@@ -20,7 +20,7 @@ jobs:
         project: ${{ fromJSON(inputs.projects) }}
     name: ${{ matrix.project }}
     runs-on: self-hosted-runner
-    timeout-minutes: 40
+    timeout-minutes: 100
     steps:
       # Checks if skip cache was requested
       - name: Set skip-nx-cache flag
@@ -66,7 +66,7 @@ jobs:
       ######
 
       - name: Run Cypress tests
-        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome --env.grepTags="${{ inputs.tags }}"
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }}  --browser chrome --env.grepTags="${{ inputs.tags }}"
         working-directory: frontend-monorepo
         env:
           CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
@@ -98,4 +98,4 @@ jobs:
         if: ${{ failure() }}
         with:
           name: test-report-${{ matrix.project }}
-          path: frontend-monorepo/apps/trading-e2e/cypress/reports
+          path: frontend-monorepo/apps/${{ matrix.project }}/cypress/reports

.github/workflows/process-tranches.yml

@@ -1,32 +0,0 @@
-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

@@ -30,13 +30,22 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - name: Log in to the Container registry
+      - name: Log in to the Container registry (ghcr)
+        if: ${{ github.event_name == 'pull_request' }}
         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
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        with:
+          # registry: registry.hub.docker.com
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
       - name: Setup node
         uses: actions/setup-node@v3
         with:
@@ -51,44 +60,68 @@ jobs:
           key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
 
       # https://docs.github.com/en/actions/learn-github-actions/contexts
-      - name: Define variables
+      - name: Define dist variables
+        if: ${{ github.event_name == 'push' }}
         run: |
           envName=''
-          dockerfile="dist.Dockerfile"
-          if [[ "${{ github.event_name }}" = "push" ]]; then
-            domain="vega.rocks"
-            if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-              envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
-              if [[ "${{ github.ref }}" =~ .*mainnet.* ]]; then
-                domain="vega.community"
-                if [[ "${{ matrix.app }}" = "trading" ]]; then
-                  dockerfile="ipfs.Dockerfile"
-                fi
-              fi
-            elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-              envName="stagnet3"
+          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"
+            if [[ "${{ matrix.app }}" = "multisig-signer" ]]; then
+              envName="mainnet"
+              bucketName="tools.vega.xyz"
             fi
-            bucketName="${{ matrix.app }}.${envName}.${domain}"
-            echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
+            if [[ "${{ matrix.app }}" = "static" ]]; then
+              envName="mainnet"
+              bucketName="static.vega.xyz"
+            fi
+            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
+              envName="mainnet"
+              bucketName="ui.vega.rocks"
+            fi
+          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
+            envName="mainnet"
           fi
-          nodeVersion=$(cat .nvmrc | head -n 1)
+
+          if [[ "${envName}" = "mainnet" ]]; then
+            domain="vega.xyz"
+            if [[ -z "${bucketName}" ]]; then
+              bucketName="${{ matrix.app }}.${domain}"
+            fi
+          elif [[ "${envName}" = "testnet" ]]; then
+            domain="fairground.wtf"
+            if [[ -z "${bucketName}" ]]; then
+              bucketName="${{ matrix.app }}.${domain}"
+            fi
+          fi
+
+          if [[ -z "${bucketName}" ]]; then
+            bucketName="${{ matrix.app }}.${envName}.${domain}"
+          fi
+
+          echo "bucket name: ${bucketName}"
+          echo "env name: ${envName}"
+
+          echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
           echo ENV_NAME=${envName} >> $GITHUB_ENV
-          echo NODE_VERSION=${nodeVersion} >> $GITHUB_ENV
-          echo DOCKERFILE=docker/${dockerfile} >> $GITHUB_ENV
 
       - name: Build local dist
-        if: ${{ env.DOCKERFILE != 'docker/ipfs.Dockerfile' }}
         run: |
           flags=""
           if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            if [[ "${{ env.ENV_NAME }}" != "ops-vega" ]]; then
-              flags="--env=${{ env.ENV_NAME }}"
-            fi
+            flags="--env=${{ env.ENV_NAME }}"
           fi
 
           if [ "${{ matrix.app }}" = "trading" ]; then
             yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
             DIST_LOCATION=dist/apps/trading/exported
+          elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
+            NODE_ENV=production yarn nx run ui-toolkit:build-storybook
+            DIST_LOCATION=dist/storybook/ui-toolkit
           else
             yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
             DIST_LOCATION=dist/apps/${{ matrix.app }}
@@ -98,62 +131,92 @@ jobs:
 
       - name: Build and export to local Docker
         id: docker_build
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ${{ env.DOCKERFILE }}
+          file: docker/node-outside-docker.Dockerfile
           load: true
           build-args: |
             APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
 
       - name: Image digest
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
+        if: ${{ github.event_name == 'pull_request' }}
         run: echo ${{ steps.docker_build.outputs.digest }}
 
       - name: Sanity check docker image
-        if: ${{ github.event_name == 'pull_request' || ( env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' ) }}
         run: |
           echo "Check ipfs-hash"
-          if [[ "${{ env.DOCKERFILE }}" = "docker/ipfs.Dockerfile" ]];  then
-            docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
-          fi
-
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
           echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree .'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'
 
-      - name: Copy dist to local filesystem
-        if: ${{ env.DOCKERFILE == 'docker/ipfs.Dockerfile' && github.event_name == 'push' }}
-        run: |
-          docker create --name=dist ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
-          docker cp dist:/usr/share/nginx/html dist
-
-          echo "check local dist files"
-          tree dist/html
-          mv dist/html dist-result
-
-      - name: Publish dist as docker image
+      - name: Publish dist as docker image (ghcr)
         uses: docker/build-push-action@v3
+        continue-on-error: true
+        id: ghcr-push
         if: ${{ github.event_name == 'pull_request' }}
         with:
           context: .
-          file: ${{ env.DOCKERFILE }}
+          file: docker/node-outside-docker.Dockerfile
           push: true
           build-args: |
             APP=${{ matrix.app }}
-            NODE_VERSION=${{ env.NODE_VERSION }}
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
 
+      - name: Publish dist as docker image (docker hub)
+        uses: docker/build-push-action@v3
+        continue-on-error: true
+        id: dockerhub-push
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            ENV_NAME=${{ env.ENV_NAME }}
+          tags: |
+            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
+            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+
+      - name: Publish dist as docker image (ghcr - retry)
+        uses: docker/build-push-action@v3
+        if: ${{ steps.ghcr-push.outcome == 'failure' }}
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            ENV_NAME=${{ env.ENV_NAME }}
+          tags: |
+            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:${{ github.event.pull_request.head.sha || github.sha }}
+
+      - name: Publish dist as docker image (docker hub - retry)
+        uses: docker/build-push-action@v3
+        if: ${{ steps.dockerhub-push.outcome == 'failure' }}
+        with:
+          context: .
+          file: docker/node-outside-docker.Dockerfile
+          push: true
+          build-args: |
+            APP=${{ matrix.app }}
+            ENV_NAME=${{ env.ENV_NAME }}
+          tags: |
+            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
+            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master
-        if: ${{ github.event_name == 'push' }}
+        # s3 releases are not happening for trading on mainnet - it's IPFS
+        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -169,3 +232,82 @@ jobs:
         with:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
+
+      - name: Trigger fleek deployment
+        # release to ipfs happens only on mainnet (represented by main branch) for trading
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        run: |
+          if echo ${{ github.ref }} | grep -q main; then
+            # display info about app
+            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+              -H "Content-Type: application/json" \
+              -d '{"query": "query{getSiteById(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id latestDeploy{id status}}}"}' \
+              https://api.fleek.co/graphql
+
+            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+              -H "Content-Type: application/json" \
+              -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
+              https://api.fleek.co/graphql
+
+          elif echo ${{ github.ref }} | grep -q release/testnet; then
+            # display info about app
+            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+              -H "Content-Type: application/json" \
+              -d '{"query": "query{getSiteById(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id latestDeploy{id status}}}"}' \
+              https://api.fleek.co/graphql
+
+            # trigger new deployment as base image is always set to vegaprotocol/trading:mainnet
+            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
+              -H "Content-Type: application/json" \
+              -d '{"query": "mutation{triggerDeploy(siteId:\"79baaeca-1952-4ae7-a256-f668cfc1d68e\"){id status}}"}' \
+              https://api.fleek.co/graphql
+          fi
+
+      - name: Check out ipfs-redirect
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+        uses: actions/checkout@v3
+        with:
+          repository: 'vegaprotocol/ipfs-redirect'
+          path: 'ipfs-redirect'
+          fetch-depth: '0'
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+
+      - name: Update interstitial page to point to the new console
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+        env:
+          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+        run: |
+          # set CID
+          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
+          tar -xzf kubo.tgz
+          export PATH="$PATH:$PWD/kubo"
+          which ipfs
+          new_hash=$(cat ${{ matrix.app }}-ipfs-hash)
+          new_cid=$(ipfs cid format -v 1 -b base32 $new_hash)
+
+          (
+            cd ipfs-redirect
+
+            # configure git
+            git status
+            cat .git/config
+            git config --global user.email "vega-ci-bot@vega.xyz"
+            git config --global user.name "vega-ci-bot"
+
+            # update CID files
+            if echo ${{ github.ref }} | grep -q main; then
+              echo $new_hash > cidv0-mainnet.txt
+              echo $new_cid > cidv1-mainnet.txt
+              git add cidv0-mainnet.txt cidv1-mainnet.txt
+            elif echo ${{ github.ref }} | grep -q release/testnet; then
+              echo $new_hash > cidv0-fairground.txt
+              echo $new_cid > cidv1-fairground.txt
+              git add cidv0-fairground.txt cidv1-fairground.txt
+            fi
+
+            # create commit
+            commit_msg="Automated hash update from ${{ github.ref }}"
+            git commit -m "$commit_msg"
+            git push -u origin "main"
+          )

.github/workflows/rollback-console.yml

@@ -0,0 +1,84 @@
+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

@@ -2,6 +2,7 @@
 
 # compiled output
 /dist
+/dist-result
 /tmp
 /out-tsc
 /tools/executors/**/*.js
@@ -48,4 +49,6 @@ cypress.env.json
 .next
 
 #cypress
-/apps/trading-e2e/cypress/reports/
+/apps/**/cypress/reports/
+/apps/**/cypress/downloads/
+/apps/**/fixtures/wallet/node**

.prettierignore

@@ -7,5 +7,4 @@ __generated___
 
 apps/static/src/assets/devnet-tranches.json
 apps/static/src/assets/mainnet-tranches.json
-apps/static/src/assets/stagnet3-tranches.json
 apps/static/src/assets/testnet-tranches.json

Makefile

@@ -0,0 +1,20 @@
+.PHONY: latest-release
+latest-release:
+	gh release list | head -n 1 | awk '{print $1}'
+
+.PHONY: show-latest-release
+show-latest-release:
+	gh release view `gh release list | head -n 1 | awk '{print $1}'`
+
+.PHONY: recalculate-ipfs
+recalculate-ipfs:
+	echo "ipfs hash inside the image"
+	docker run --rm ${TAG} cat /ipfs-hash
+	echo "recalculating ipfs hash"
+	docker run --rm ${TAG} ipfs add -r /usr/share/nginx/html
+
+.PHONY: eject-ipfs-hash
+unpack:
+	docker create --name=dist ${TAG}
+	docker cp dist:/usr/share/nginx/html dist
+	docker rm dist

README.md

@@ -103,25 +103,68 @@ In CI linting, formatting and also run. These checks can be seen in the [CI work
 
 Visit the [Nx Documentation](https://nx.dev/getting-started/intro) to learn more.
 
-# Docker & Vegacapsule
+# 🐋 Hosting a console
 
-## Docker
+To host a console there are two possible build scenarios for running the frontends: nx performed **outside** or **inside** docker build. For specific build instructions follow [build instructions](#build-instructions).
 
-The [Dockerfile](./dockerfiles) for running the frontends is pretty basic, merely building the application with the APP arg that is passed in and serving the application from [nginx](./nginx/nginx.conf). The only complexity that exists is that there is a script which allows the passing of run time environment variables to the containers. See configuration below for how to do this.
-
-You can build any of the containers locally with the following command:
-
-```bash
-docker build --dockerfile dockerfiles/Dockerfile.cra . --build-arg APP=[YOUR APP] --tag=[TAG]
-```
-
-In order to run a container:
+In order to run a container on port 3000:
 
 ```bash
 docker run -p 3000:80 [TAG]
 ```
 
-Images ending with `.dist` are to pack locally created transpiled HTML files into nginx container for non-compatible with yarn architectures like M1 Mac
+## Build instructions
+
+The [`docker`](./docker) subfolder has some docker configurations for easily setting up your own hosted version of console either for the web, or ready for pinning on IPFS
+
+### nx build outside the docker
+
+Packaging prepared dist into [`nginx`](https://hub.docker.com/_/nginx)([server configuration](./nginx/nginx.conf)) docker image involves building the application on docker host machine from source.
+
+As a prerequisite you need to perform build of `dist` directory and move its content for specific application to `dist-result` directory. Use following script to do it with a single command:
+
+```bash
+./docker/prepare-dist.sh
+```
+
+You can build any of the containers locally with the following command:
+
+```bash
+docker build --dockerfile docker/node-outside-docker.Dockerfile . --tag=[TAG]
+```
+
+### nx build inside the docker
+
+Using multistage dockerfile dist is compiled using [node](https://hub.docker.com/_/node) image and later packed to nginx as in [dist build](#dist-build) example.
+
+```bash
+docker build --build-arg APP=[YOUR APP] --build-arg NODE_VERSION=$(cat .nvmrc) --build-arg ENV_NAME=mainnet -t [TAG] -f docker/node-inside-docker.Dockerfile .
+```
+
+### Computing ipfs-hash of the build
+
+At the moment this feature is important only for `trading` (console) releases.
+
+Each docker build finishes with hash calculation for dist directory. Resulting hash is added to file named as `/ipfs-hash`. Once docker image is produced you can run following commad to display ipfs-hash:
+
+```bash
+make recalculate-ipfs TAG=vegaprotocol/trading:{YOUR_VERSION}
+```
+
+**updating hash:** recompiling dist directory (even if there are no changed to source code) results in different hash computed by ipfs command.
+
+### Verifying ipfs-hash of existing current application version
+
+An IPFS CID will be attached to every [release](https://github.com/vegaprotocol/frontend-monorepo/releases). If you are intending to pin an application on IPFS, you can check that your build matches by running the following steps:
+
+1. Show latest release by runnning: `make latest-release`. You need to configure [`gh`](https://cli.github.com/) for this step to work, otherwise please provide release manually from [github](https://github.com/vegaprotocol/frontend-monorepo/releases) or [dockerhub](https://hub.docker.com/r/vegaprotocol/trading)
+2. Set RELEASE environment variable to value that you want to validate: `export RELEASE=$(make latest-release)` or `export RELEASE=vXX.XX.XX`
+3. Set TAG environment variable to image that you want to validate: `export TAG=vegaprotocol/trading:$RELEASE`
+4. Download docker image with the desired release `docker pull $TAG`.
+5. Recalculate hash: `make recalculate-ipfs`
+6. You should see exactly same hash produced by ipfs command as one placed with the release notes: `make show-latest-release`
+7. If you want to extract dist from docker image to your local filesystem you can run following command: `make unpack`
+8. Now `dist` directory contains valid application build. **it is not possible to calculate same ipfs hash on files that are result of copy operation**
 
 ## Config
 

apps/explorer-e2e/.env

@@ -1,7 +1,6 @@
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
-NX_VEGA_URL=http://localhost:3028/query
+NX_VEGA_URL=http://localhost:3008/graphql
 NX_VEGA_ENV=CUSTOM
 NX_VEGA_CONFIG_URL=
 
@@ -18,4 +17,4 @@ NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
 
 CYPRESS_VEGA_WALLET_API_TOKEN=
-CYPRESS_VEGA_URL=http://localhost:3028/query
+CYPRESS_VEGA_URL=http://localhost:3008/graphql

apps/explorer-e2e/.env.devnet

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

apps/explorer-e2e/.env.mainnet

@@ -1,8 +1,7 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
-NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest
 

apps/explorer-e2e/.env.stagnet3

@@ -1,18 +0,0 @@
-# App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-
-# App flags
-NX_EXPLORER_ASSETS=1
-NX_EXPLORER_GENESIS=1
-NX_EXPLORER_GOVERNANCE=1
-NX_EXPLORER_MARKETS=1
-NX_EXPLORER_ORACLES=1
-NX_EXPLORER_TXS_LIST=0
-NX_EXPLORER_NETWORK_PARAMETERS=1
-NX_EXPLORER_PARTIES=1
-NX_EXPLORER_VALIDATORS=1

apps/explorer-e2e/.env.testnet

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

apps/explorer-e2e/cypress.config.js

@@ -1,10 +1,11 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-  projectId: 'et4snf',
+  reporter: '../../node_modules/cypress-mochawesome-reporter',
 
   e2e: {
     setupNodeEvents(on, config) {
+      require('cypress-mochawesome-reporter/plugin')(on);
       require('@cypress/grep/src/plugin')(config);
       return config;
     },
@@ -25,7 +26,7 @@ module.exports = defineConfig({
   },
   env: {
     environment: 'CUSTOM',
-    networkQueryUrl: 'http://localhost:3028/query',
+    networkQueryUrl: 'http://localhost:3008/graphql',
     ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
     commitHash: 'dev',
     tsConfig: 'tsconfig.json',

apps/explorer-e2e/src/fixtures/net_parameter_format_lookup.json

@@ -10,6 +10,8 @@
     "governance.proposal.updateMarket.minVoterBalance",
     "governance.proposal.updateNetParam.minProposerBalance",
     "governance.proposal.updateNetParam.minVoterBalance",
+    "governance.proposal.updateAsset.minProposerBalance",
+    "governance.proposal.updateAsset.minVoterBalance",
     "reward.staking.delegation.maxPayoutPerEpoch",
     "reward.staking.delegation.maxPayoutPerParticipant",
     "reward.staking.delegation.minimumValidatorStake",
@@ -19,9 +21,6 @@
     "validators.delegation.minAmount"
   ],
   "fiveDecimal": [
-    "governance.proposal.updateAsset.minProposerBalance",
-    "governance.proposal.updateAsset.minVoterBalance",
-    "governance.proposal.updateAsset.requiredParticipation",
     "market.fee.factors.infrastructureFee",
     "market.fee.factors.makerFee",
     "market.liquidity.bondPenaltyParameter",
@@ -77,6 +76,7 @@
     "governance.proposal.updateNetParam.requiredMajority",
     "governance.proposal.updateNetParam.requiredParticipation",
     "governance.proposal.updateMarket.minProposerEquityLikeShare",
+    "governance.proposal.updateAsset.requiredParticipation",
     "validators.vote.required"
   ],
   "duration": [

apps/explorer-e2e/src/integration/home.cy.js

@@ -9,21 +9,22 @@ context('Home Page', function () {
     it('should show connected environment stats', function () {
       const statTitles = {
         0: 'Status',
-        1: 'Block height',
-        2: 'Uptime',
-        3: 'Total nodes',
-        4: 'Total staked',
-        5: 'Backlog',
-        6: 'Trades / second',
-        7: 'Orders / block',
-        8: 'Orders / second',
-        9: 'Transactions / block',
-        10: 'Block time',
-        11: 'Time',
-        12: 'App',
-        13: 'Tendermint',
-        14: 'Up since',
-        15: 'Chain ID',
+        1: 'Epoch',
+        2: 'Block height',
+        3: 'Uptime',
+        4: 'Total nodes',
+        5: 'Total staked',
+        6: 'Backlog',
+        7: 'Trades / second',
+        8: 'Orders / block',
+        9: 'Orders / second',
+        10: 'Transactions / block',
+        11: 'Block time',
+        12: 'Time',
+        13: 'App',
+        14: 'Tendermint',
+        15: 'Up since',
+        16: 'Chain ID',
       };
 
       cy.get('[data-testid="stats-title"]')
@@ -31,42 +32,13 @@ context('Home Page', function () {
           cy.wrap($list).should('contain.text', statTitles[index]);
         })
         .then(($list) => {
-          cy.wrap($list).should('have.length', 16);
+          cy.wrap($list).should('have.length', 17);
         });
-
-      cy.get(statsValue).eq(0).should('contain.text', 'CONNECTED');
-      cy.get(statsValue).eq(1).should('not.be.empty');
-      cy.get(statsValue)
-        .eq(2)
-        .invoke('text')
-        .should('match', /\d+d \d+h \d+m \d+s/i);
-      cy.get(statsValue).eq(3).should('contain.text', '2');
-      cy.get(statsValue)
-        .eq(4)
-        .invoke('text')
-        .should('match', /\d+\.\d\d(?!\d)/i);
-      cy.get(statsValue).eq(5).should('contain.text', '0');
-      cy.get(statsValue).eq(6).should('contain.text', '0');
-      cy.get(statsValue).eq(7).should('contain.text', '0');
-      cy.get(statsValue).eq(8).should('contain.text', '0');
-      cy.get(statsValue).eq(9).should('not.be.empty');
-      cy.get(statsValue).eq(10).should('not.be.empty');
-      cy.get(statsValue).eq(11).should('not.be.empty');
-      cy.get(statsValue)
-        .eq(12)
-        .invoke('text')
-        .should('match', /v\d+\.\d+\.\d+/i);
-      cy.get(statsValue)
-        .eq(13)
-        .invoke('text')
-        .should('match', /\d+\.\d+\.\d+/i);
-      cy.get(statsValue).eq(14).should('not.be.empty');
-      cy.get(statsValue).eq(15).should('not.be.empty');
     });
 
     it('Block height should be updating', function () {
       cy.get(statsValue)
-        .eq(1)
+        .eq(2)
         .invoke('text')
         .then((blockHeightTxt) => {
           cy.get(statsValue)

apps/explorer-e2e/src/integration/network.cy.js

@@ -138,7 +138,7 @@ context('Network parameters page', { tags: '@smoke' }, function () {
       });
     });
 
-    it('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
+    it.skip('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
       cy.get_network_parameters().then((network_parameters) => {
         network_parameters = Object.entries(network_parameters);
         network_parameters.forEach((network_parameter) => {

apps/explorer-e2e/src/integration/node-switcher.cy.js

@@ -6,7 +6,7 @@ const customNodeBtn = 'custom-node';
 context.skip('Node switcher', { tags: '@regression' }, function () {
   beforeEach('visit home page', function () {
     cy.intercept('GET', 'https://static.vega.xyz/assets/capsule-network.json', {
-      hosts: ['http://localhost:3028/query'],
+      hosts: ['http://localhost:3008/graphql'],
     }).as('nodeData');
     cy.visit('/');
     cy.wait('@nodeData');

apps/explorer-e2e/src/integration/parties.cy.js

@@ -219,7 +219,7 @@ context.skip('Parties page', { tags: '@regression' }, function () {
           balance type asset {id symbol decimals}}}}}}}}';
       cy.request({
         method: 'POST',
-        url: `http://localhost:3028/query`,
+        url: `http://localhost:3008/graphql`,
         body: {
           query: mutation,
         },

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

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

apps/explorer/.env

@@ -1,13 +1,21 @@
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_NETWORKS='{"STAGNET1":"https://stagnet1.token.vega.xyz", "STAGNET3":"https://stagnet3.explorer.vega.xyz","VALIDATOR_TESTNET":"https://validator-testnet.fairground.wtf","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
-NX_VEGA_ENV=STAGNET3
-NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+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_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_BLOCK_EXPLORER=https://be.stagnet3.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_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
+NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega/releases/tag/
 
 # App flags
 NX_EXPLORER_ASSETS=1

apps/explorer/.env.capsule

@@ -4,14 +4,7 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_VEGA_EXPLORER_URL=/
 
 # App flags
-NX_EXPLORER_ASSETS=1
-NX_EXPLORER_GENESIS=1
-NX_EXPLORER_GOVERNANCE=1
-NX_EXPLORER_MARKETS=1
-NX_EXPLORER_ORACLES=1
 NX_EXPLORER_TXS_LIST=0
-NX_EXPLORER_NETWORK_PARAMETERS=1
-NX_EXPLORER_PARTIES=1
-NX_EXPLORER_VALIDATORS=1

apps/explorer/.env.devnet

@@ -5,7 +5,8 @@ NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-inter
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://dev.token.vega.xyz
+NX_VEGA_GOVERNANCE_URL=https://dev.governance.vega.xyz
 NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+NX_VEGA_EXPLORER_URL=/

apps/explorer/.env.mainnet

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

apps/explorer/.env.stagnet1

@@ -1,14 +1,2 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-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://stagnet1.explorer.vega.xyz
-NX_VEGA_TOKEN_URL=https://stagnet1.token.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_VEGA_GOVERNANCE_URL=https://stagnet1.token.vega.xyz
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+# .env is stagnet1, so there are no overrides required
+NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET1":"https://stagnet1.explorer.vega.xyz"}'

apps/explorer/.env.stagnet3

@@ -1,8 +0,0 @@
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.stagnet3.vega.xyz/websocket
-NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml
-NX_VEGA_ENV=STAGNET3
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-NX_VEGA_GOVERNANCE_URL=https://stagnet3.token.vega.xyz
-NX_VEGA_REPO_URL=https://github.com/vegaprotocol/vega-dev-releases/releases/
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

apps/explorer/.env.testnet

@@ -7,5 +7,7 @@ NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_GOVERNANCE_URL=https://token.fairground.wtf
-NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
+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.validators-testnet

@@ -7,7 +7,9 @@ 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_VEGA_GOVERNANCE_URL=https://validator-testnet.governance.vega.xyz
-NX_TENDERMINT_URL=https://tm-be.validators-testnet.vega.rocks
+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/

apps/explorer/.env.vegacapsule

@@ -5,3 +5,4 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
+NX_VEGA_EXPLORER_URL=/

apps/explorer/README.md

@@ -35,12 +35,11 @@ Example configurations are provided here:
 - [Devnet](./.env.devnet)
 - [Capsule](./.env.capsule)
 - [Testnet](./.env.testnet)
-- [Stagnet3](./.env.stagnet3)
 
 For convenience, you can boot the app injecting one of the configurations above by running:
 
 ```bash
-yarn nx run explorer:serve --env={env} # e.g. stagnet3
+yarn nx run explorer:serve --env={env} # e.g. stagnet1
 ```
 
 There are a few different configuration options offered for this app:

apps/explorer/project.json

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

apps/explorer/src/app/app.tsx

@@ -1,9 +1,19 @@
-import { NetworkLoader, useInitializeEnv } from '@vegaprotocol/environment';
+import {
+  AppFailure,
+  NetworkLoader,
+  NodeGuard,
+  NodeSwitcherDialog,
+  useEnvironment,
+  useInitializeEnv,
+  useNodeSwitcherStore,
+} from '@vegaprotocol/environment';
 import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-websocket-provider';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 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>
@@ -12,10 +22,25 @@ const splashLoading = (
 );
 
 function App() {
+  const { VEGA_URL } = useEnvironment();
+  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useNodeSwitcherStore(
+    (store) => [store.dialogOpen, store.setDialogOpen]
+  );
   return (
     <TendermintWebsocketProvider>
       <NetworkLoader cache={DEFAULT_CACHE_CONFIG}>
-        <RouterProvider router={router} fallbackElement={splashLoading} />
+        <NodeGuard
+          skeleton={<div>{t('Loading')}</div>}
+          failure={<AppFailure title={t(`Node: ${VEGA_URL} is unsuitable`)} />}
+        >
+          <Suspense fallback={splashLoading}>
+            <RouterProvider router={router} fallbackElement={splashLoading} />
+          </Suspense>
+        </NodeGuard>
+        <NodeSwitcherDialog
+          open={nodeSwitcherOpen}
+          setOpen={setNodeSwitcherOpen}
+        />
       </NetworkLoader>
     </TendermintWebsocketProvider>
   );

apps/explorer/src/app/components/asset-balance/asset-balance.tsx

@@ -6,6 +6,7 @@ export type AssetBalanceProps = {
   assetId: string;
   price: string;
   showAssetLink?: boolean;
+  showAssetSymbol?: boolean;
 };
 
 /**
@@ -16,18 +17,21 @@ const AssetBalance = ({
   assetId,
   price,
   showAssetLink = true,
+  showAssetSymbol = false,
 }: AssetBalanceProps) => {
-  const { data: asset } = useAssetDataProvider(assetId);
+  const { data: asset, loading } = useAssetDataProvider(assetId);
 
   const label =
-    asset && asset.decimals
+    !loading && asset && asset.decimals
       ? addDecimalsFormatNumber(price, asset.decimals)
       : price;
 
   return (
     <div className="inline-block">
       <span>{label}</span>{' '}
-      {showAssetLink && asset?.id ? <AssetLink assetId={assetId} /> : null}
+      {showAssetLink && asset?.id ? (
+        <AssetLink showAssetSymbol={showAssetSymbol} assetId={assetId} />
+      ) : null}
     </div>
   );
 };

apps/explorer/src/app/components/asset-balance/governance-asset-balance.tsx

@@ -13,11 +13,17 @@ const DEFAULT_DECIMALS = 18;
  * the governance asset first, which is set by a network parameter
  */
 const GovernanceAssetBalance = ({ price }: GovernanceAssetBalanceProps) => {
-  const { data } = useExplorerGovernanceAssetQuery();
+  const { data, loading } = useExplorerGovernanceAssetQuery();
 
-  if (data && data.networkParameter?.value) {
+  if (!loading && data && data.networkParameter?.value) {
     const governanceAssetId = data.networkParameter.value;
-    return <AssetBalance price={price} assetId={governanceAssetId} />;
+    return (
+      <AssetBalance
+        price={price}
+        showAssetSymbol={true}
+        assetId={governanceAssetId}
+      />
+    );
   } else {
     return (
       <div className="inline-block">

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

@@ -4,7 +4,7 @@ import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';

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

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

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

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

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

@@ -1,13 +1,21 @@
-import { NodeSwitcherDialog, useEnvironment } from '@vegaprotocol/environment';
+import {
+  useEnvironment,
+  useNodeSwitcherStore,
+} from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { ExternalLink, Link } from '@vegaprotocol/ui-toolkit';
-import { useMemo, useState } from 'react';
+import { Link, ExternalLink } 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();
-  const [nodeSwitcherOpen, setNodeSwitcherOpen] = useState(false);
+  const setNodeSwitcherOpen = useNodeSwitcherStore(
+    (store) => store.setDialogOpen
+  );
+
   const { screenSize } = useScreenDimensions();
   const showFullFeedbackLabel = useMemo(
     () => ['md', 'lg', 'xl', 'xxl', 'xxxl'].includes(screenSize),
@@ -15,56 +23,53 @@ export const Footer = () => {
   );
 
   return (
-    <>
-      <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">
-              <p data-testid="git-commit-hash">
-                {t('Version')}:{' '}
-                <Link
-                  href={
-                    GIT_ORIGIN_URL
-                      ? `${GIT_ORIGIN_URL}/commit/${GIT_COMMIT_HASH}`
-                      : undefined
-                  }
-                  target={GIT_ORIGIN_URL ? '_blank' : undefined}
-                >
-                  {GIT_COMMIT_HASH}
-                </Link>
-              </p>
-            </div>
-          )}
-
-          <div className="content-center flex pl-2 md:border-r border-neutral-700 dark:border-neutral-300 pr-4">
-            {VEGA_URL && <NodeUrl url={VEGA_URL} />}
-            <Link className="ml-2" onClick={() => setNodeSwitcherOpen(true)}>
-              {t('Change')}
-            </Link>
+    <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">
+      <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">
+            <p data-testid="git-commit-hash">
+              {t('Version')}:{' '}
+              <Link
+                href={
+                  GIT_ORIGIN_URL
+                    ? `${GIT_ORIGIN_URL}/commit/${GIT_COMMIT_HASH}`
+                    : undefined
+                }
+                target={GIT_ORIGIN_URL ? '_blank' : undefined}
+              >
+                {GIT_COMMIT_HASH}
+              </Link>
+            </p>
           </div>
+        )}
 
+        <div className="content-center flex pl-2 md:border-r border-neutral-700 dark:border-neutral-300 pr-4">
+          {VEGA_URL && <NodeUrl url={VEGA_URL} />}
+          <Link className="ml-2" onClick={() => setNodeSwitcherOpen(true)}>
+            {t('Change')}
+          </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>
-        </div>
-      </footer>
-      <NodeSwitcherDialog
-        open={nodeSwitcherOpen}
-        setOpen={setNodeSwitcherOpen}
-      />
-    </>
+        ) : null}
+      </div>
+      <div className="pl-2 align-center lg:align-right lg:flex lg:justify-end gap-2 align-middle lg:max-w-xs lg:ml-auto">
+        <RouteLink to={`/${Routes.DISCLAIMER}`} className="underline">
+          Disclaimer
+        </RouteLink>
+      </div>
+    </footer>
   );
 };
 
-const NodeUrl = ({ url }: { url: string }) => {
+export 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 (
-    <Link href={'https://' + nodeUrl} target="_blank">
-      {nodeUrl}
-    </Link>
-  );
+  return <span className="cursor-default">{nodeUrl}</span>;
 };

apps/explorer/src/app/components/header/header.spec.tsx

@@ -3,6 +3,7 @@ import { Header } from './header';
 import { MemoryRouter } from 'react-router-dom';
 
 jest.mock('@vegaprotocol/environment', () => ({
+  ...jest.requireActual('@vegaprotocol/environment'),
   NetworkSwitcher: () => (
     <div data-testid="network-switcher">NetworkSwitcher</div>
   ),

apps/explorer/src/app/components/links/asset-link/asset-link.tsx

@@ -43,7 +43,7 @@ export const AssetLink = ({
         if (asDialog) {
           open(assetId, e.target as HTMLElement);
         } else {
-          navigate(`${Routes.ASSETS}/${asset?.id}`);
+          navigate(`/${Routes.ASSETS}/${asset?.id}`);
         }
       }}
       {...props}

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

@@ -1,8 +1,9 @@
 import { t } from '@vegaprotocol/i18n';
-import type { MarketInfoWithData } from '@vegaprotocol/market-info';
-import { LiquidityInfoPanel } from '@vegaprotocol/market-info';
-import { LiquidityMonitoringParametersInfoPanel } from '@vegaprotocol/market-info';
+import type { MarketInfoWithData } from '@vegaprotocol/markets';
+import { PriceMonitoringBoundsInfoPanel } from '@vegaprotocol/markets';
 import {
+  LiquidityInfoPanel,
+  LiquidityMonitoringParametersInfoPanel,
   InstrumentInfoPanel,
   KeyDetailsInfoPanel,
   LiquidityPriceRangeInfoPanel,
@@ -12,119 +13,96 @@ import {
   RiskModelInfoPanel,
   RiskParametersInfoPanel,
   SettlementAssetInfoPanel,
-} from '@vegaprotocol/market-info';
-import { MarketInfoTable } from '@vegaprotocol/market-info';
-import { Link } from 'react-router-dom';
+} from '@vegaprotocol/markets';
+import { MarketInfoTable } from '@vegaprotocol/markets';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
+import isEqual from 'lodash/isEqual';
 
 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
   if (!market) return null;
 
-  const panels = [
-    {
-      title: t('Key details'),
-      content: <KeyDetailsInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Instrument'),
-      content: <InstrumentInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Settlement asset'),
-      content: <SettlementAssetInfoPanel market={market} noBorder={false} />,
-    },
-    {
-      title: t('Metadata'),
-      content: <MetadataInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Risk model'),
-      content: <RiskModelInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Risk parameters'),
-      content: <RiskParametersInfoPanel noBorder={false} market={market} />,
-    },
-    {
-      title: t('Risk factors'),
-      content: <RiskFactorsInfoPanel noBorder={false} market={market} />,
-    },
-    ...(market.priceMonitoringSettings?.parameters?.triggers || []).map(
-      (trigger, i) => ({
-        title: t(`Price monitoring trigger ${i + 1}`),
-        content: <MarketInfoTable noBorder={false} data={trigger} />,
-      })
-    ),
-    ...(market.data?.priceMonitoringBounds || []).map((trigger, i) => ({
-      title: t(`Price monitoring bound ${i + 1}`),
-      content: (
-        <>
-          <MarketInfoTable
-            noBorder={false}
-            data={{
-              maxValidPrice: trigger.maxValidPrice,
-              minValidPrice: trigger.minValidPrice,
-            }}
-            decimalPlaces={market.decimalPlaces}
-          />
-          <MarketInfoTable
-            noBorder={false}
-            data={{ referencePrice: trigger.referencePrice }}
-            decimalPlaces={
-              market.tradableInstrument.instrument.product.settlementAsset
-                .decimals
-            }
-          />
-        </>
-      ),
-    })),
-    {
-      title: t('Liquidity monitoring parameters'),
-      content: (
-        <LiquidityMonitoringParametersInfoPanel
-          noBorder={false}
-          market={market}
-        />
-      ),
-    },
-    {
-      title: t('Liquidity'),
-      content: <LiquidityInfoPanel market={market} noBorder={false} />,
-    },
-    {
-      title: t('Liquidity price range'),
-      content: (
-        <LiquidityPriceRangeInfoPanel market={market} noBorder={false} />
-      ),
-    },
-    {
-      title: t('Oracle'),
-      content: (
-        <OracleInfoPanel noBorder={false} market={market}>
-          <Link
-            className="text-xs hover:underline"
-            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForSettlementData.id}`}
-          >
-            {t('View settlement data oracle specification')}
-          </Link>
-          <Link
-            className="text-xs hover:underline"
-            to={`/oracles#${market.tradableInstrument.instrument.product.dataSourceSpecForTradingTermination.id}`}
-          >
-            {t('View termination oracle specification')}
-          </Link>
-        </OracleInfoPanel>
-      ),
-    },
-  ];
+  const settlementData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
+  const terminationData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+
+  const getSigners = (data: DataSourceDefinition) => {
+    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
+      const signers = data.sourceType.sourceType.signers || [];
+
+      return signers.map(({ signer }, i) => {
+        return (
+          (signer.__typename === 'ETHAddress' && signer.address) ||
+          (signer.__typename === 'PubKey' && signer.key)
+        );
+      });
+    }
+    return [];
+  };
+
+  const showTwoOracles = isEqual(
+    getSigners(settlementData),
+    getSigners(terminationData)
+  );
+
+  const headerClassName = 'font-alpha calt text-xl mt-4 border-b-2 pb-2';
 
   return (
-    <>
-      {panels.map((p) => (
-        <div key={p.title} className="mb-3">
-          <h2 className="font-alpha calt text-xl">{p.title}</h2>
-          {p.content}
-        </div>
+    <div>
+      <h2 className={headerClassName}>{t('Key details')}</h2>
+      <KeyDetailsInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Instrument')}</h2>
+      <InstrumentInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Settlement asset')}</h2>
+      <SettlementAssetInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Metadata')}</h2>
+      <MetadataInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Risk model')}</h2>
+      <RiskModelInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Risk parameters')}</h2>
+      <RiskParametersInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Risk factors')}</h2>
+      <RiskFactorsInfoPanel market={market} />
+      {(market.data?.priceMonitoringBounds || []).map((trigger, i) => (
+        <>
+          <h2 className={headerClassName}>
+            {t('Price monitoring bounds %s', [(i + 1).toString()])}
+          </h2>
+          <PriceMonitoringBoundsInfoPanel
+            market={market}
+            triggerIndex={i + 1}
+          />
+        </>
       ))}
-    </>
+      {(market.priceMonitoringSettings?.parameters?.triggers || []).map(
+        (trigger, i) => (
+          <>
+            <h2 className={headerClassName}>
+              {t('Price monitoring settings %s', [(i + 1).toString()])}
+            </h2>
+            <MarketInfoTable data={trigger} key={i} />
+          </>
+        )
+      )}
+      <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
+      <LiquidityMonitoringParametersInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity')}</h2>
+      <LiquidityInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
+      <LiquidityPriceRangeInfoPanel market={market} />
+      {showTwoOracles ? (
+        <>
+          <h2 className={headerClassName}>{t('Settlement oracle')}</h2>
+          <OracleInfoPanel market={market} type="settlementData" />
+          <h2 className={headerClassName}>{t('Termination oracle')}</h2>
+          <OracleInfoPanel market={market} type="termination" />
+        </>
+      ) : (
+        <>
+          <h2 className={headerClassName}>{t('Oracle')}</h2>
+          <OracleInfoPanel market={market} type="settlementData" />
+        </>
+      )}
+    </div>
   );
 };

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

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

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

@@ -9,7 +9,7 @@ import SizeInMarket from '../size-in-market/size-in-market';
 export interface DeterministicOrderDetailsProps {
   id: string;
   // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
-  version?: number;
+  version?: number | null;
 }
 
 export const wrapperClasses =
@@ -28,7 +28,7 @@ export const wrapperClasses =
  */
 const DeterministicOrderDetails = ({
   id,
-  version = 0,
+  version = null,
 }: DeterministicOrderDetailsProps) => {
   const { data, error } = useExplorerDeterministicOrderQuery({
     variables: { orderId: id, version },

apps/explorer/src/app/components/page-header/page-header.tsx

@@ -20,7 +20,7 @@ export const PageHeader = ({
   copy = false,
   className,
 }: PageHeaderProps) => {
-  const titleClasses = 'text-4xl xl:text-5xl uppercase font-alpha calt';
+  const titleClasses = 'text-xl uppercase font-alpha calt';
   return (
     <header className={className}>
       <span className={`${titleClasses} block`}>{prefix}</span>

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

@@ -3,7 +3,7 @@ import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { AgGridColumn } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
   VegaICellRendererParams,
   VegaValueFormatterParams,
@@ -12,7 +12,10 @@ import { useLayoutEffect, useMemo, useRef, useState } from 'react';
 import type { RowClickedEvent } from 'ag-grid-community';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
-import { NetworkParams, useNetworkParams } from '@vegaprotocol/react-helpers';
+import {
+  NetworkParams,
+  useNetworkParams,
+} from '@vegaprotocol/network-parameters';
 import { ProposalStateMapping } from '@vegaprotocol/types';
 import BigNumber from 'bignumber.js';
 import { DApp, TOKEN_PROPOSAL, useLinks } from '@vegaprotocol/environment';

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

@@ -1,14 +1,17 @@
+import { Icon } from '@vegaprotocol/ui-toolkit';
+
 // https://github.com/vegaprotocol/vega/blob/develop/core/blockchain/response.go
 export const ErrorCodes = new Map([
   [51, 'Transaction failed validation'],
   [60, 'Transaction could not be decoded'],
   [70, 'Error'],
+  [71, 'Partial success/error'],
   [80, 'Unknown command'],
   [89, 'Rejected as spam'],
   [0, 'Success'],
 ]);
 
-export const successCodes = new Set([0]);
+export const successCodes = new Set([0, 71]);
 
 interface ChainResponseCodeProps {
   code: number;
@@ -27,8 +30,13 @@ export const ChainResponseCode = ({
   error,
 }: ChainResponseCodeProps) => {
   const isSuccess = successCodes.has(code);
-
-  const icon = isSuccess ? '✅' : '❌';
+  const successColour =
+    code === 71 ? 'fill-vega-orange' : 'fill-vega-green-600';
+  const icon = isSuccess ? (
+    <Icon name="tick-circle" className={successColour} />
+  ) : (
+    <Icon name="cross" className="fill-vega-pink-600" />
+  );
   const label = ErrorCodes.get(code) || 'Unknown response code';
 
   // Hack for batches with many errors - see https://github.com/vegaprotocol/vega/issues/7245
@@ -36,7 +44,7 @@ export const ChainResponseCode = ({
     error && error.length > 100 ? error.replace(/,/g, ',\r\n') : error;
 
   return (
-    <div title={`Response code: ${code} - ${label}`} className="inline-block">
+    <div title={`Response code: ${code} - ${label}`} className=" inline-block">
       <span
         className="mr-2"
         aria-label={isSuccess ? 'Success' : 'Warning'}

apps/explorer/src/app/components/txs/details/proposal/signature-bundle/bundle-exists.tsx

@@ -30,7 +30,7 @@ export const BundleExists = ({
   // Note if this is wrong, the wrong decoder will be used which will give incorrect data
 
   return (
-    <div className="w-auto max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
+    <div className="w-auto h-10 max-w-lg border-2 border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
       <IconForBundleStatus status={status} />
       <h1 className="text-xl pb-1">
         {status === 'STATUS_ENABLED'

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

@@ -4,6 +4,7 @@ import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint
 import { TxDetailsShared } from './shared/tx-details-shared';
 import { TableCell, TableRow, TableWithTbody } from '../../table';
 import ProposalLink from '../../links/proposal-link/proposal-link';
+import { VoteIcon } from '../../vote-icon/vote-icon';
 
 interface TxProposalVoteProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -30,27 +31,22 @@ export const TxProposalVote = ({
     return <>{t('Awaiting Block Explorer transaction details')}</>;
   }
 
-  const vote = txData.command.voteSubmission.value ? '👍' : '👎';
+  const vote = txData.command.voteSubmission.value === 'VALUE_YES';
+
   return (
     <TableWithTbody className="mb-8" allowWrap={true}>
       <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Proposal ID')}</TableCell>
-        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
-      </TableRow>
       <TableRow modifier="bordered">
         <TableCell>{t('Proposal details')}</TableCell>
         <TableCell>
           <ProposalLink id={txData.command.voteSubmission.proposalId} />
         </TableCell>
       </TableRow>
-      <TableRow modifier="bordered">
-        <TableCell>{t('Proposal')}</TableCell>
-        <TableCell>{txData.command.voteSubmission.proposalId}</TableCell>
-      </TableRow>
       <TableRow modifier="bordered">
         <TableCell>{t('Vote')}</TableCell>
-        <TableCell>{vote}</TableCell>
+        <TableCell>
+          <VoteIcon vote={vote} />
+        </TableCell>
       </TableRow>
     </TableWithTbody>
   );

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

@@ -0,0 +1,56 @@
+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,11 +28,16 @@ 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 !!['newAsset', 'updateAsset'].filter((requiredIfExists) =>
-    has(proposal.terms, requiredIfExists)
+
+  return (
+    proposalsThatRequireBundles.filter((requiredIfExists) =>
+      has(proposal.terms, requiredIfExists)
+    ).length > 0
   );
 }
 
@@ -81,6 +86,7 @@ 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/components/txs/index.tsx

@@ -1,4 +1,3 @@
-export { TxList } from './tx-list';
 export { TxOrderType } from './tx-order-type';
 export { TxsInfiniteList } from './txs-infinite-list';
 export { TxsInfiniteListItem } from './txs-infinite-list-item';

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

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

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

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

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

@@ -1,14 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { TendermintUnconfirmedTransactionsResponse } from '../../routes/txs/tendermint-unconfirmed-transactions-response.d';
-
-interface TxsProps {
-  data: TendermintUnconfirmedTransactionsResponse | undefined;
-}
-
-export const TxList = ({ data }: TxsProps) => {
-  if (!data) {
-    return <div>{t('Awaiting transactions')}</div>;
-  }
-
-  return <div>{JSON.stringify(data, null, '  ')}</div>;
-};

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

@@ -1,5 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import type { components } from '../../../types/explorer';
+import { VoteIcon } from '../vote-icon/vote-icon';
 
 interface TxOrderTypeProps {
   orderType: string;
@@ -137,12 +138,15 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
   let type = displayString[orderType] || orderType;
 
   let colours =
-    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-150';
+    'text-white dark:text-white bg-vega-dark-150 dark:bg-vega-dark-250';
 
   // This will get unwieldy and should probably produce a different colour of tag
   if (type === 'Chain Event' && !!command?.chainEvent) {
     type = getLabelForChainEvent(command.chainEvent);
     colours = 'text-white dark-text-white bg-vega-pink dark:bg-vega-pink';
+  } else if (type === 'Validator Heartbeat') {
+    colours =
+      'text-white dark-text-white bg-vega-light-200 dark:bg-vega-dark-100';
   } else if (type === 'Proposal' || type === 'Governance Proposal') {
     if (command && !!command.proposalSubmission) {
       type = getLabelForProposal(command.proposalSubmission);
@@ -150,6 +154,17 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
     colours = 'text-black bg-vega-yellow';
   }
 
+  if (type === 'Vote on Proposal') {
+    return (
+      <VoteIcon
+        vote={command?.voteSubmission?.value === 'VALUE_YES'}
+        yesText="Proposal vote"
+        noText="Proposal vote"
+        useVoteColour={false}
+      />
+    );
+  }
+
   if (type === 'Vote on Proposal' || type === 'Vote Submission') {
     colours = 'text-black bg-vega-yellow';
   }

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

@@ -98,6 +98,6 @@ describe('Txs infinite list item', () => {
     expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
     expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
     expect(screen.getByTestId('tx-block')).toHaveTextContent('1');
-    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success: ✅');
+    expect(screen.getByTestId('tx-success')).toHaveTextContent('Success');
   });
 });

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

@@ -7,7 +7,7 @@ import { toHex } from '../search/detect-search';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import isNumber from 'lodash/isNumber';
 
-const TRUNCATE_LENGTH = 5;
+const TRUNCATE_LENGTH = 10;
 
 export const TxsInfiniteListItem = ({
   hash,
@@ -31,13 +31,13 @@ export const TxsInfiniteListItem = ({
   return (
     <div
       data-testid="transaction-row"
-      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10 py-2"
+      className="flex items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item grid grid-cols-10"
     >
       <div
-        className="text-sm col-span-10 xl:col-span-3 leading-none"
+        className="text-sm col-span-10 md:col-span-3 leading-none"
         data-testid="tx-hash"
       >
-        <span className="xl:hidden uppercase text-vega-dark-300">
+        <span className="md:hidden uppercase text-vega-dark-300">
           ID:&nbsp;
         </span>
         <TruncatedLink
@@ -48,10 +48,10 @@ export const TxsInfiniteListItem = ({
         />
       </div>
       <div
-        className="text-sm col-span-10 xl:col-span-3 leading-none"
+        className="text-sm col-span-10 md:col-span-3 leading-none"
         data-testid="pub-key"
       >
-        <span className="xl:hidden uppercase text-vega-dark-300">
+        <span className="md:hidden uppercase text-vega-dark-300">
           By:&nbsp;
         </span>
         <TruncatedLink
@@ -61,14 +61,14 @@ export const TxsInfiniteListItem = ({
           endChars={TRUNCATE_LENGTH}
         />
       </div>
-      <div className="text-sm col-span-5 xl:col-span-2 leading-none	flex items-center">
+      <div className="text-sm col-span-5 md:col-span-2 leading-none	flex items-center">
         <TxOrderType orderType={type} command={command} />
       </div>
       <div
-        className="text-sm col-span-3 xl:col-span-1 leading-none flex items-center"
+        className="text-sm col-span-3 md:col-span-1 leading-none flex items-center"
         data-testid="tx-block"
       >
-        <span className="xl:hidden uppercase text-vega-dark-300">
+        <span className="md:hidden uppercase text-vega-dark-300">
           Block:&nbsp;
         </span>
         <TruncatedLink
@@ -79,11 +79,11 @@ export const TxsInfiniteListItem = ({
         />
       </div>
       <div
-        className="text-sm col-span-2 xl:col-span-1 leading-none flex items-center"
+        className="text-sm col-span-2 md:col-span-1 leading-none flex items-center"
         data-testid="tx-success"
       >
-        <span className="xl:hidden uppercase text-vega-dark-300">
-          Success:&nbsp;
+        <span className="md:hidden uppercase text-vega-dark-300">
+          Success&nbsp;
         </span>
         {isNumber(code) ? (
           <ChainResponseCode code={code} hideLabel={true} />

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

@@ -64,9 +64,7 @@ describe('Txs infinite list', () => {
         error={Error('test error!')}
       />
     );
-    expect(
-      screen.getByText('Cannot fetch transaction: Error: test error!')
-    ).toBeInTheDocument();
+    expect(screen.getByText('Cannot fetch transaction')).toBeInTheDocument();
   });
 
   it('item renders data of n length into list of n length', () => {

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

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useEffect, useRef } from 'react';
 import { FixedSizeList as List } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 import { t } from '@vegaprotocol/i18n';
@@ -30,7 +30,7 @@ const NOOP = () => {};
 const Item = ({ index, style, isLoading, error }: ItemProps) => {
   let content;
   if (error) {
-    content = t(`Cannot fetch transaction: ${error}`);
+    content = t(`Cannot fetch transaction`);
   } else if (isLoading) {
     content = <Loader />;
   } else {
@@ -68,7 +68,18 @@ export const TxsInfiniteList = ({
   className,
 }: TxsInfiniteListProps) => {
   const { screenSize } = useScreenDimensions();
-  const isStacked = ['xs', 'sm', 'md', 'lg'].includes(screenSize);
+  const isStacked = ['xs', 'sm'].includes(screenSize);
+  const infiniteLoaderRef = useRef<InfiniteLoader>(null);
+  const hasMountedRef = useRef(false);
+
+  useEffect(() => {
+    if (hasMountedRef.current) {
+      if (infiniteLoaderRef.current) {
+        infiniteLoaderRef.current.resetloadMoreItemsCache(true);
+      }
+    }
+    hasMountedRef.current = true;
+  }, [loadMoreTxs]);
 
   if (!txs) {
     if (!areTxsLoading) {
@@ -95,21 +106,22 @@ export const TxsInfiniteList = ({
 
   return (
     <div className={className} data-testid="transactions-list">
-      <div className="xl:grid grid-cols-10 w-full mb-3 hidden text-vega-dark-300 uppercase">
+      <div className="lg:grid grid-cols-10 w-full mb-3 hidden text-vega-dark-300 uppercase">
         <div className="col-span-3">
-          <span className="hidden xl:inline">Transaction &nbsp;</span>
+          <span className="hidden xl:inline">{t('Transaction')} &nbsp;</span>
           <span>ID</span>
         </div>
-        <div className="col-span-3">Submitted By</div>
-        <div className="col-span-2">Type</div>
-        <div className="col-span-1">Block</div>
-        <div className="col-span-1">Success</div>
+        <div className="col-span-3">{t('Submitted By')}</div>
+        <div className="col-span-2">{t('Type')}</div>
+        <div className="col-span-1">{t('Block')}</div>
+        <div className="col-span-1">{t('Success')}</div>
       </div>
       <div data-testid="infinite-scroll-wrapper">
         <InfiniteLoader
           isItemLoaded={isItemLoaded}
           itemCount={itemCount}
           loadMoreItems={loadMoreItems}
+          ref={infiniteLoaderRef}
         >
           {({ onItemsRendered, ref }) => (
             <List

apps/explorer/src/app/components/txs/txs-per-block.tsx

@@ -1,5 +1,4 @@
 import { Routes } from '../../routes/route-names';
-import { RenderFetched } from '../render-fetched';
 import { TruncatedLink } from '../truncate/truncated-link';
 import { TxOrderType } from './tx-order-type';
 import { Table, TableRow, TableCell } from '../table';
@@ -9,7 +8,7 @@ import type { BlockExplorerTransactions } from '../../routes/types/block-explore
 import isNumber from 'lodash/isNumber';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import { getTxsDataUrl } from '../../hooks/use-txs-data';
-import { Loader } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';
 
 interface TxsPerBlockProps {
@@ -27,7 +26,7 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
   } = useFetch<BlockExplorerTransactions>(url);
 
   return (
-    <RenderFetched error={error} loading={loading} className="text-body-large">
+    <AsyncRenderer data={data} error={error} loading={!!loading}>
       {data && data.transactions.length > 0 ? (
         <div className="overflow-x-auto whitespace-nowrap mb-28">
           <Table>
@@ -95,6 +94,6 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
           label={t('0 transactions')}
         />
       )}
-    </RenderFetched>
+    </AsyncRenderer>
   );
 };

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

@@ -0,0 +1,50 @@
+import { render } from '@testing-library/react';
+import { VoteIcon } from './vote-icon';
+
+describe('Vote TX icon', () => {
+  it('should use the text For by default for yes votes', () => {
+    const yes = render(<VoteIcon vote={true} />);
+    expect(yes.getByTestId('label')).toHaveTextContent('For');
+  });
+
+  it('should use the yesText for yes votes if specified', () => {
+    const yes = render(<VoteIcon vote={true} yesText="Test" />);
+    expect(yes.getByTestId('label')).toHaveTextContent('Test');
+  });
+
+  it('should display the tick icon for yes votes', () => {
+    const no = render(<VoteIcon vote={true} />);
+    expect(no.getByRole('img')).toHaveAttribute(
+      'aria-label',
+      'tick-circle icon'
+    );
+  });
+
+  it('should use the text Against by default for no votes', () => {
+    const no = render(<VoteIcon vote={false} />);
+    expect(no.getByTestId('label')).toHaveTextContent('Against');
+  });
+
+  it('should use the noText for no votes if specified', () => {
+    const no = render(<VoteIcon vote={false} noText="Test" />);
+    expect(no.getByTestId('label')).toHaveTextContent('Test');
+  });
+
+  it('should display the delete icon for no votes', () => {
+    const no = render(<VoteIcon vote={false} />);
+    expect(no.getByRole('img')).toHaveAttribute('aria-label', 'delete icon');
+  });
+
+  it('useVoteColour prop can be used to override coloured background', () => {
+    const no = render(<VoteIcon vote={false} />);
+    expect(no.container.children[0]).toHaveClass('bg-vega-pink-550');
+
+    const monochromeNo = render(
+      <VoteIcon vote={false} useVoteColour={false} />
+    );
+    expect(monochromeNo.container.children[0]).not.toHaveClass(
+      'bg-vega-pink-550'
+    );
+    expect(monochromeNo.container.children[0]).toHaveClass('bg-vega-dark-200');
+  });
+});

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

@@ -0,0 +1,67 @@
+import { Icon } from '@vegaprotocol/ui-toolkit';
+import type { IconName } from '@vegaprotocol/ui-toolkit';
+
+export interface VoteIconProps {
+  // True is a yes vote, false is undefined or no vorte
+  vote: boolean;
+  // Defaults to 'For', but can be any text
+  yesText?: string;
+  // Defaults to 'Against', but can be any text
+  noText?: string;
+  // If set to false the background will not be coloured
+  useVoteColour?: boolean;
+}
+
+function getBgColour(useVoteColour: boolean, vote: boolean) {
+  if (useVoteColour === false) {
+    return 'bg-vega-dark-200';
+  }
+
+  return vote ? 'bg-vega-green-550' : 'bg-vega-pink-550';
+}
+
+function getFillColour(useVoteColour: boolean, vote: boolean) {
+  if (useVoteColour === false) {
+    return 'white';
+  }
+
+  return vote ? 'vega-green-300' : 'vega-pink-300';
+}
+
+function getTextColour(useVoteColour: boolean, vote: boolean) {
+  if (useVoteColour === false) {
+    return 'white';
+  }
+
+  return vote ? 'vega-green-200' : 'vega-pink-200';
+}
+
+/**
+ * Displays a lozenge with an icon representing the way a user voted for a proposal.
+ * The yes and no text can be overridden
+ *
+ * @returns
+ */
+export function VoteIcon({
+  vote,
+  useVoteColour = true,
+  yesText = 'For',
+  noText = 'Against',
+}: VoteIconProps) {
+  const label = vote ? yesText : noText;
+  const icon: IconName = vote ? 'tick-circle' : 'delete';
+  const bg = getBgColour(useVoteColour, vote);
+  const fill = getFillColour(useVoteColour, vote);
+  const text = getTextColour(useVoteColour, vote);
+
+  return (
+    <div
+      className={`voteicon inline-block my-1 py-1 px-2 py rounded-md text-white leading-one sm align-top ${bg}`}
+    >
+      <Icon name={icon} size={3} className={`mr-2 p-0 fill-${fill}`} />
+      <span className={`text-base text-${text}`} data-testid="label">
+        {label}
+      </span>
+    </div>
+  );
+}

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

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

apps/explorer/src/app/routes/blocks/id/block.spec.tsx

@@ -144,12 +144,12 @@ afterEach(() => {
 describe('Block', () => {
   it('renders error state if error is present', async () => {
     (useFetch as jest.Mock).mockReturnValue({
-      state: { data: null, loading: false, error: 'asd' },
+      state: { data: null, loading: false, error: new Error('asd') },
     });
     render(renderComponent());
 
     expect(screen.getByText(`BLOCK ${blockId}`)).toBeInTheDocument();
-    expect(screen.getByText('Error retrieving data')).toBeInTheDocument();
+    expect(screen.getByText('Something went wrong: asd')).toBeInTheDocument();
   });
 
   it('renders loading state if present', async () => {

apps/explorer/src/app/routes/blocks/id/block.tsx

@@ -1,4 +1,3 @@
-import React from 'react';
 import { Link, useParams } from 'react-router-dom';
 import { DATA_SOURCES } from '../../../config';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
@@ -12,9 +11,8 @@ import {
   TableCell,
 } from '../../../components/table';
 import { TxsPerBlock } from '../../../components/txs/txs-per-block';
-import { Button } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { Routes } from '../../route-names';
-import { RenderFetched } from '../../../components/render-fetched';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { NodeLink } from '../../../components/links';
@@ -34,7 +32,7 @@ const Block = () => {
   return (
     <section>
       <RouteTitle data-testid="block-header">{t(`BLOCK ${block}`)}</RouteTitle>
-      <RenderFetched error={error} loading={loading}>
+      <AsyncRenderer data={blockData} error={error} loading={!!loading}>
         <>
           <div className="grid grid-cols-2 gap-2 mb-8">
             <Link
@@ -123,7 +121,7 @@ const Block = () => {
             </>
           )}
         </>
-      </RenderFetched>
+      </AsyncRenderer>
     </section>
   );
 };

apps/explorer/src/app/routes/genesis/index.tsx

@@ -1,7 +1,7 @@
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import { RouteTitle } from '../../components/route-title';
-import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { DATA_SOURCES } from '../../config';
 import type { TendermintGenesisResponse } from './tendermint-genesis-response';
 import { useDocumentTitle } from '../../hooks/use-document-title';
@@ -10,21 +10,26 @@ const Genesis = () => {
   useDocumentTitle(['Genesis']);
 
   const {
-    state: { data: genesis, loading },
+    state: { data, loading, error },
   } = useFetch<TendermintGenesisResponse>(
     `${DATA_SOURCES.tendermintUrl}/genesis`
   );
-  if (!genesis?.result.genesis) {
-    if (loading) {
-      return <Loader />;
-    }
-    return null;
-  }
+
   return (
-    <section>
+    <>
       <RouteTitle data-testid="genesis-header">{t('Genesis')}</RouteTitle>
-      <SyntaxHighlighter data={genesis?.result.genesis} />
-    </section>
+      <AsyncRenderer
+        data={data}
+        error={error}
+        loading={!!loading}
+        loadingMessage={t('Loading genesis information...')}
+        errorMessage={t('Could not fetch genesis data')}
+      >
+        <section>
+          <SyntaxHighlighter data={data?.result.genesis} />
+        </section>
+      </AsyncRenderer>
+    </>
   );
 };
 

apps/explorer/src/app/routes/governance/proposals-page.tsx

@@ -1,6 +1,6 @@
 import { proposalsDataProvider } from '@vegaprotocol/proposals';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { ProposalsTable } from '../../components/proposals/proposals-table';
 import { RouteTitle } from '../../components/route-title';

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

@@ -1,5 +1,5 @@
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { useState } from 'react';
 import { useParams } from 'react-router-dom';
@@ -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/market-info';
+import { marketInfoWithDataProvider } from '@vegaprotocol/markets';
 import { PageTitle } from '../../components/page-helpers/page-title';
 
 export const MarketPage = () => {
@@ -49,6 +49,7 @@ export const MarketPage = () => {
         />
         <AsyncRenderer
           noDataMessage={t('This chain has no markets')}
+          errorMessage={t('Could not fetch market') + ' ' + marketId}
           data={data}
           loading={loading}
           error={error}

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

@@ -1,10 +1,10 @@
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { marketsProvider } from '@vegaprotocol/market-list';
+import { marketsProvider } from '@vegaprotocol/markets';
 import { RouteTitle } from '../../components/route-title';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/i18n';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 import { MarketsTable } from '../../components/markets/markets-table';
 
 export const MarketsPage = () => {

apps/explorer/src/app/routes/network-parameters/network-parameters.spec.tsx

@@ -1,5 +1,5 @@
 import { render, screen } from '@testing-library/react';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParametersTable } from './network-parameters';
 
 describe('NetworkParametersTable', () => {

apps/explorer/src/app/routes/network-parameters/network-parameters.tsx

@@ -13,14 +13,15 @@ import {
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
 import orderBy from 'lodash/orderBy';
-import { useNetworkParamsQuery } from '@vegaprotocol/react-helpers';
-import type { NetworkParamsQuery } from '@vegaprotocol/react-helpers';
+import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
 
 const PERCENTAGE_PARAMS = [
   'governance.proposal.asset.requiredMajority',
   'governance.proposal.asset.requiredParticipation',
+  'governance.proposal.updateAsset.requiredParticipation',
   'governance.proposal.freeform.requiredMajority',
   'governance.proposal.freeform.requiredParticipation',
   'governance.proposal.market.requiredMajority',
@@ -53,6 +54,8 @@ const BIG_NUMBER_PARAMS = [
   'governance.proposal.asset.minProposerBalance',
   'governance.proposal.market.minProposerBalance',
   'governance.proposal.market.minVoterBalance',
+  'governance.proposal.updateAsset.minProposerBalance',
+  'governance.proposal.updateAsset.minVoterBalance',
 ];
 
 export const NetworkParameterRow = ({

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

@@ -1,12 +1,13 @@
 import { render } from '@testing-library/react';
-import { OracleDetailsType } from './oracle-details-type';
-import type { SourceTypeName } from './oracle-details-type';
+import { OracleDetailsType, isInternalSourceType } from './oracle-details-type';
+import type { SourceType } from './oracle';
+import { PropertyKeyType } from '@vegaprotocol/types';
 
-function renderComponent(type: SourceTypeName) {
-  return <OracleDetailsType type={type} />;
+function renderComponent(type: SourceType) {
+  return <OracleDetailsType sourceType={type} />;
 }
 
-function renderWrappedComponent(type: SourceTypeName) {
+function renderWrappedComponent(type: SourceType) {
   return (
     <table>
       <tbody>{renderComponent(type)}</tbody>
@@ -14,19 +15,53 @@ function renderWrappedComponent(type: SourceTypeName) {
   );
 }
 
+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 SourceTypeName));
+    const res = render(renderComponent(null as unknown as SourceType));
     expect(res.container).toBeEmptyDOMElement();
   });
 
-  it('Renders Internal time for internal sources', () => {
-    const res = render(renderWrappedComponent('DataSourceDefinitionInternal'));
-    expect(res.getByText('Internal time')).toBeInTheDocument();
+  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 External data otherwise', () => {
-    const res = render(renderWrappedComponent('DataSourceDefinitionExternal'));
+    const s = mock('prices.external.vegaprotocol.builtin.');
+    expect(isInternalSourceType(s)).toEqual(false);
+    const res = render(renderWrappedComponent(s));
     expect(res.getByText('External data')).toBeInTheDocument();
   });
 });

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

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

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

@@ -1,4 +1,4 @@
-import { Loader, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { RouteTitle } from '../../../components/route-title';
 import { t } from '@vegaprotocol/i18n';
 import { useExplorerOracleSpecsQuery } from '../__generated__/Oracles';
@@ -8,7 +8,7 @@ import { useScrollToLocation } from '../../../hooks/scroll-to-location';
 import filter from 'recursive-key-filter';
 
 const Oracles = () => {
-  const { data, loading } = useExplorerOracleSpecsQuery();
+  const { data, loading, error } = useExplorerOracleSpecsQuery();
 
   useDocumentTitle(['Oracles']);
   useScrollToLocation();
@@ -16,28 +16,40 @@ const Oracles = () => {
   return (
     <section>
       <RouteTitle data-testid="oracle-specs-heading">{t('Oracles')}</RouteTitle>
-      {loading ? <Loader /> : null}
-      {data?.oracleSpecsConnection?.edges
-        ? data.oracleSpecsConnection.edges.map((o) => {
-            const id = o?.node.dataSourceSpec.spec.id;
-            if (!id) {
-              return null;
-            }
-            return (
-              <div id={id} key={id} className="mb-10">
-                <OracleDetails
-                  id={id}
-                  dataSource={o?.node}
-                  showBroadcasts={false}
-                />
-                <details>
-                  <summary className="pointer">JSON</summary>
-                  <SyntaxHighlighter data={filter(o, ['__typename'])} />
-                </details>
-              </div>
-            );
-          })
-        : null}
+      <AsyncRenderer
+        data={data}
+        loading={loading}
+        error={error}
+        loadingMessage={t('Loading oracle data...')}
+        errorMessage={t('Oracle data could not be loaded')}
+        noDataMessage={t('No oracles found')}
+        noDataCondition={(data) =>
+          !data?.oracleSpecsConnection?.edges ||
+          data.oracleSpecsConnection.edges?.length === 0
+        }
+      >
+        {data?.oracleSpecsConnection?.edges
+          ? data.oracleSpecsConnection.edges.map((o) => {
+              const id = o?.node.dataSourceSpec.spec.id;
+              if (!id) {
+                return null;
+              }
+              return (
+                <div id={id} key={id} className="mb-10">
+                  <OracleDetails
+                    id={id}
+                    dataSource={o?.node}
+                    showBroadcasts={false}
+                  />
+                  <details>
+                    <summary className="pointer">JSON</summary>
+                    <SyntaxHighlighter data={filter(o, ['__typename'])} />
+                  </details>
+                </div>
+              );
+            })
+          : null}
+      </AsyncRenderer>
     </section>
   );
 };

apps/explorer/src/app/routes/oracles/id/index.tsx

@@ -1,12 +1,11 @@
 import { RouteTitle } from '../../../components/route-title';
-import { RenderFetched } from '../../../components/render-fetched';
 import { truncateByChars } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import { useParams } from 'react-router-dom';
 import { useExplorerOracleSpecByIdQuery } from '../__generated__/Oracles';
 import { OracleDetails } from '../components/oracle';
-import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
+import { AsyncRenderer, SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import filter from 'recursive-key-filter';
 import { TruncateInline } from '../../../components/truncate/truncate';
 
@@ -27,7 +26,14 @@ export const Oracle = () => {
         {t(`Oracle `)}
         <TruncateInline startChars={5} endChars={5} text={id || '1'} />
       </RouteTitle>
-      <RenderFetched error={error} loading={loading}>
+      <AsyncRenderer
+        data={data}
+        error={error}
+        loading={loading}
+        noDataCondition={(data) => !data?.oracleSpec}
+        errorMessage={t('Could not load oracle data')}
+        loadingMessage={t('Loading oracle data...')}
+      >
         {data?.oracleSpec ? (
           <div id={id} key={id} className="mb-10">
             <OracleDetails
@@ -44,7 +50,7 @@ export const Oracle = () => {
         ) : (
           <span></span>
         )}
-      </RenderFetched>
+      </AsyncRenderer>
     </section>
   );
 };

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

@@ -0,0 +1,40 @@
+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/parties/id/Party-assets.graphql

@@ -48,6 +48,13 @@ query ExplorerPartyAssets($partyId: ID!) {
         }
         stakingSummary {
           currentStakeAvailable
+          linkings(pagination: { first: 100 }) {
+            edges {
+              node {
+                amount
+              }
+            }
+          }
         }
         accountsConnection {
           edges {

apps/explorer/src/app/routes/parties/id/__generated__/Party-assets.ts

@@ -10,7 +10,7 @@ export type ExplorerPartyAssetsQueryVariables = Types.Exact<{
 }>;
 
 
-export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
+export type ExplorerPartyAssetsQuery = { __typename?: 'Query', partiesConnection?: { __typename?: 'PartyConnection', edges: Array<{ __typename?: 'PartyEdge', node: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string, linkings: { __typename?: 'StakesConnection', edges?: Array<{ __typename?: 'StakeLinkingEdge', node: { __typename?: 'StakeLinking', amount: string } } | null> | null } }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } }, market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null } } | null> | null } | null } }> } | null };
 
 export const ExplorerPartyAssetsAccountsFragmentDoc = gql`
     fragment ExplorerPartyAssetsAccounts on AccountBalance {
@@ -64,6 +64,13 @@ export const ExplorerPartyAssetsDocument = gql`
         }
         stakingSummary {
           currentStakeAvailable
+          linkings(pagination: {first: 100}) {
+            edges {
+              node {
+                amount
+              }
+            }
+          }
         }
         accountsConnection {
           edges {

apps/explorer/src/app/routes/parties/id/accounts/index.tsx

@@ -0,0 +1,24 @@
+import { t } from '@vegaprotocol/i18n';
+import { useParams } from 'react-router-dom';
+import { toNonHex } from '../../../../components/search/detect-search';
+import { PageHeader } from '../../../../components/page-header';
+import { useDocumentTitle } from '../../../../hooks/use-document-title';
+
+import { PartyAccounts } from '../components/party-accounts';
+
+const PartyAccountsByAsset = () => {
+  const { party } = useParams<{ party: string }>();
+
+  useDocumentTitle(['Public keys', party || '-']);
+  const partyId = toNonHex(party ? party : '');
+
+  return (
+    <section>
+      <PageHeader title={t('Balances by asset')} />
+
+      <PartyAccounts partyId={partyId} />
+    </section>
+  );
+};
+
+export { PartyAccountsByAsset };

apps/explorer/src/app/routes/parties/id/components/party-accounts.tsx

@@ -1,32 +1,9 @@
-import { t } from '@vegaprotocol/i18n';
-import get from 'lodash/get';
-import AssetBalance from '../../../../components/asset-balance/asset-balance';
-import { AssetLink, MarketLink } from '../../../../components/links';
-import { Table, TableRow } from '../../../../components/table';
-import type * as Schema from '@vegaprotocol/types';
-import type { ExplorerPartyAssetsAccountsFragment } from '../__generated__/Party-assets';
-
-const accountTypeString: Record<Schema.AccountType, string> = {
-  ACCOUNT_TYPE_BOND: t('Bond'),
-  ACCOUNT_TYPE_EXTERNAL: t('External'),
-  ACCOUNT_TYPE_FEES_INFRASTRUCTURE: t('Fees (Infrastructure)'),
-  ACCOUNT_TYPE_FEES_LIQUIDITY: t('Fees (Liquidity)'),
-  ACCOUNT_TYPE_FEES_MAKER: t('Fees (Maker)'),
-  ACCOUNT_TYPE_GENERAL: t('General'),
-  ACCOUNT_TYPE_GLOBAL_INSURANCE: t('Global Insurance Pool'),
-  ACCOUNT_TYPE_GLOBAL_REWARD: t('Global Reward Pool'),
-  ACCOUNT_TYPE_INSURANCE: t('Insurance'),
-  ACCOUNT_TYPE_MARGIN: t('Margin'),
-  ACCOUNT_TYPE_PENDING_TRANSFERS: t('Pending Transfers'),
-  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: t('Reward - LP Fees received'),
-  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: t('Reward - Maker fees paid'),
-  ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: t('Reward - Maker fees received'),
-  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: t('Reward - Market proposers'),
-  ACCOUNT_TYPE_SETTLEMENT: t('Settlement'),
-};
+import { AccountManager } from '@vegaprotocol/accounts';
+import { useCallback } from 'react';
+import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
 
 interface PartyAccountsProps {
-  accounts: ExplorerPartyAssetsAccountsFragment[];
+  partyId: string;
 }
 
 /**
@@ -34,49 +11,22 @@ interface PartyAccountsProps {
  * probably do with sorting by asset, and then within asset, by type with general
  * appearing first and... tbd
  */
-export const PartyAccounts = ({ accounts }: PartyAccountsProps) => {
-  return (
-    <Table className="max-w-5xl min-w-fit">
-      <thead>
-        <TableRow modifier="bordered" className="font-mono">
-          <td>{t('Type')}</td>
-          <td>{t('Market')}</td>
-          <td className="text-right pr-2">{t('Balance')}</td>
-          <td>{t('Asset')}</td>
-        </TableRow>
-      </thead>
-      <tbody>
-        {accounts.map((account) => {
-          const m = get(account, 'market.tradableInstrument.instrument.name');
+export const PartyAccounts = ({ partyId }: PartyAccountsProps) => {
+  const { open: openAssetDetailsDialog } = useAssetDetailsDialogStore();
+  const onClickAsset = useCallback(
+    (assetId?: string) => {
+      assetId && openAssetDetailsDialog(assetId);
+    },
+    [openAssetDetailsDialog]
+  );
 
-          return (
-            <TableRow
-              key={`pa-${account.asset.id}-${account.type}`}
-              title={account.asset.name}
-              id={`${accountTypeString[account.type]} ${m ? ` - ${m}` : ''}`}
-            >
-              <td className="text-md">{accountTypeString[account.type]}</td>
-              <td className="text-md">
-                {account.market?.id ? (
-                  <MarketLink id={account.market?.id} />
-                ) : (
-                  <p>-</p>
-                )}
-              </td>
-              <td className="text-md text-right pr-2">
-                <AssetBalance
-                  assetId={account.asset.id}
-                  price={account.balance}
-                  showAssetLink={false}
-                />
-              </td>
-              <td className="text-md">
-                <AssetLink assetId={account.asset.id} />
-              </td>
-            </TableRow>
-          );
-        })}
-      </tbody>
-    </Table>
+  return (
+    <div className="block min-h-44 h-60 4 w-full border-red-800 relative">
+      <AccountManager
+        partyId={partyId}
+        onClickAsset={onClickAsset}
+        isReadOnly={true}
+      />
+    </div>
   );
 };

apps/explorer/src/app/routes/parties/id/components/party-block-accounts.tsx

@@ -0,0 +1,63 @@
+import { t } from '@vegaprotocol/i18n';
+import { useNavigate } from 'react-router-dom';
+import { Routes } from '../../../../routes/route-names';
+import { Button, Icon, Loader } from '@vegaprotocol/ui-toolkit';
+import { PartyBlock } from './party-block';
+import type { AccountFields } from '@vegaprotocol/accounts';
+
+export interface PartyBlockAccountProps {
+  partyId: string;
+  accountData: AccountFields[] | null;
+  accountLoading: boolean;
+  accountError?: Error;
+}
+
+/**
+ * Displays an overview of a party's assets. This uses existing data
+ * providers to structure the details by asset, rather than looking at
+ * it by account. The assumption is that this is a more natural way to
+ * get an idea of the assets and activity of a party.
+ */
+export const PartyBlockAccounts = ({
+  partyId,
+  accountData,
+  accountLoading,
+  accountError,
+}: PartyBlockAccountProps) => {
+  const navigate = useNavigate();
+
+  const shouldShowActionButton =
+    accountData && accountData.length > 0 && !accountLoading && !accountError;
+
+  const action = shouldShowActionButton ? (
+    <Button
+      size="sm"
+      onClick={() => navigate(`/${Routes.PARTIES}/${partyId}/assets`)}
+    >
+      {t('Show all')}
+    </Button>
+  ) : null;
+
+  return (
+    <PartyBlock title={t('Assets')} action={action}>
+      {accountData && accountData.length > 0 ? (
+        <p>
+          {accountData.length} {t('assets, including')}{' '}
+          {accountData
+            .map((a) => a.asset.symbol)
+            .slice(0, 3)
+            .join(', ')}
+        </p>
+      ) : accountLoading && !accountError ? (
+        <Loader size="small" />
+      ) : accountData && accountData.length === 0 ? (
+        <p>{t('No accounts found')}</p>
+      ) : (
+        <p>
+          <Icon className="mr-1" name="error" />
+          <span className="text-sm">{t('Could not load assets')}</span>
+        </p>
+      )}
+    </PartyBlock>
+  );
+};

apps/explorer/src/app/routes/parties/id/components/party-block-stake.tsx

@@ -0,0 +1,83 @@
+import { t } from '@vegaprotocol/i18n';
+import { useExplorerPartyAssetsQuery } from '../__generated__/Party-assets';
+import GovernanceAssetBalance from '../../../../components/asset-balance/governance-asset-balance';
+import {
+  Icon,
+  KeyValueTable,
+  KeyValueTableRow,
+  Loader,
+} from '@vegaprotocol/ui-toolkit';
+import { PartyBlock } from './party-block';
+import BigNumber from 'bignumber.js';
+
+export interface PartyBlockStakeProps {
+  partyId: string;
+  accountLoading: boolean;
+  accountError?: Error;
+}
+
+/**
+ * Displays an overview of a single party's staking balance, importantly maintaining'
+ * the same height before and after the details are loaded in.
+ *
+ * Unlike PartyBlockAccounts there is not action button in the title of this block as
+ * there is no page for it to link to currently. That's a future task.
+ */
+export const PartyBlockStake = ({
+  partyId,
+  accountLoading,
+  accountError,
+}: PartyBlockStakeProps) => {
+  const partyRes = useExplorerPartyAssetsQuery({
+    // Don't cache data for this query, party information can move quite quickly
+    fetchPolicy: 'network-only',
+    variables: { partyId: partyId },
+    skip: !partyId,
+  });
+
+  const p = partyRes.data?.partiesConnection?.edges[0].node;
+
+  const linkedLength = p?.stakingSummary?.linkings?.edges?.length;
+  const linkedStake =
+    linkedLength && linkedLength > 0
+      ? p?.stakingSummary?.linkings?.edges
+          ?.reduce((total, e) => {
+            return new BigNumber(total).plus(
+              new BigNumber(e?.node.amount || 0)
+            );
+          }, new BigNumber(0))
+          .toString()
+      : '0';
+
+  return (
+    <PartyBlock title={t('Staking')}>
+      {p?.stakingSummary.currentStakeAvailable ? (
+        <KeyValueTable>
+          <KeyValueTableRow noBorder={true}>
+            <div>{t('Available stake')}</div>
+            <div>
+              <GovernanceAssetBalance
+                price={p.stakingSummary.currentStakeAvailable}
+              />
+            </div>
+          </KeyValueTableRow>
+          <KeyValueTableRow noBorder={true}>
+            <div>{t('Active stake')}</div>
+            <div>
+              <GovernanceAssetBalance price={linkedStake || '0'} />
+            </div>
+          </KeyValueTableRow>
+        </KeyValueTable>
+      ) : accountLoading && !accountError ? (
+        <Loader size="small" />
+      ) : !accountError ? (
+        <p>{t('No staking balance')}</p>
+      ) : (
+        <p>
+          <Icon className="mr-1" name="error" />
+          <span className="text-sm">{t('Could not load stake details')}</span>
+        </p>
+      )}
+    </PartyBlock>
+  );
+};

apps/explorer/src/app/routes/parties/id/components/party-block.tsx

@@ -0,0 +1,24 @@
+import type { ReactNode } from 'react';
+
+export interface PartyBlockProps {
+  children: ReactNode;
+  title: string;
+  action?: ReactNode;
+}
+
+export function PartyBlock({ children, title, action }: PartyBlockProps) {
+  return (
+    <div className="border-2 min-h-[138px] border-solid border-vega-light-100 dark:border-vega-dark-200 p-5 mt-5">
+      <div
+        className="flex flex-col md:flex-row gap-1 justify-between content-start mb-2"
+        data-testid="page-title"
+      >
+        <h3 className="font-semibold text-lg">{title}</h3>
+
+        {action ? action : null}
+      </div>
+
+      {children}
+    </div>
+  );
+}

apps/explorer/src/app/routes/parties/id/index.tsx

@@ -1,24 +1,26 @@
-import { getNodes } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { useMemo } from 'react';
-import { useParams } from 'react-router-dom';
+import { useNavigate, useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
-import { Panel } from '../../../components/panel';
 import { toNonHex } from '../../../components/search/detect-search';
 import { useTxsData } from '../../../hooks/use-txs-data';
 import { TxsInfiniteList } from '../../../components/txs';
 import { PageHeader } from '../../../components/page-header';
-import { useExplorerPartyAssetsQuery } from './__generated__/Party-assets';
-import type { ExplorerPartyAssetsAccountsFragment } from './__generated__/Party-assets';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
-import GovernanceAssetBalance from '../../../components/asset-balance/governance-asset-balance';
-import { PartyAccounts } from './components/party-accounts';
+import { Icon, Intent, Notification, Splash } from '@vegaprotocol/ui-toolkit';
+import { aggregatedAccountsDataProvider } from '@vegaprotocol/accounts';
+import { PartyBlockStake } from './components/party-block-stake';
+import { PartyBlockAccounts } from './components/party-block-accounts';
+import { isValidPartyId } from './components/party-id-error';
+import { useDataProvider } from '@vegaprotocol/data-provider';
 
 const Party = () => {
   const { party } = useParams<{ party: string }>();
 
   useDocumentTitle(['Public keys', party || '-']);
+  const navigate = useNavigate();
+
   const partyId = toNonHex(party ? party : '');
   const { isMobile } = useScreenDimensions();
   const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
@@ -28,71 +30,72 @@ const Party = () => {
     filters,
   });
 
-  const partyRes = useExplorerPartyAssetsQuery({
-    // Don't cache data for this query, party information can move quite quickly
-    fetchPolicy: 'network-only',
-    variables: { partyId: partyId },
-    skip: !party,
+  const variables = useMemo(() => ({ partyId }), [partyId]);
+  const {
+    data: AccountData,
+    loading: AccountLoading,
+    error: AccountError,
+  } = useDataProvider({
+    dataProvider: aggregatedAccountsDataProvider,
+    variables,
   });
 
-  const p = partyRes.data?.partiesConnection?.edges[0].node;
-
-  const header = p?.id ? (
-    <PageHeader
-      title={p.id}
-      copy
-      truncateStart={visibleChars}
-      truncateEnd={visibleChars}
-    />
-  ) : (
-    <Panel>
-      <p>No data found for public key {party}</p>
-    </Panel>
-  );
-
-  const staking = (
-    <section>
-      {p?.stakingSummary?.currentStakeAvailable ? (
-        <div className="mt-4 leading-3">
-          <strong className="font-semibold">{t('Staking Balance: ')}</strong>
-          <GovernanceAssetBalance
-            price={p.stakingSummary.currentStakeAvailable}
-          />
-        </div>
-      ) : null}
-    </section>
-  );
-
-  const accounts = getNodes<ExplorerPartyAssetsAccountsFragment>(
-    p?.accountsConnection
-  );
+  if (!isValidPartyId(partyId)) {
+    return (
+      <div className="max-w-sm mx-auto">
+        <Notification
+          message={t('Invalid party ID')}
+          intent={Intent.Danger}
+          buttonProps={{
+            text: t('Go back'),
+            action: () => navigate(-1),
+            className: 'py-1',
+            size: 'sm',
+          }}
+        />
+      </div>
+    );
+  }
 
   return (
     <section>
-      <h1
-        className="font-alpha calt uppercase font-xl mb-4 text-vega-dark-100 dark:text-vega-light-100"
-        data-testid="parties-header"
-      >
-        {t('Public key')}
-      </h1>
-      {partyRes.data ? (
-        <>
-          {header}
-          <SubHeading>{t('Asset data')}</SubHeading>
-          {accounts ? <PartyAccounts accounts={accounts} /> : null}
-          {staking}
+      <PageHeader
+        title={partyId}
+        copy
+        truncateStart={visibleChars}
+        truncateEnd={visibleChars}
+      />
 
-          <SubHeading>{t('Transactions')}</SubHeading>
-          <TxsInfiniteList
-            hasMoreTxs={hasMoreTxs}
-            areTxsLoading={loading}
-            txs={txsData}
-            loadMoreTxs={loadTxs}
-            error={error}
-            className="mb-28"
-          />
-        </>
-      ) : null}
+      <div className="grid md:grid-flow-col grid-flow-row md:space-x-4 grid-cols-1 md:grid-cols-2 w-full">
+        <PartyBlockAccounts
+          accountError={AccountError}
+          accountLoading={AccountLoading}
+          accountData={AccountData}
+          partyId={partyId}
+        />
+        <PartyBlockStake
+          accountError={AccountError}
+          accountLoading={AccountLoading}
+          partyId={partyId}
+        />
+      </div>
+
+      <SubHeading>{t('Transactions')}</SubHeading>
+      {!error && txsData ? (
+        <TxsInfiniteList
+          hasMoreTxs={hasMoreTxs}
+          areTxsLoading={loading}
+          txs={txsData}
+          loadMoreTxs={loadTxs}
+          error={error}
+          className="mb-28"
+        />
+      ) : (
+        <Splash>
+          <Icon name="error" className="mr-1" />
+          &nbsp;{t('Could not load transaction list for party')}
+        </Splash>
+      )}
     </section>
   );
 };

apps/explorer/src/app/routes/parties/id/template.tsx

@@ -0,0 +1,7 @@
+import { Outlet } from 'react-router-dom';
+
+const PartiesSubPage = () => {
+  return <Outlet />;
+};
+
+export default PartiesSubPage;

apps/explorer/src/app/routes/pending/index.tsx

@@ -1,35 +0,0 @@
-import React from 'react';
-import { DATA_SOURCES } from '../../config';
-import type { TendermintUnconfirmedTransactionsResponse } from '../txs/tendermint-unconfirmed-transactions-response.d';
-import { TxList } from '../../components/txs';
-import { RouteTitle } from '../../components/route-title';
-import { t } from '@vegaprotocol/i18n';
-import { useFetch } from '@vegaprotocol/react-helpers';
-import { useDocumentTitle } from '../../hooks/use-document-title';
-
-const PendingTxs = () => {
-  const {
-    state: { data: unconfirmedTransactions },
-  } = useFetch<TendermintUnconfirmedTransactionsResponse>(
-    `${DATA_SOURCES.tendermintUrl}/unconfirmed_txs`
-  );
-
-  useDocumentTitle(['Pending transactions']);
-
-  return (
-    <section>
-      <RouteTitle data-testid="unconfirmed-transactions-header">
-        {t('Unconfirmed transactions')}
-      </RouteTitle>
-      <br />
-      <div>{t(`Number: ${unconfirmedTransactions?.result?.n_txs || 0}`)}</div>
-      <br />
-      <div>
-        <br />
-        <TxList data={unconfirmedTransactions} />
-      </div>
-    </section>
-  );
-};
-
-export { PendingTxs };

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

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

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

@@ -14,7 +14,6 @@ import { Block } from './blocks/id';
 import { Blocks } from './blocks/home';
 import { Tx } from './txs/id';
 import { TxsList } from './txs/home';
-import { PendingTxs } from './pending';
 import flags from '../config/flags';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
@@ -29,6 +28,8 @@ import compact from 'lodash/compact';
 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;
@@ -75,14 +76,43 @@ const partiesRoutes: Route[] = flags.parties
           },
           {
             path: ':party',
-            element: <PartySingle />,
-            handle: {
-              breadcrumb: (params: Params<string>) => (
-                <Link to={linkTo(Routes.PARTIES, params.party)}>
-                  {truncateMiddle(params.party as string)}
-                </Link>
-              ),
-            },
+            element: <Party />,
+
+            children: [
+              {
+                index: true,
+                element: <PartySingle />,
+                handle: {
+                  breadcrumb: (params: Params<string>) => (
+                    <Link to={linkTo(Routes.PARTIES, params.party)}>
+                      {truncateMiddle(params.party as string)}
+                    </Link>
+                  ),
+                },
+              },
+              {
+                path: 'assets',
+                element: <Party />,
+                handle: {
+                  breadcrumb: (params: Params<string>) => (
+                    <Link to={linkTo(Routes.PARTIES, params.party)}>
+                      {truncateMiddle(params.party as string)}
+                    </Link>
+                  ),
+                },
+                children: [
+                  {
+                    index: true,
+                    element: <PartyAccountsByAsset />,
+                    handle: {
+                      breadcrumb: () => {
+                        return t('Assets');
+                      },
+                    },
+                  },
+                ],
+              },
+            ],
           },
         ],
       },
@@ -237,17 +267,6 @@ export const routerConfig: Route[] = [
           breadcrumb: () => <Link to={Routes.TX}>{t('Transactions')}</Link>,
         },
         children: [
-          {
-            path: 'pending',
-            element: <PendingTxs />,
-            handle: {
-              breadcrumb: () => (
-                <Link to={linkTo(Routes.TX, 'pending')}>
-                  {t('Pending transactions')}
-                </Link>
-              ),
-            },
-          },
           {
             path: ':txHash',
             element: <Tx />,
@@ -317,6 +336,17 @@ export const routerConfig: Route[] = [
           },
         ],
       },
+      {
+        path: Routes.DISCLAIMER,
+        element: <Disclaimer />,
+        handle: {
+          name: t('Disclaimer'),
+          text: t('Disclaimer'),
+          breadcrumb: () => (
+            <Link to={Routes.DISCLAIMER}>{t('Disclaimer')}</Link>
+          ),
+        },
+      },
       ...partiesRoutes,
       ...assetsRoutes,
       ...genesisRoutes,

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

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

apps/explorer/src/app/routes/txs/id/tx-details.tsx

@@ -10,7 +10,7 @@ interface TxDetailsProps {
 
 export const txDetailsTruncateLength = 30;
 
-export const TxDetails = ({ txData, pubKey, className }: TxDetailsProps) => {
+export const TxDetails = ({ txData, pubKey }: TxDetailsProps) => {
   if (!txData) {
     return <>{t('Awaiting Block Explorer transaction details')}</>;
   }

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

@@ -28,6 +28,7 @@ import {
 } from '@vegaprotocol/environment';
 import classNames from 'classnames';
 import { NodeStatus, NodeStatusMapping } from '@vegaprotocol/types';
+import { PartyLink } from '../../components/links';
 
 type RateProps = {
   value: BigNumber | number | undefined;
@@ -191,7 +192,9 @@ export const ValidatorsPage = () => {
                       <KeyValueTable>
                         <KeyValueTableRow>
                           <div>{t('ID')}</div>
-                          <div className="break-all text-xs">{v.id}</div>
+                          <div className="break-all text-xs font-mono">
+                            {v.id}
+                          </div>
                         </KeyValueTableRow>
                         <KeyValueTableRow>
                           <div>{t('Status')}</div>
@@ -218,12 +221,14 @@ export const ValidatorsPage = () => {
                           </div>
                         </KeyValueTableRow>
                         <KeyValueTableRow>
-                          <div>{t('Public key')}</div>
-                          <div className="break-all text-xs">{v.pubkey}</div>
+                          <div>{t('Key')}</div>
+                          <div className="break-all text-xs">
+                            <PartyLink id={v.pubkey} />
+                          </div>
                         </KeyValueTableRow>
                         <KeyValueTableRow>
                           <div>{t('Ethereum address')}</div>
-                          <div className="break-all text-xs">
+                          <div className="break-all text-xs font-mono">
                             <EtherscanLink address={v.ethereumAddress} />{' '}
                             <CopyWithTooltip text={v.ethereumAddress}>
                               <button title={t('Copy address to clipboard')}>
@@ -234,7 +239,9 @@ export const ValidatorsPage = () => {
                         </KeyValueTableRow>
                         <KeyValueTableRow>
                           <div>{t('Tendermint public key')}</div>
-                          <div className="break-all text-xs">{v.tmPubkey}</div>
+                          <div className="break-all text-xs font-mono">
+                            {v.tmPubkey}
+                          </div>
                         </KeyValueTableRow>
 
                         <KeyValueTableRow>

apps/explorer/src/styles.css

@@ -1,3 +1,7 @@
+@import 'ag-grid-community/dist/styles/ag-grid.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham.css';
+@import 'ag-grid-community/dist/styles/ag-theme-balham-dark.css';
+
 /* You can add global styles to this file, and also import other style files */
 @tailwind base;
 @tailwind components;
@@ -11,3 +15,50 @@
 .react-markdown-container a:before {
   content: '🔗 ';
 }
+
+/* AG GRID - Do not edit without updating other global stylesheets for each app */
+
+.vega-ag-grid .ag-root-wrapper {
+  border: solid 0px;
+}
+
+.vega-ag-grid .ag-react-container {
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
+.vega-ag-grid .ag-cell,
+.vega-ag-grid .ag-full-width-row .ag-cell-wrapper.ag-row-group {
+  line-height: calc(min(var(--ag-line-height, 26px), 26px) - 4px);
+}
+
+.vega-ag-grid .ag-row,
+.vega-ag-grid .ag-cell {
+  border-width: 0;
+}
+
+/* Light variables */
+.ag-theme-balham {
+  --ag-background-color: theme(colors.white);
+  --ag-border-color: theme(colors.neutral[300]);
+  --ag-header-background-color: theme(colors.white);
+  --ag-odd-row-background-color: theme(colors.white);
+  --ag-header-column-separator-color: theme(colors.neutral[300]);
+  --ag-row-border-color: theme(colors.white);
+  --ag-row-hover-color: theme(colors.neutral[100]);
+}
+
+/* Dark variables */
+.ag-theme-balham-dark {
+  --ag-background-color: theme(colors.black);
+  --ag-border-color: theme(colors.neutral[700]);
+  --ag-header-background-color: theme(colors.black);
+  --ag-odd-row-background-color: theme(colors.black);
+  --ag-header-column-separator-color: theme(colors.neutral[600]);
+  --ag-row-border-color: theme(colors.black);
+  --ag-row-hover-color: theme(colors.neutral[800]);
+}
+
+.voteicon svg {
+  vertical-align: baseline;
+}