chore: remove check on changeable class name

Co-authored-by: Matthew Russell <mattrussell36@gmail.com>

.eslintignore

@@ -0,0 +1 @@
+node_modules

.eslintrc.json

@@ -1,7 +1,7 @@
 {
   "root": true,
   "ignorePatterns": ["**/*"],
-  "plugins": ["@nrwl/nx", "eslint-plugin-unicorn", "jsx-a11y", "jest"],
+  "plugins": ["@nx", "eslint-plugin-unicorn", "jsx-a11y", "jest"],
   "settings": {
     "jsx-a11y": {
       "components": {
@@ -18,7 +18,7 @@
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
       "extends": ["plugin:jsx-a11y/strict"],
       "rules": {
-        "@nrwl/nx/enforce-module-boundaries": [
+        "@nx/enforce-module-boundaries": [
           "error",
           {
             "enforceBuildableLibDependency": true,
@@ -51,12 +51,13 @@
             "ul": ["list"],
             "ol": ["list"]
           }
-        ]
+        ],
+        "no-console": ["error", { "allow": ["warn", "error"] }]
       }
     },
     {
       "files": ["*.ts", "*.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript"],
+      "extends": ["plugin:@nx/typescript"],
       "rules": {
         "@typescript-eslint/ban-ts-comment": [
           "error",
@@ -80,14 +81,19 @@
     },
     {
       "files": ["*.spec.ts", "*.spec.tsx"],
-      "extends": ["plugin:@nrwl/nx/typescript", "plugin:jest/recommended"],
+      "extends": ["plugin:@nx/typescript", "plugin:jest/recommended"],
       "rules": {
-        "jest/consistent-test-it": ["error", { "fn": "it" }]
+        "jest/consistent-test-it": [
+          "error",
+          {
+            "fn": "it"
+          }
+        ]
       }
     },
     {
       "files": ["*.js", "*.jsx"],
-      "extends": ["plugin:@nrwl/nx/javascript"],
+      "extends": ["plugin:@nx/javascript"],
       "rules": {}
     }
   ]

.github/ISSUE_TEMPLATE/feature-epic.md

@@ -0,0 +1,28 @@
+---
+name: Feature Epic
+about: A template to capture and scope user requirements, high level process, and basic mockups for an upcoming feature as part of the initial core spec review process.
+title: 'Epic: '
+labels: feature-epic
+---
+
+## Core Feature
+
+<Name>
+
+## Tasks
+
+- [ ] Define high level requirements
+- [ ] Create basic mockups
+- [ ] Update "API Requirements" in core spec
+- [ ] Update "User-Interface Spec" in relevant front end repo
+- [ ] Create detailed user stories using normal template
+
+## High Level Requirements
+
+## Basic Mockups
+
+## Link to API Requirements in Core spec
+
+## Link to User Interface Specs
+
+## Linked User Stories

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

@@ -7,7 +7,7 @@ on:
 jobs:
   after-release:
     runs-on: ubuntu-22.04
-    timeout-minutes: 30
+    timeout-minutes: 45
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -30,18 +30,20 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
+      - name: Wait for publish to complete
+        uses: lewagon/wait-on-check-action@v1.3.1
+        with:
+          ref: ${{ github.event.release.tag_name }}
+          check-name: '(CD) publish dist / trading'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 10
+
       - 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
+          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
           curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
           tar -xzf kubo.tgz
           export PATH="$PATH:$PWD/kubo"

.github/workflows/add_issue_new_projects.yml

@@ -6,7 +6,7 @@ name: 'Add Issues To Project Board'
     types:
       - opened
 env:
-  GH_TOKEN: ${{ secrets.GH_NEW_CARD_TO_PROJECT }}
+  GH_TOKEN: ${{ secrets.PROJECT_MANAGE_ACTION }}
   PROJECT_ID: ${{ secrets.FRONT_END_PROJECT_ID }}
   ISSUE_ID: ${{ github.event.issue.node_id }}
   USER: ${{ github.actor }}

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

@@ -5,8 +5,7 @@ on:
     branches:
       - release/*
       - develop
-      - main
-  pull_request_target:
+  pull_request:
     types:
       - opened
       - ready_for_review
@@ -82,6 +81,22 @@ jobs:
         with:
           main-branch-name: develop
 
+      # See affected apps
+      - name: See affected apps
+        run: |
+          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 )"
+          python3 tools/ci/check-affected.py --github-ref="${{ github.ref }}" --branch-slug="$branch_slug" --event-name="${{ github.event_name }}"
+
+      - name: Verify script result
+        run: |
+          echo "Check outputs from script"
+          echo "projects: ${{ env.PROJECTS }}"
+          echo "projects-e2e: ${{ env.PROJECTS_E2E }}"
+          echo "preview_governance: ${{ env.PREVIEW_GOVERNANCE }}"
+          echo "preview_trading: ${{ env.PREVIEW_TRADING }}"
+          echo "preview_explorer: ${{ env.PREVIEW_EXPLORER }}"
+          echo "preview_tools: ${{ env.PREVIEW_TOOLS }}"
+
       - name: Check formatting
         run: yarn nx format:check
 
@@ -97,83 +112,6 @@ jobs:
       - name: Build affected
         run: yarn nx affected:build || (yarn install && yarn nx affected:build)
 
-      # See affected apps
-      - name: See affected apps
-        run: |
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
-          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
-
-          echo ">>>> debug"
-          echo "NX_BASE: ${{ env.NX_BASE }}"
-          echo "NX_HEAD: ${{ env.NX_HEAD }}"
-          echo "Affected: ${affected}"
-          echo "Branch slug: ${branch_slug}"
-          echo ">>>> eof debug"
-
-          projects_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")
-          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
-          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 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=$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 }}
       projects-e2e: ${{ env.PROJECTS_E2E }}
@@ -182,10 +120,19 @@ jobs:
       preview_explorer: ${{ env.PREVIEW_EXPLORER }}
       preview_tools: ${{ env.PREVIEW_TOOLS }}
 
+  console-e2e:
+    needs: lint-test-build
+    name: '(CI) console python'
+    uses: ./.github/workflows/console-test-run.yml
+    secrets: inherit
+    if: ${{ contains(fromJSON(needs.lint-test-build.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
+    with:
+      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
+
   cypress:
     needs: lint-test-build
     name: '(CI) cypress'
-    if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
+    # if: ${{ needs.lint-test-build.outputs.projects-e2e != '[]' }}
     uses: ./.github/workflows/cypress-run.yml
     secrets: inherit
     with:
@@ -195,7 +142,7 @@ jobs:
   publish-dist:
     needs: lint-test-build
     name: '(CD) publish dist'
-    if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    if: ${{ (github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo') || github.event_name == 'push' }}
     uses: ./.github/workflows/publish-dist.yml
     secrets: inherit
     with:
@@ -206,7 +153,7 @@ jobs:
     needs:
       - publish-dist
       - lint-test-build
-    if: ${{ github.event_name == 'pull_request' }}
+    if: ${{ github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo' }}
     timeout-minutes: 60
     name: '(CD) comment preview links'
     steps:
@@ -222,26 +169,26 @@ jobs:
           # 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"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
+              echo "waiting for governance preview: ${{ needs.lint-test-build.outputs.preview_governance }}"
               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"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
+              echo "waiting for explorer preview: ${{ needs.lint-test-build.outputs.preview_explorer }}"
               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"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
+              echo "waiting for trading preview: ${{ needs.lint-test-build.outputs.preview_trading }}"
               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"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
+              echo "waiting for tools preview: ${{ needs.lint-test-build.outputs.preview_tools }}"
               sleep 5
             done
           fi
@@ -252,7 +199,7 @@ jobs:
         with:
           issue-number: ${{ github.event.pull_request.number }}
           body: |
-            Previews:
+            Previews
             * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
             * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
             * trading: ${{ needs.lint-test-build.outputs.preview_trading }}

.github/workflows/console-test-run.yml

@@ -0,0 +1,142 @@
+name: (CI) Console tests
+
+on:
+  workflow_call:
+    inputs:
+      github-sha:
+        required: true
+        type: string
+
+jobs:
+  run-tests:
+    name: run-tests
+    runs-on: ubuntu-22.04
+    timeout-minutes: 25
+    steps:
+      #----------------------------------------------
+      #       check-out frontend-monorepo
+      #----------------------------------------------
+      - name: Checkout console test repo
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.github-sha }}
+      #----------------------------------------------
+      #       cache node modules
+      #----------------------------------------------
+      - name: Cache node modules
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+          # comment out "restore-keys" if you need to rebuild yarn from 0
+          restore-keys: |
+            ${{ runner.os }}-cache-node-modules-
+      #----------------------------------------------
+      #       setup node
+      #----------------------------------------------
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn
+      #----------------------------------------------
+      #       install deps if cache missing
+      #----------------------------------------------
+      - name: yarn install
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: yarn install --pure-lockfile
+      #----------------------------------------------
+      #       build trading
+      #----------------------------------------------
+      - name: Build affected spec
+        run: |
+          yarn env-cmd -f ./apps/trading/.env.stagnet1 yarn nx export trading
+      #----------------------------------------------
+      #       run trading server
+      #----------------------------------------------
+      - name: Run trading server
+        run: |
+          docker run -d -p 80:4200 -v $PWD/docker/nginx.conf:/etc/nginx/conf.d/default.conf -v $PWD/dist/apps/trading/exported:/usr/share/nginx/html nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+          sleep 5
+          docker ps
+      #----------------------------------------------
+      #       check if container persists between runs
+      #----------------------------------------------
+      - name: Check server
+        run: |
+          docker ps
+      #----------------------------------------------
+      #       check-out tests repo
+      #----------------------------------------------
+      - name: Checkout console test repo
+        uses: actions/checkout@v3
+        with:
+          repository: vegaprotocol/console-test
+          path: './console-test'
+      #----------------------------------------------
+      #       set-up python
+      #----------------------------------------------
+      - name: Set up python
+        id: setup-python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10.11'
+      #----------------------------------------------
+      #  -----  install & configure poetry  -----
+      #----------------------------------------------
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          virtualenvs-path: console-test/.venv
+      #----------------------------------------------
+      #       load cached venv if cache exists
+      #----------------------------------------------
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v3
+        with:
+          path: console-test/.venv
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+      #----------------------------------------------
+      # install dependencies if cache does not exist
+      #----------------------------------------------
+      - name: Install dependencies
+        working-directory: ./console-test
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        run: poetry install --no-interaction --no-root
+      #----------------------------------------------
+      # install vega binaries
+      #----------------------------------------------
+      - name: Install vega binaries
+        working-directory: ./console-test
+        run: poetry run python -m vega_sim.tools.load_binaries --force
+      #----------------------------------------------
+      # install playwright
+      #----------------------------------------------
+      - name: install playwright
+        run: poetry run playwright install
+        working-directory: ./console-test
+      #----------------------------------------------
+      # run tests
+      #----------------------------------------------
+      - name: Run tests
+        working-directory: ./console-test
+        run: poetry run pytest --numprocesses auto
+      - name: Check files
+        run: |
+          ls -al .
+          ls -al console-test
+      #----------------------------------------------
+      # upload traces
+      #----------------------------------------------
+      - name: Upload Playwright Trace
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-trace
+          path: ./traces/
+          retention-days: 15

.github/workflows/publish-dist.yml

@@ -22,6 +22,45 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha || github.sha }}
 
+      - name: Init variables
+        run: |
+          echo IS_PR=false >> $GITHUB_ENV
+          echo IS_MAINNET_RELEASE=false >> $GITHUB_ENV
+          echo IS_TESTNET_RELEASE=false >> $GITHUB_ENV
+          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
+          echo IS_S3_RELEASE=false >> $GITHUB_ENV
+          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
+
+      - name: Is dev image
+        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
+        run: |
+          echo IS_DEV_IMAGE=true >> $GITHUB_ENV
+
+      - name: Is PR
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          echo IS_PR=true >> $GITHUB_ENV
+
+      - name: Is mainnet release
+        if: ${{ contains(github.ref, 'release/mainnet') && !contains(github.ref, 'mirror') }}
+        run: |
+          echo IS_MAINNET_RELEASE=true >> $GITHUB_ENV
+
+      - name: Is testnet release
+        if: ${{ contains(github.ref, 'release/testnet') }}
+        run: |
+          echo IS_TESTNET_RELEASE=true >> $GITHUB_ENV
+
+      - name: Is IPFS Release
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( env.IS_MAINNET_RELEASE == 'true' || env.IS_TESTNET_RELEASE == 'true' ) }}
+        run: |
+          echo IS_IPFS_RELEASE=true >> $GITHUB_ENV
+
+      - name: Is S3 Release
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
+        run: |
+          echo IS_S3_RELEASE=true >> $GITHUB_ENV
+
       - name: Set up QEMU
         id: quemu
         uses: docker/setup-qemu-action@v2
@@ -33,7 +72,7 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Log in to the Container registry (ghcr)
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ env.IS_PR == 'true' }}
         uses: docker/login-action@v2
         with:
           registry: ghcr.io
@@ -42,9 +81,8 @@ jobs:
 
       - name: Log in to the Container registry (docker hub)
         uses: docker/login-action@v2
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
         with:
-          # registry: registry.hub.docker.com
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
@@ -65,67 +103,33 @@ jobs:
       - name: Define dist variables
         if: ${{ github.event_name == 'push' }}
         run: |
-          envName=''
-          domain="vega.rocks"
-          bucketName=''
+          python3 tools/ci/define-dist-variables.py --github-ref="${{ github.ref }}" --app="${{ matrix.app }}"
 
-          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
-            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
-
-          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
+      - name: Verify script result
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          echo "BUCKET_NAME=${{ env.BUCKET_NAME }}"
+          echo "ENV_NAME=${{ env.ENV_NAME }}"
 
       - name: Build local dist
         run: |
-          flags=""
+          envCmd=""
           if [[ ! -z "${{ env.ENV_NAME }}" ]]; then
-            flags="--env=${{ env.ENV_NAME }}"
+            envCmd="yarn env-cmd -f ./apps/${{ matrix.app }}/.env.${{ env.ENV_NAME }}"
           fi
 
           if [ "${{ matrix.app }}" = "trading" ]; then
-            yarn nx export trading $flags || (yarn install && yarn nx export trading $flags)
+            $envCmd yarn nx export trading || (yarn install && $envCmd yarn nx export trading)
             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
+          elif [ "${{ matrix.app }}" = "static" ]; then
+            yarn nx build static || (yarn install && yarn nx build static)
           else
-            yarn nx build ${{ matrix.app }} $flags || (yarn install && yarn nx build ${{ matrix.app }} $flags)
+            $envCmd yarn nx build ${{ matrix.app }} || (yarn install && $envCmd yarn nx build ${{ matrix.app }})
+          fi
+          if [[ -z "$DIST_LOCATION" ]]; then
             DIST_LOCATION=dist/apps/${{ matrix.app }}
           fi
           mv $DIST_LOCATION dist-result
@@ -145,7 +149,7 @@ jobs:
             ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local
 
       - name: Image digest
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ env.IS_PR == 'true' }}
         run: echo ${{ steps.docker_build.outputs.digest }}
 
       - name: Sanity check docker image
@@ -160,7 +164,7 @@ jobs:
         uses: docker/build-push-action@v3
         continue-on-error: true
         id: ghcr-push
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ env.IS_PR == 'true' }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -175,7 +179,7 @@ jobs:
         uses: docker/build-push-action@v3
         continue-on-error: true
         id: dockerhub-push
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
         with:
           context: .
           file: docker/node-outside-docker.Dockerfile
@@ -185,7 +189,7 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || '' }}
 
       - name: Publish dist as docker image (ghcr - retry)
         uses: docker/build-push-action@v3
@@ -212,13 +216,13 @@ jobs:
             ENV_NAME=${{ env.ENV_NAME }}
           tags: |
             vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}
 
       # bucket creation in github.com/vegaprotocol/terraform//frontend
       - name: Publish dist to s3
         uses: jakejarvis/s3-sync-action@master
         # s3 releases are not happening for trading on mainnet - it's IPFS
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
         with:
           args: --acl private --follow-symlinks --delete
         env:
@@ -228,18 +232,34 @@ jobs:
           AWS_REGION: 'eu-west-1'
           SOURCE_DIR: 'dist-result'
 
+      - name: Install aws CLI
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
+        uses: unfor19/install-aws-cli-action@master
+
+      - name: Perform cache invalidation
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_REGION: 'eu-west-1'
+        run: |
+          echo "Looking for distribution for bucket: ${{ env.BUCKET_NAME }}"
+          id=$(aws cloudfront list-distributions | jq -Mrc '.DistributionList.Items | .[] | select(.DefaultCacheBehavior.TargetOriginId == "${{ env.BUCKET_NAME }}") | .Id')
+          echo "Found id is: ${id}"
+          aws cloudfront create-invalidation --distribution-id $id --paths "/*"
+
       - name: Add preview label
         uses: actions-ecosystem/action-add-labels@v1
-        if: ${{ github.event_name == 'pull_request' }}
+        if: ${{ env.IS_PR == 'true' }}
         with:
           labels: ${{ matrix.app }}-preview
           number: ${{ github.event.number }}
 
       - name: Trigger fleek deployment
         # release to ipfs happens only on mainnet (represented by main branch) for trading
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
         run: |
-          if echo ${{ github.ref }} | grep -q main; then
+          if [[ "${{ env.IS_MAINNET_RELEASE }}" = "true" ]]; then
             # display info about app
             curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
               -H "Content-Type: application/json" \
@@ -252,7 +272,7 @@ jobs:
               -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
+          elif [[ "${{ env.IS_TESTNET_RELEASE }}" = "true" ]]; then
             # display info about app
             curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
               -H "Content-Type: application/json" \
@@ -267,7 +287,7 @@ jobs:
           fi
 
       - name: Check out ipfs-redirect
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
         uses: actions/checkout@v3
         with:
           repository: 'vegaprotocol/ipfs-redirect'
@@ -276,7 +296,7 @@ jobs:
           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') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
         env:
           GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
         run: |
@@ -298,11 +318,11 @@ jobs:
             git config --global user.name "vega-ci-bot"
 
             # update CID files
-            if echo ${{ github.ref }} | grep -q main; then
+            if [[ "${{ env.IS_MAINNET_RELEASE }}" = "true" ]]; 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
+            elif [[ "${{ env.IS_TESTNET_RELEASE }}" = "true" ]]; then
               echo $new_hash > cidv0-fairground.txt
               echo $new_cid > cidv1-fairground.txt
               git add cidv0-fairground.txt cidv1-fairground.txt

.storybook/main.js

@@ -1,29 +0,0 @@
-module.exports = {
-  stories: [],
-  addons: [
-    '@storybook/addon-actions',
-    '@storybook/addon-viewport',
-    {
-      name: '@storybook/addon-docs',
-      options: {
-        configureJSX: true,
-        babelOptions: {},
-        sourceLoaderOptions: null,
-        transcludeMarkdown: true,
-      },
-    },
-    '@storybook/addon-controls',
-    '@storybook/addon-backgrounds',
-    '@storybook/addon-toolbars',
-    '@storybook/addon-measure',
-    '@storybook/addon-outline',
-    '@storybook/addon-a11y',
-  ],
-  // uncomment the property below if you want to apply some webpack config globally
-  // webpackFinal: async (config, { configType }) => {
-  //   // Make whatever fine-grained changes you need that should apply to all storybook configs
-
-  //   // Return the altered config
-  //   return config;
-  // },
-};

.storybook/tsconfig.json

@@ -1,14 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "exclude": [
-    "../**/*.spec.js",
-    "../**/*.test.js",
-    "../**/*.spec.ts",
-    "../**/*.test.ts",
-    "../**/*.spec.tsx",
-    "../**/*.test.tsx",
-    "../**/*.spec.jsx",
-    "../**/*.test.jsx"
-  ],
-  "include": ["../**/*"]
-}

apps/explorer-e2e/.env

@@ -16,5 +16,10 @@ NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
 
-CYPRESS_VEGA_WALLET_API_TOKEN=
 CYPRESS_VEGA_URL=http://localhost:3008/graphql
+CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
+CYPRESS_ETHEREUM_PROVIDER_URL=http://localhost:8545
+CYPRESS_FAUCET_URL=http://localhost:1790/api/v1/mint
+CYPRESS_VEGA_PUBLIC_KEY=02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65
+CYPRESS_VEGA_WALLET_URL=http://localhost:1789
+CYPRESS_VEGA_WALLET_API_TOKEN=

apps/explorer-e2e/project.json

@@ -1,10 +1,11 @@
 {
+  "name": "explorer-e2e",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/explorer-e2e/src",
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/explorer-e2e/cypress.config.js",
         "devServerTarget": "explorer:serve"
@@ -16,14 +17,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/explorer-e2e/**/*.{js,ts}"]
       }
     },
     "build": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "outputs": [],
       "options": {
         "command": "yarn tsc --project ./apps/explorer-e2e/"

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

@@ -31,7 +31,7 @@ context('Asset page', { tags: '@regression' }, () => {
       });
     });
 
-    it('should open details page when clicked on "View details"', () => {
+    it.skip('should open details page when clicked on "View details"', () => {
       cy.getAssets().then((assets) => {
         assets.forEach((asset) => {
           cy.get(`[row-id="${asset.id}"] [col-id="actions"] button`)

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

@@ -1,19 +1,130 @@
-//Tests set to skip until market bug for capsule checkpoint is fixed
-context.skip('Market page', { tags: '@regression' }, function () {
+context('Market page', { tags: '@regression' }, function () {
   describe('Verify elements on page', function () {
-    const marketHeaders = '[data-testid="markets-header"]';
-    const marketNavigation = 'a[href="/markets"]';
+    const marketHeaders = 'markets-heading';
+    const createdMarketId =
+      '2eab0e66545a789047561bc5a2e5cbc3b19eb708da41104e3cac2474ee36c4d4';
 
-    it('Markets page is displayed', function () {
+    before('Create market', function () {
       cy.visit('/');
-      cy.get(marketNavigation).click();
-      cy.common_validate_blocks_data_displayed(marketHeaders);
+      cy.createMarket();
     });
 
-    it('Markets page displayed on mobile', function () {
+    beforeEach('Get market id', function () {
+      cy.navigate_to('markets');
+      cy.get('[col-id="id"]').eq(1).invoke('text').as('createdMarketId');
+    });
+
+    it('Market displayed on market page', function () {
+      cy.navigate_to('markets');
+      cy.getByTestId(marketHeaders).should('be.visible');
+      cy.get(`[row-id="${this.createdMarketId}"]`)
+        .should('be.visible')
+        .within(() => {
+          cy.get_element_by_col_id('code').should('have.text', 'TEST.24h');
+          cy.get_element_by_col_id('name').should('have.text', 'Test market 1');
+          cy.get_element_by_col_id('state').should('have.text', 'Pending');
+          cy.get_element_by_col_id('asset').should('have.text', 'fUSDC');
+          cy.get_element_by_col_id('id').should(
+            'have.text',
+            this.createdMarketId
+          );
+          cy.get_element_by_col_id('actions')
+            .find('a')
+            .should('have.attr', 'href', `/markets/${this.createdMarketId}`);
+        });
+    });
+
+    it('Able to go to market details page', function () {
+      cy.navigate_to('markets');
+      cy.get_element_by_col_id('actions').eq(1).click();
+      cy.getByTestId(marketHeaders).should('have.text', 'Test market 1');
+      cy.validate_element_from_table('Name', 'Test market 1');
+      cy.validate_element_from_table('Market ID', this.createdMarketId);
+      cy.validate_element_from_table('Trading Mode', 'Opening auction');
+      cy.validate_element_from_table('Market Decimal Places', '5');
+      cy.validate_element_from_table('Position Decimal Places', '5');
+      cy.validate_element_from_table('Settlement Asset Decimal Places', '5');
+      // Instrument
+      cy.validate_element_from_table('Market Name', 'Test market 1');
+      cy.validate_element_from_table('Code', 'TEST.24h');
+      cy.validate_element_from_table('Product Type', 'Future');
+      cy.validate_element_from_table('Quote Name', 'fUSDC');
+      // Settlement Asset
+      cy.validate_element_from_table('Quote Name', 'fUSDC');
+      cy.validate_element_from_table('Symbol', 'fUSDC');
+      cy.validate_element_from_table('Decimals', '5');
+      cy.validate_element_from_table('Quantum', '0.00');
+      cy.validate_element_from_table('Status', 'Enabled');
+      cy.validate_element_from_table('Max faucet amount', '10,000,000.00');
+      cy.validate_element_from_table(
+        'Infrastructure fee account balance',
+        '0.00'
+      );
+      cy.validate_element_from_table(
+        'Global reward pool account balance',
+        '0.00'
+      );
+      // Metadata
+      cy.validate_element_from_table('Sector', 'tech');
+      cy.validate_element_from_table('Source', 'docs.vega.xyz');
+      // Risk model
+      cy.validate_element_from_table('Tau', '0.0001140771161');
+      cy.validate_element_from_table('Risk Aversion Parameter', '0.01');
+      // Risk parameters
+      // cy.validate_element_from_table('R', '0.016')
+      cy.validate_element_from_table('Sigma', '0.5');
+      // Risk factors
+      cy.validate_element_from_table('Short', '0.0143218738374871');
+      cy.validate_element_from_table('Long', '0.0141450471498822');
+      // Price monitoring settings 1
+      cy.validate_element_from_table('Horizon Secs', '43,200');
+      cy.validate_element_from_table('Probability', '1');
+      cy.validate_element_from_table('Auction Extension Secs', '600');
+      // Liquidity Monitoring
+      cy.validate_element_from_table('Triggering Ratio', '0.7');
+      cy.validate_element_from_table('Time Window', '3,600');
+      cy.validate_element_from_table('Scaling Factor', '10');
+      // Liquidity
+      cy.validate_element_from_table('Target Stake', '0.00 fUSDC');
+      cy.validate_element_from_table('Supplied Stake', '0.00 fUSDC');
+      cy.validate_element_from_table('Market Value Proxy', '0.00 fUSDC');
+      // Liquidity price range
+      cy.validate_element_from_table(
+        'Liquidity Price Range',
+        '1,000.00% of mid price'
+      );
+      cy.validate_element_from_table('Lowest Price', '0.00 fUSDC');
+      cy.validate_element_from_table('Highest Price', '0.00 fUSDC');
+
+      cy.getByTestId('oracle-spec-links')
+        .should('have.attr', 'href')
+        .and(
+          'contain',
+          '/oracles/bf242aa5c9f64fcbb77808aa8582e73711519f4b35264eb797a80f1803590a24'
+        );
+
+      // Able to view Json
+      cy.contains('View JSON').click();
+      cy.get('.language-json').should('exist');
+    });
+
+    // Skipping due to resize observer loop limit error
+    it.skip('Markets page displayed on mobile', function () {
       cy.common_switch_to_mobile_and_click_toggle();
-      cy.get(marketNavigation).click();
-      cy.common_validate_blocks_data_displayed(marketHeaders);
+      cy.navigate_to('markets', true);
+      cy.getByTestId(marketHeaders).should('be.visible');
+      cy.get(`[row-id="${createdMarketId}"]`)
+        .should('be.visible')
+        .within(() => {
+          cy.get_element_by_col_id('code').should('have.text', 'TEST.24h');
+          cy.get_element_by_col_id('name').should('have.text', 'Test market 1');
+          cy.get_element_by_col_id('state').should('have.text', 'Pending');
+          cy.get_element_by_col_id('asset').should('have.text', 'fUSDC');
+          cy.get_element_by_col_id('id').should('have.text', createdMarketId);
+          cy.get_element_by_col_id('actions')
+            .find('a')
+            .should('have.attr', 'href', `/markets/${createdMarketId}`);
+        });
     });
   });
 });

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

@@ -169,7 +169,6 @@ context.skip('Parties page', { tags: '@regression' }, function () {
       const jsonFields = '.hljs';
       const sideMenuBackground = '.absolute';
 
-      // Engage dark mode if not allready set
       cy.get(sideMenuBackground)
         .should('have.css', 'background-color')
         .then((background_color) => {

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

@@ -0,0 +1,46 @@
+context('Proposal page', { tags: '@smoke' }, function () {
+  describe('Verify elements on page', function () {
+    const proposalHeading = 'proposals-heading';
+    const dateTimeRegex =
+      /(\d{1,2})\/(\d{1,2})\/(\d{4}), (\d{1,2}):(\d{1,2}):(\d{1,2})/gm;
+    const proposalTitle = 'Add Lorem Ipsum market';
+
+    before('Create market proposal', function () {
+      cy.visit('/');
+      cy.createMarket();
+    });
+
+    it('Able to view proposal', function () {
+      cy.navigate_to('governanceProposals');
+      cy.getByTestId(proposalHeading).should('be.visible');
+      // get first proposal in list
+      cy.get('[row-index="0"]').within(() => {
+        cy.get_element_by_col_id('title').should('have.text', proposalTitle);
+        cy.get_element_by_col_id('type').should('have.text', 'NewMarket');
+        cy.get_element_by_col_id('state').should('have.text', 'Enacted');
+        cy.getByTestId('vote-progress').should('be.visible');
+        cy.get('[col-id="cDate"]')
+          .invoke('text')
+          .should('match', dateTimeRegex);
+        cy.get('[col-id="eDate"]')
+          .invoke('text')
+          .should('match', dateTimeRegex);
+        cy.getByTestId('external-link')
+          .should('have.attr', 'href')
+          .and('contains', 'https://governance.fairground.wtf/proposals/');
+        cy.contains('View terms').should('exist').click();
+      });
+      cy.getByTestId('dialog-title').should('have.text', proposalTitle);
+      cy.get('.language-json').should('exist');
+    });
+
+    it('Proposal page displayed on mobile', function () {
+      cy.common_switch_to_mobile_and_click_toggle();
+      cy.navigate_to('governanceProposals', true);
+      cy.getByTestId(proposalHeading).should('be.visible');
+      cy.get('[row-index="0"]').within(() => {
+        cy.get_element_by_col_id('title').should('have.text', proposalTitle);
+      });
+    });
+  });
+});

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

@@ -40,7 +40,7 @@ context.skip('Transactions page', function () {
             .first()
             .click({ force: true });
         } else {
-          cy.slack('Unable to find any transactions on page');
+          cy.log('Unable to find any transactions on page');
           cy.screenshot();
         }
       });
@@ -78,7 +78,7 @@ context.skip('Transactions page', function () {
               }
             });
         } else {
-          cy.slack('Unable to find any transactions on page');
+          cy.log('Unable to find any transactions on page');
           cy.screenshot();
         }
       });

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

@@ -7,7 +7,11 @@ context('Validator page', { tags: '@smoke' }, function () {
     it('should be able to see validator tiles', function () {
       cy.getNodes().then((nodes) => {
         nodes.forEach((node) => {
-          cy.get(`[validator-id="${node.id}"]`).should('be.visible');
+          if (node.rankingScore.performanceScore > 0) {
+            cy.get(`[validator-id="${node.id}"]`).should('be.visible');
+          } else {
+            cy.get(`[validator-id="${node.id}"]`).should('not.exist');
+          }
         });
       });
     });

apps/explorer-e2e/src/support/common.functions.js

@@ -28,7 +28,7 @@ Cypress.Commands.add('switchToMobile', () => {
 Cypress.Commands.add('common_switch_to_mobile_and_click_toggle', function () {
   cy.viewport('iphone-x');
   cy.visit('/');
-  cy.get('[data-testid="open-menu"]').click();
+  cy.get('[data-testid="button-menu-drawer"]').click();
 });
 
 Cypress.Commands.add('monitor_clipboard', () => {
@@ -88,3 +88,42 @@ Cypress.Commands.add('convert_number_to_max_four_decimal', (number) => {
     maximumFractionDigits: 4,
   });
 });
+
+Cypress.Commands.add('navigate_to', (page, mobileView = false) => {
+  const navigation = {
+    transactions: '/txs',
+    blocks: '/blocks',
+    oracles: '/oracles',
+    validators: '/validators',
+    parties: '/parties',
+    assets: '/assets',
+    markets: '/markets',
+    governanceProposals: '/governance',
+    networkParameters: '/network-parameters',
+    genesisParameters: '/genesis',
+  };
+
+  const topLevelRoutes = ['transactions', 'blocks', 'oracles', 'validators'];
+
+  cy.getByTestId('navigation').within(() => {
+    if (!topLevelRoutes.includes(page) && mobileView === false) {
+      cy.getByTestId('other').first().click();
+    }
+    cy.get(`[href="${navigation[page]}"]`).first().click();
+  });
+  cy.url().should('include', navigation[page]);
+});
+
+Cypress.Commands.add('get_element_by_col_id', (elementName) => {
+  cy.get(`[col-id="${elementName}"]`);
+});
+
+Cypress.Commands.add(
+  'validate_element_from_table',
+  (tableRowName, tableRowValue) => {
+    cy.contains(tableRowName)
+      .parentsUntil("[data-testid='key-value-table-row']")
+      .siblings()
+      .should('have.text', tableRowValue);
+  }
+);

apps/explorer/.babelrc

@@ -1,7 +1,7 @@
 {
   "presets": [
     [
-      "@nrwl/react/babel",
+      "@nx/react/babel",
       {
         "runtime": "automatic"
       }

apps/explorer/.env

@@ -1,14 +1,14 @@
 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_HOSTED_WALLET_URL=https://wallet.testnet.vega.rocks
 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_URL=https://tm.n01.stagnet1.vega.rocks
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
-NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
+NX_BLOCK_EXPLORER=https://be.stagnet1.vega.rocks/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

apps/explorer/.env.devnet

@@ -1,5 +1,5 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/tm
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET

apps/explorer/.env.mainnet-mirror

@@ -0,0 +1,13 @@
+# App configuration variables
+NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40@o286262.ingest.sentry.io/5882996
+NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/mainnet-mirror/vegawallet-mainnet-mirror.toml
+NX_VEGA_URL=https://api.mainnet-mirror.vega.rocks/graphql
+NX_VEGA_ENV=MAINNET_MIRROR
+NX_BLOCK_EXPLORER=https://be.mainnet-mirror.vega.rocks/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_GOVERNANCE_URL=https://governance.mainnet-mirror.vega.rocks
+NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
+NX_VEGA_EXPLORER_URL=https://explorer.mainnet-mirror.vega.rocks/
+NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks

apps/explorer/.eslintrc.json

@@ -1,6 +1,6 @@
 {
-  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*", "__generated__", "__generated___"],
+  "extends": ["plugin:@nx/react", "../../.eslintrc.json"],
+  "ignorePatterns": ["!**/*", "__generated__"],
   "overrides": [
     {
       "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],

apps/explorer/README.md

@@ -32,6 +32,7 @@ yarn nx serve explorer
 Example configurations are provided here:
 
 - [Mainnet](./.env.mainnet)
+- [Mainnet-mirror](./.env.mainnet-mirror)
 - [Devnet](./.env.devnet)
 - [Capsule](./.env.capsule)
 - [Testnet](./.env.testnet)
@@ -39,7 +40,7 @@ Example configurations are provided here:
 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. stagnet1
+yarn env-cmd -f .\apps\explorer\.env.{env} yarn nx run explorer:serve # e.g. stagnet1
 ```
 
 There are a few different configuration options offered for this app:

apps/explorer/jest.config.ts

@@ -4,8 +4,8 @@ export default {
   displayName: 'explorer',
   preset: '../../jest.preset.js',
   transform: {
-    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nrwl/react/plugins/jest',
-    '^.+\\.[tj]sx?$': 'babel-jest',
+    '^(?!.*\\.(js|jsx|ts|tsx|css|json)$)': '@nx/react/plugins/jest',
+    '^.+\\.[tj]sx?$': ['babel-jest', { presets: ['@nx/react/babel'] }],
   },
   moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx'],
   coverageDirectory: '../../coverage/apps/explorer',

apps/explorer/project.json

@@ -1,10 +1,11 @@
 {
+  "name": "explorer",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/explorer/src",
   "projectType": "application",
   "targets": {
     "build": {
-      "executor": "./tools/executors/webpack:build",
+      "executor": "@nx/webpack:webpack",
       "outputs": ["{options.outputPath}"],
       "defaultConfiguration": "production",
       "options": {
@@ -38,7 +39,7 @@
       }
     },
     "serve": {
-      "executor": "./tools/executors/webpack:serve",
+      "executor": "@nx/webpack:dev-server",
       "options": {
         "port": 3000,
         "buildTarget": "explorer:build:development",
@@ -52,30 +53,36 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/explorer/**/*.{ts,tsx,js,jsx}"]
       }
     },
     "test": {
-      "executor": "@nrwl/jest:jest",
-      "outputs": ["coverage/apps/explorer"],
+      "executor": "@nx/jest:jest",
+      "outputs": ["{workspaceRoot}/coverage/apps/explorer"],
       "options": {
         "jestConfig": "apps/explorer/jest.config.ts",
         "passWithNoTests": true
+      },
+      "configurations": {
+        "ci": {
+          "ci": true,
+          "codeCoverage": true
+        }
       }
     },
     "generate-types": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.71.4/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/spec-update-v0.72.0-preview.2/specs/v0.72.0-preview.2/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
         ]
       }
     },
     "build-netlify": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "options": {
         "commands": [
           "cp apps/explorer/netlify.toml netlify.toml",
@@ -84,7 +91,7 @@
       }
     },
     "build-spec": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "outputs": [],
       "options": {
         "command": "yarn tsc --project ./apps/explorer/tsconfig.spec.json"

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

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

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

@@ -95,7 +95,10 @@ export const Header = () => {
         {mainItems.map(routeToNavigationItem)}
         {groupedItems && groupedItems.length > 0 && (
           <NavigationItem>
-            <NavigationTrigger isActive={Boolean(isOnOther)}>
+            <NavigationTrigger
+              isActive={Boolean(isOnOther)}
+              data-testid="other"
+            >
               {t('Other')}
             </NavigationTrigger>
             <NavigationContent>

apps/explorer/src/app/components/info-block/info-block.tsx

@@ -1,5 +1,4 @@
 import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
-import React from 'react';
 
 export interface InfoBlockProps {
   title: string;

apps/explorer/src/app/components/links/party-link/party-link.spec.tsx

@@ -1,33 +1,98 @@
 import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import PartyLink from './party-link';
+import { MockedProvider } from '@apollo/client/testing';
+import { ExplorerNodeNamesDocument } from '../../../routes/validators/__generated__/NodeNames';
+import { act } from 'react-dom/test-utils';
+const zeroes =
+  '0000000000000000000000000000000000000000000000000000000000000000';
+const mocks = [
+  {
+    request: {
+      query: ExplorerNodeNamesDocument,
+    },
+    result: {
+      data: {
+        nodesConnection: {
+          edges: [
+            {
+              node: {
+                id: '1',
+                name: 'Validator Node',
+                pubkey:
+                  '13464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6e',
+                tmPubkey: 'tmPubkey1',
+                ethereumAddress: '0x123456789',
+              },
+            },
+            {
+              node: {
+                id: '2',
+                name: 'Node 2',
+                pubkey: 'pubkey2',
+                tmPubkey: 'tmPubkey2',
+                ethereumAddress: '0xabcdef123',
+              },
+            },
+          ],
+        },
+      },
+    },
+  },
+];
 
 describe('PartyLink', () => {
   it('renders Network for 000.000 party', () => {
-    const zeroes =
-      '0000000000000000000000000000000000000000000000000000000000000000';
-    const screen = render(<PartyLink id={zeroes} />);
+    const screen = render(
+      <MockedProvider>
+        <PartyLink id={zeroes} />
+      </MockedProvider>
+    );
     expect(screen.getByText('Network')).toBeInTheDocument();
   });
 
   it('renders Network for network party', () => {
-    const screen = render(<PartyLink id="network" />);
+    const screen = render(
+      <MockedProvider>
+        <PartyLink id="network" />
+      </MockedProvider>
+    );
     expect(screen.getByText('Network')).toBeInTheDocument();
   });
 
   it('renders ID with no link for invalid party', () => {
-    const screen = render(<PartyLink id="this-party-is-not-valid" />);
+    const screen = render(
+      <MockedProvider>
+        <PartyLink id="this-party-is-not-valid" />
+      </MockedProvider>
+    );
     expect(screen.getByTestId('invalid-party')).toBeInTheDocument();
   });
 
+  it('if the key is a validator, render their name instead', async () => {
+    const screen = render(
+      <MockedProvider mocks={mocks}>
+        <MemoryRouter>
+          <PartyLink id="13464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6e" />
+        </MemoryRouter>
+      </MockedProvider>
+    );
+
+    // Wait for hook to update with mock data
+    await act(() => new Promise((resolve) => setTimeout(resolve, 0)));
+    await expect(screen.getByText('Validator Node')).toBeInTheDocument();
+  });
+
   it('links a valid party to the party page', () => {
     const aValidParty =
       '13464e35bcb8e8a2900ca0f87acaf252d50cf2ab2fc73694845a16b7c8a0dc6e';
 
     const screen = render(
-      <MemoryRouter>
-        <PartyLink id={aValidParty} />
-      </MemoryRouter>
+      <MockedProvider>
+        <MemoryRouter>
+          <PartyLink id={aValidParty} />
+        </MemoryRouter>
+      </MockedProvider>
     );
 
     const el = screen.getByText(aValidParty);

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

@@ -1,22 +1,44 @@
 import { Routes } from '../../../routes/route-names';
 import { Link } from 'react-router-dom';
 
-import type { ComponentProps } from 'react';
+import { useMemo, type ComponentProps } from 'react';
 import Hash from '../hash';
 import { t } from '@vegaprotocol/i18n';
 import { isValidPartyId } from '../../../routes/parties/id/components/party-id-error';
-import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
+import { Icon, truncateMiddle } from '@vegaprotocol/ui-toolkit';
+import { useExplorerNodeNamesQuery } from '../../../routes/validators/__generated__/NodeNames';
+import type { ExplorerNodeNamesQuery } from '../../../routes/validators/__generated__/NodeNames';
 
 export const SPECIAL_CASE_NETWORK_ID =
   '0000000000000000000000000000000000000000000000000000000000000000';
 export const SPECIAL_CASE_NETWORK = 'network';
 
+export function getNameForParty(id: string, data?: ExplorerNodeNamesQuery) {
+  if (!data || data?.nodesConnection?.edges?.length === 0) {
+    return id;
+  }
+
+  const validator = data.nodesConnection.edges?.find((e) => {
+    return e?.node.pubkey === id;
+  });
+
+  if (validator) {
+    return validator.node.name;
+  }
+
+  return id;
+}
+
 export type PartyLinkProps = Partial<ComponentProps<typeof Link>> & {
   id: string;
   truncate?: boolean;
 };
 
 const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
+  const { data } = useExplorerNodeNamesQuery();
+  const name = useMemo(() => getNameForParty(id, data), [data, id]);
+  const useName = name !== id;
+
   // Some transactions will involve the 'network' party, which is alias for  '000...000'
   // The party page does not handle this nicely, so in this case we render the word 'Network'
   if (id === SPECIAL_CASE_NETWORK || id === SPECIAL_CASE_NETWORK_ID) {
@@ -38,13 +60,20 @@ const PartyLink = ({ id, truncate = false, ...props }: PartyLinkProps) => {
   }
 
   return (
-    <Link
-      className="underline font-mono"
-      {...props}
-      to={`/${Routes.PARTIES}/${id}`}
-    >
-      <Hash text={truncate ? truncateMiddle(id) : id} />
-    </Link>
+    <span className="whitespace-nowrap">
+      {useName && <Icon size={4} name="cube" className="mr-2" />}
+      <Link
+        className="underline font-mono"
+        {...props}
+        to={`/${Routes.PARTIES}/${id}`}
+      >
+        {useName ? (
+          name
+        ) : (
+          <Hash text={truncate ? truncateMiddle(id, 4, 4) : id} />
+        )}
+      </Link>
+    </span>
   );
 };
 

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

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

apps/explorer/src/app/components/order-details/Order.graphql

@@ -13,6 +13,10 @@ fragment ExplorerDeterministicOrderFields on Order {
   remaining
   size
   rejectionReason
+  peggedOrder {
+    reference
+    offset
+  }
   party {
     id
   }

apps/explorer/src/app/components/order-details/__generated__/Order.ts

@@ -3,7 +3,7 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerDeterministicOrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } };
+export type ExplorerDeterministicOrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } };
 
 export type ExplorerDeterministicOrderQueryVariables = Types.Exact<{
   orderId: Types.Scalars['ID'];
@@ -11,7 +11,7 @@ export type ExplorerDeterministicOrderQueryVariables = Types.Exact<{
 }>;
 
 
-export type ExplorerDeterministicOrderQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } } };
+export type ExplorerDeterministicOrderQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, peggedOrder?: { __typename?: 'PeggedOrder', reference: Types.PeggedReference, offset: string } | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } } };
 
 export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
     fragment ExplorerDeterministicOrderFields on Order {
@@ -29,6 +29,10 @@ export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
   remaining
   size
   rejectionReason
+  peggedOrder {
+    reference
+    offset
+  }
   party {
     id
   }

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

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

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

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

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

@@ -5,6 +5,7 @@ import PriceInMarket from '../price-in-market/price-in-market';
 import { Time } from '../time';
 import { sideText, statusText, tifFull, tifShort } from './lib/order-labels';
 import SizeInMarket from '../size-in-market/size-in-market';
+import { TxOrderPeggedReference } from '../txs/details/order/tx-order-peg';
 
 export interface DeterministicOrderDetailsProps {
   id: string;
@@ -68,25 +69,35 @@ const DeterministicOrderDetails = ({
             <span className="mx-5 text-base">@</span>
             <PriceInMarket price={o.price} marketId={o.market.id} />
           </h2>
-          <p className="text-gray-500 mb-4">
+          <p className="text-gray-200">
             In <MarketLink id={o.market.id} /> at <Time date={o.createdAt} />.
           </p>
+          {o.peggedOrder ? (
+            <p className="text-gray-200">
+              {t('Price peg')}:{' '}
+              <TxOrderPeggedReference
+                side={o.side}
+                reference={o.peggedOrder.reference}
+                offset={o.peggedOrder.offset}
+                marketId={o.market.id}
+              />
+            </p>
+          ) : null}
+
           {o.reference ? (
-            <p className="text-gray-500 mb-4">
+            <p className="text-gray-500 mt-4">
               <span>{t('Reference')}</span>: {o.reference}
             </p>
           ) : null}
-          <div className="grid md:grid-cols-4 gap-x-6">
-            {version !== 0 ? null : (
-              <div className="mb-12 md:mb-0">
-                <h2 className="text-2xl font-bold text-dark mb-4">
-                  {t('Status')}
-                </h2>
-                <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
-                  {statusText[o.status]}
-                </h5>
-              </div>
-            )}
+          <div className="grid md:grid-cols-4 gap-x-6 mt-4">
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">
+                {t('Status')}
+              </h2>
+              <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
+                {statusText[o.status]}
+              </h5>
+            </div>
 
             <div className="mb-12 md:mb-0">
               <h2 className="text-2xl font-bold text-dark mb-4">{t('Size')}</h2>
@@ -95,17 +106,6 @@ const DeterministicOrderDetails = ({
               </h5>
             </div>
 
-            {version !== 0 ? null : (
-              <div className="">
-                <h2 className="text-2xl font-bold text-dark mb-4">
-                  {t('Remaining')}
-                </h2>
-                <h5 className="text-lg font-medium text-gray-500 mb-0">
-                  <SizeInMarket size={o.remaining} marketId={o.market.id} />
-                </h5>
-              </div>
-            )}
-
             <div className="">
               <h2 className="text-2xl font-bold text-dark mb-4">
                 {t('Version')}

apps/explorer/src/app/components/order-summary/order-summary.spec.tsx

@@ -31,6 +31,7 @@ const mock = {
         side: 'SIDE_BUY',
         remaining: '100',
         size: '100',
+        peggedOrder: null,
         party: {
           id: '456',
         },

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

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

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

@@ -1,4 +1,4 @@
-import { Icon } from '@vegaprotocol/ui-toolkit';
+import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
 
 // https://github.com/vegaprotocol/vega/blob/develop/core/blockchain/response.go
 export const ErrorCodes = new Map([
@@ -17,6 +17,8 @@ interface ChainResponseCodeProps {
   code: number;
   hideLabel?: boolean;
   error?: string;
+  hideIfOk?: boolean;
+  small?: boolean;
 }
 
 /**
@@ -28,14 +30,21 @@ export const ChainResponseCode = ({
   code,
   hideLabel = false,
   error,
+  hideIfOk = false,
+  small = false,
 }: ChainResponseCodeProps) => {
+  if (hideIfOk && code === 0) {
+    return null;
+  }
+
   const isSuccess = successCodes.has(code);
+  const size = small ? 3 : 4;
   const successColour =
-    code === 71 ? 'fill-vega-orange' : 'fill-vega-green-600';
+    code === 71 ? '!fill-vega-orange' : '!fill-vega-green-600';
   const icon = isSuccess ? (
-    <Icon name="tick-circle" className={successColour} />
+    <Icon size={size} name="tick-circle" className={`${successColour}`} />
   ) : (
-    <Icon name="cross" className="fill-vega-pink-600" />
+    <Icon size={size} name="cross" className="!fill-vega-pink-500" />
   );
   const label = ErrorCodes.get(code) || 'Unknown response code';
 
@@ -44,18 +53,28 @@ export const ChainResponseCode = ({
     error && error.length > 100 ? error.replace(/,/g, ',\r\n') : error;
 
   return (
-    <div title={`Response code: ${code} - ${label}`} className=" inline-block">
-      <span
-        className="mr-2"
-        aria-label={isSuccess ? 'Success' : 'Warning'}
-        role="img"
-      >
-        {icon}
-      </span>
-      {hideLabel ? null : <span>{label}</span>}
-      {!hideLabel && !!displayError ? (
-        <span className="ml-1 whitespace-pre">&mdash;&nbsp;{displayError}</span>
-      ) : null}
-    </div>
+    <Tooltip
+      description={
+        <span>
+          Response code: {code} - {label}
+        </span>
+      }
+    >
+      <div className="mt-[-1px] inline-block">
+        <span
+          className="mr-2"
+          aria-label={isSuccess ? 'Success' : 'Warning'}
+          role="img"
+        >
+          {icon}
+        </span>
+        {hideLabel ? null : <span>{label}</span>}
+        {!hideLabel && !!displayError ? (
+          <span className="ml-1 whitespace-pre">
+            &mdash;&nbsp;{displayError}
+          </span>
+        ) : null}
+      </div>
+    </Tooltip>
   );
 };

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

@@ -0,0 +1,52 @@
+import { t } from '@vegaprotocol/i18n';
+import type { components } from '../../../../../types/explorer';
+import { Tooltip } from '@vegaprotocol/ui-toolkit';
+
+export interface TxDetailsOrderIcebergDetailsProps {
+  iceberg: components['schemas']['v1IcebergOpts'];
+  size: components['schemas']['v1OrderSubmission']['size'];
+}
+
+/**
+
+.iceberg .sub {
+  vertical-align: bottom;
+  color: #954F01;
+}
+
+.iceberg .sup {
+  vertical-align: top;
+  color: #515E1E;
+}
+
+ */
+
+/**
+ * Visualises the iceberg details of an order, showing the minimum visible size,
+ * the full size and the peak size.
+ */
+export const TxOrderIcebergDetails = ({
+  iceberg,
+  size,
+}: TxDetailsOrderIcebergDetailsProps) => {
+  return (
+    <div
+      className="inline-block iceberg bg-vega-blue-300 border-vega-blue-350 border-[1px] text-[70%] font-mono py-[2px] pl-2 pr-3 height-[1em] leading-[1em] cursor-pointer"
+      style={{ clipPath: 'polygon(10% 0%, 100% 0%, 90% 100%, 0% 100%)' }}
+    >
+      <Tooltip description={t('Iceberg: Minimum visible size')}>
+        <span className="align-bottom text-vega-orange-650">
+          {iceberg.minimumVisibleSize || '-'}
+        </span>
+      </Tooltip>
+      <Tooltip description={t('Iceberg: Total size')}>
+        <span className="text-sm text-vega-blue-600 mx-3">{size}</span>
+      </Tooltip>
+      <Tooltip description={t('Iceberg: Visible peak')}>
+        <span className="align-top text-vega-yellow-600">
+          {iceberg.peakSize || '-'}
+        </span>
+      </Tooltip>
+    </div>
+  );
+};

apps/explorer/src/app/components/txs/details/order/tx-order-peg.test.tsx

@@ -0,0 +1,113 @@
+import { render } from '@testing-library/react';
+import type { TxDetailsOrderProps } from './tx-order-peg';
+import { TxOrderPeggedReference, getMarketDecimals } from './tx-order-peg';
+import { useExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
+import type { ExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
+import { PeggedReference, Side } from '@vegaprotocol/types';
+
+// Mock the useExplorerMarketQuery hook
+jest.mock('../../../links/market-link/__generated__/Market', () => ({
+  useExplorerMarketQuery: jest.fn().mockReturnValue({
+    data: {
+      market: { decimalPlaces: 0 },
+    },
+    loading: false,
+  }),
+}));
+
+describe('getSettlementAsset', () => {
+  it('should return the decimal places if data is defined', () => {
+    const data = {
+      market: {
+        __typename: 'Market',
+        id: '123',
+        decimalPlaces: 8,
+      },
+    };
+
+    const result = getMarketDecimals(data as Partial<ExplorerMarketQuery>);
+
+    expect(result).toEqual(8);
+  });
+
+  it('should return 0 if data is undefined', () => {
+    const result = getMarketDecimals(undefined);
+
+    expect(result).toEqual(0);
+  });
+});
+
+describe('TxOrderPeggedReference', () => {
+  beforeEach(() => {
+    // Mock the useExplorerMarketQuery hook return value
+    (useExplorerMarketQuery as jest.Mock).mockReturnValue({
+      data: {
+        settlementAsset: 'some-settlement-asset',
+      },
+      loading: false,
+    });
+  });
+
+  afterEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('should render the offset and reference correctly', () => {
+    const props: TxDetailsOrderProps = {
+      side: Side.SIDE_BUY,
+      offset: '10',
+      reference: PeggedReference.PEGGED_REFERENCE_MID,
+      marketId: 'some-market-id',
+    };
+
+    const { getByTestId } = render(<TxOrderPeggedReference {...props} />);
+
+    expect(getByTestId('pegged-reference')).toHaveTextContent('Mid + 10');
+  });
+
+  it('should return null if the reference is "PEGGED_REFERENCE_UNSPECIFIED"', () => {
+    const props: TxDetailsOrderProps = {
+      side: Side.SIDE_BUY,
+      offset: '10',
+      reference: 'PEGGED_REFERENCE_UNSPECIFIED',
+      marketId: 'some-market-id',
+    };
+
+    const { container } = render(<TxOrderPeggedReference {...props} />);
+
+    expect(container.firstChild).toBeNull();
+  });
+
+  it('should render the offset without formatting initially, then render the formatted version', () => {
+    const props: TxDetailsOrderProps = {
+      side: Side.SIDE_BUY,
+      offset: '10',
+      reference: PeggedReference.PEGGED_REFERENCE_BEST_ASK,
+      marketId: 'some-market-id',
+    };
+
+    (useExplorerMarketQuery as jest.Mock).mockReturnValue({
+      data: null,
+      loading: true,
+    });
+
+    const screen = render(<TxOrderPeggedReference {...props} />);
+    expect(screen.getByTestId('pegged-reference')).toHaveTextContent(
+      'Ask + 10'
+    );
+
+    (useExplorerMarketQuery as jest.Mock).mockReturnValue({
+      data: {
+        market: {
+          decimalPlaces: 10,
+        },
+      },
+      loading: false,
+    });
+
+    screen.rerender(<TxOrderPeggedReference {...props} />);
+    expect(screen.getByTestId('pegged-reference')).toHaveTextContent(
+      'Ask + 0.000000001'
+    );
+  });
+});

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

@@ -0,0 +1,72 @@
+import { t } from '@vegaprotocol/i18n';
+import { TableCell, TableRow } from '../../../table';
+import type { VegaPeggedReference } from '../liquidity-provision/liquidity-provision-details';
+import { Side, PeggedReferenceMapping } from '@vegaprotocol/types';
+import { useExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
+import type { ExplorerMarketQuery } from '../../../links/market-link/__generated__/Market';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';
+
+export interface TxDetailsOrderProps {
+  offset: string;
+  reference: VegaPeggedReference;
+  marketId: string;
+  side: Side;
+}
+
+export function getMarketDecimals(
+  data: ExplorerMarketQuery | undefined
+): number {
+  return data?.market?.decimalPlaces || 0;
+}
+
+/**
+ * Summarises an order's peg
+ */
+export const TxOrderPeggedReferenceRow = ({
+  offset,
+  reference,
+  marketId,
+  side,
+}: TxDetailsOrderProps) => {
+  return (
+    <TableRow modifier="bordered">
+      <TableCell>{t('Pegged order')}</TableCell>
+      <TableCell>
+        <TxOrderPeggedReference
+          side={side}
+          offset={offset}
+          reference={reference}
+          marketId={marketId}
+        />
+      </TableCell>
+    </TableRow>
+  );
+};
+
+export const TxOrderPeggedReference = ({
+  offset,
+  reference,
+  marketId,
+  side,
+}: TxDetailsOrderProps) => {
+  const { data, loading } = useExplorerMarketQuery({
+    variables: { id: marketId },
+  });
+
+  const direction = side === Side.SIDE_BUY ? '+' : '-';
+  const decimalPlaces = getMarketDecimals(data);
+
+  if (reference === 'PEGGED_REFERENCE_UNSPECIFIED') {
+    return null;
+  }
+
+  return (
+    <span data-testid="pegged-reference">
+      {PeggedReferenceMapping[reference]}&nbsp;
+      {direction}&nbsp;
+      {!loading && data
+        ? addDecimalsFormatNumber(offset, decimalPlaces)
+        : offset}
+    </span>
+  );
+};

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-participants.tsx

@@ -6,10 +6,32 @@ import {
   SPECIAL_CASE_NETWORK_ID,
 } from '../../../../links/party-link/party-link';
 import SizeInAsset from '../../../../size-in-asset/size-in-asset';
-import { AccountTypeMapping } from '@vegaprotocol/types';
-import { AccountType } from '@vegaprotocol/types';
 import { headerClasses, wrapperClasses } from '../transfer-details';
-import type { Transfer } from '../transfer-details';
+import type { components } from '../../../../../../types/explorer';
+
+type Transfer = components['schemas']['commandsv1Transfer'];
+type AccountTypes = components['schemas']['vegaAccountType'];
+
+const AccountType: Record<AccountTypes, string> = {
+  ACCOUNT_TYPE_UNSPECIFIED: 'Unspecified',
+  ACCOUNT_TYPE_INSURANCE: 'Insurance',
+  ACCOUNT_TYPE_SETTLEMENT: 'Settlement',
+  ACCOUNT_TYPE_MARGIN: 'Margin',
+  ACCOUNT_TYPE_GENERAL: 'General',
+  ACCOUNT_TYPE_FEES_INFRASTRUCTURE: 'Infrastructure',
+  ACCOUNT_TYPE_FEES_LIQUIDITY: 'Liquidity',
+  ACCOUNT_TYPE_FEES_MAKER: 'Maker',
+  ACCOUNT_TYPE_BOND: 'Bond',
+  ACCOUNT_TYPE_EXTERNAL: 'External',
+  ACCOUNT_TYPE_GLOBAL_INSURANCE: 'Global Insurance',
+  ACCOUNT_TYPE_GLOBAL_REWARD: 'Global Reward',
+  ACCOUNT_TYPE_PENDING_TRANSFERS: 'Pending Transfers',
+  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: 'Maker Paid Fees',
+  ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: 'Maker Received Fees',
+  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: 'LP Received Fees',
+  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: 'Market Proposers',
+  ACCOUNT_TYPE_HOLDING: 'Holding',
+};
 
 interface TransferParticipantsProps {
   transfer: Transfer;
@@ -30,22 +52,22 @@ export function TransferParticipants({
 }: TransferParticipantsProps) {
   // This mapping is required as the global account types require a type to be set, while
   // the underlying protobufs allow for every field to be undefined.
-  const fromAcct =
+  const fromAcct: AccountTypes =
     transfer.fromAccountType &&
     transfer.fromAccountType !== 'ACCOUNT_TYPE_UNSPECIFIED'
-      ? AccountType[transfer.fromAccountType]
-      : AccountType.ACCOUNT_TYPE_GENERAL;
-  const fromAccountTypeLabel = transfer.fromAccountType
-    ? AccountTypeMapping[fromAcct]
+      ? transfer.fromAccountType
+      : 'ACCOUNT_TYPE_GENERAL';
+  const fromAccountTypeLabel: string = transfer.fromAccountType
+    ? AccountType[fromAcct]
     : 'Unknown';
 
-  const toAcct =
+  const toAcct: AccountTypes =
     transfer.toAccountType &&
     transfer.toAccountType !== 'ACCOUNT_TYPE_UNSPECIFIED'
-      ? AccountType[transfer.toAccountType]
-      : AccountType.ACCOUNT_TYPE_GENERAL;
+      ? transfer.toAccountType
+      : 'ACCOUNT_TYPE_GENERAL';
   const toAccountTypeLabel = transfer.fromAccountType
-    ? AccountTypeMapping[toAcct]
+    ? AccountType[toAcct]
     : 'Unknown';
 
   return (

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-repeat.tsx

@@ -27,9 +27,9 @@ export function TransferRepeat({ recurring }: TransferRepeatProps) {
     <div className={wrapperClasses}>
       <h2 className={headerClasses}>{t('Active epochs')}</h2>
       <div className="relative block rounded-lg py-6 text-center p-6">
-        <p>
+        <div>
           <EpochOverview id={recurring.startEpoch} />
-        </p>
+        </div>
         <p className="leading-10 my-2">
           <IconForEpoch
             start={recurring.startEpoch}
@@ -37,13 +37,13 @@ export function TransferRepeat({ recurring }: TransferRepeatProps) {
             current={data?.epoch.id}
           />
         </p>
-        <p>
+        <div>
           {recurring.endEpoch ? (
             <EpochOverview id={recurring.endEpoch} />
           ) : (
             <span>{t('Forever')}</span>
           )}
-        </p>
+        </div>
       </div>
     </div>
   );

apps/explorer/src/app/components/txs/details/transfer/blocks/transfer-rewards.tsx

@@ -8,7 +8,7 @@ import { DispatchMetricLabels } from '@vegaprotocol/types';
 export type Metric = components['schemas']['vegaDispatchMetric'];
 export type Strategy = components['schemas']['vegaDispatchStrategy'];
 
-const metricLabels = {
+const metricLabels: Record<Metric, string> = {
   DISPATCH_METRIC_UNSPECIFIED: 'Unknown metric',
   ...DispatchMetricLabels,
 };

apps/explorer/src/app/components/txs/details/transfer/transfer-details.tsx

@@ -3,7 +3,7 @@ import { TransferRepeat } from './blocks/transfer-repeat';
 import { TransferRewards } from './blocks/transfer-rewards';
 import { TransferParticipants } from './blocks/transfer-participants';
 
-export type Recurring = components['schemas']['v1RecurringTransfer'];
+export type Recurring = components['schemas']['commandsv1RecurringTransfer'];
 export type Metric = components['schemas']['vegaDispatchMetric'];
 
 export const wrapperClasses =

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,8 @@ import { TableCell, TableRow, TableWithTbody } from '../../table';
 import { txSignatureToDeterministicId } from '../lib/deterministic-ids';
 import DeterministicOrderDetails from '../../order-details/deterministic-order-details';
 import Hash from '../../links/hash';
+import { TxOrderPeggedReferenceRow } from './order/tx-order-peg';
+import { TxOrderIcebergDetails } from './order/tx-order-iceberg';
 
 interface TxDetailsOrderProps {
   txData: BlockExplorerTransactionResult | undefined;
@@ -29,6 +31,10 @@ export const TxDetailsOrder = ({
     return <>{t('Awaiting Block Explorer transaction details')}</>;
   }
   const marketId = txData.command.orderSubmission.marketId || '-';
+  const reference = txData.command.orderSubmission.peggedOrder;
+  const side = txData.command.orderSubmission.side;
+  const iceberg = txData.command.orderSubmission.icebergOpts;
+  const size = txData.command.orderSubmission.size;
 
   let deterministicId = '';
 
@@ -63,6 +69,22 @@ export const TxDetailsOrder = ({
             <MarketLink id={marketId} />
           </TableCell>
         </TableRow>
+        {reference ? (
+          <TxOrderPeggedReferenceRow
+            side={side}
+            offset={reference.offset}
+            reference={reference.reference}
+            marketId={marketId}
+          />
+        ) : null}
+        {iceberg ? (
+          <TableRow modifier="bordered">
+            <TableCell>{t('Iceberg details')}</TableCell>
+            <TableCell>
+              <TxOrderIcebergDetails iceberg={iceberg} size={size} />
+            </TableCell>
+          </TableRow>
+        ) : null}
       </TableWithTbody>
 
       {deterministicId.length > 0 ? (

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

@@ -10,13 +10,17 @@ export interface FilterLabelProps {
  */
 export function FilterLabel({ filters }: FilterLabelProps) {
   if (!filters || filters.size !== 1) {
-    return <span className="uppercase">{t('Filter')}</span>;
+    return (
+      <span data-testid="filter-empty" className="uppercase">
+        {t('Filter')}
+      </span>
+    );
   }
 
   return (
-    <div>
+    <div data-testid="filter-selected">
       <span className="uppercase">{t('Filters')}:</span>&nbsp;
-      <code className="bg-vega-light-150 px-2 rounded-md capitalize">
+      <code className="bg-vega-light-150 dark:bg-vega-light-300 px-2 rounded-md capitalize dark:text-black">
         {Array.from(filters)[0]}
       </code>
     </div>

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

@@ -0,0 +1,21 @@
+import { render, screen } from '@testing-library/react';
+import { TxsFilter } from './tx-filter';
+import type { FilterOption } from './tx-filter';
+
+describe('TxsFilter', () => {
+  it('renders holding text when nothing is selected', () => {
+    const filters: Set<FilterOption> = new Set([]);
+    const setFilters = jest.fn();
+    render(<TxsFilter filters={filters} setFilters={setFilters} />);
+    expect(screen.getByTestId('filter-empty')).toBeInTheDocument();
+    expect(screen.getByText('Filter')).toBeInTheDocument();
+  });
+
+  it('renders the submit order filter as selected', () => {
+    const filters: Set<FilterOption> = new Set(['Submit Order']);
+    const setFilters = jest.fn();
+    render(<TxsFilter filters={filters} setFilters={setFilters} />);
+    expect(screen.getByTestId('filter-selected')).toBeInTheDocument();
+    expect(screen.getByText('Submit Order')).toBeInTheDocument();
+  });
+});

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

@@ -10,7 +10,6 @@ import {
   DropdownMenuTrigger,
   DropdownMenuSubContent,
   Icon,
-  Button,
 } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction } from 'react';
 import { FilterLabel } from './tx-filter-label';
@@ -91,7 +90,7 @@ export interface TxFilterProps {
  * 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 filters null or Set of transaction types
  * @param setFilters A function to update the filters prop
  * @returns
  */
@@ -100,10 +99,8 @@ export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
     <DropdownMenu
       modal={false}
       trigger={
-        <DropdownMenuTrigger className="ml-2">
-          <Button size="xs">
-            <FilterLabel filters={filters} />
-          </Button>
+        <DropdownMenuTrigger>
+          <FilterLabel filters={filters} />
         </DropdownMenuTrigger>
       }
     >

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

@@ -0,0 +1,113 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+import { TxsListNavigation } from './tx-list-navigation';
+
+const NOOP = () => {
+  return;
+};
+describe('TxsListNavigation', () => {
+  it('renders transaction list navigation', () => {
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={NOOP}
+        hasMoreTxs={true}
+        hasPreviousPage={true}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    expect(screen.getByText('Newer')).toBeInTheDocument();
+    expect(screen.getByText('Older')).toBeInTheDocument();
+  });
+
+  it('calls previousPage when "Newer" button is clicked', () => {
+    const previousPageMock = jest.fn();
+
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={previousPageMock}
+        hasMoreTxs={true}
+        hasPreviousPage={true}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    fireEvent.click(screen.getByText('Newer'));
+
+    expect(previousPageMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('calls nextPage when "Older" button is clicked', () => {
+    const nextPageMock = jest.fn();
+
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={nextPageMock}
+        previousPage={NOOP}
+        hasMoreTxs={true}
+        hasPreviousPage={true}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    fireEvent.click(screen.getByText('Older'));
+
+    expect(nextPageMock).toHaveBeenCalledTimes(1);
+  });
+
+  it('disables "Older" button if hasMoreTxs is false', () => {
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={NOOP}
+        hasMoreTxs={false}
+        hasPreviousPage={false}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    expect(screen.getByText('Older')).toBeDisabled();
+  });
+
+  it('disables "Newer" button if hasPreviousPage is false', () => {
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={NOOP}
+        hasMoreTxs={true}
+        hasPreviousPage={false}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    expect(screen.getByText('Newer')).toBeDisabled();
+  });
+
+  it('disables both buttons when more and previous are false', () => {
+    render(
+      <TxsListNavigation
+        refreshTxs={NOOP}
+        nextPage={NOOP}
+        previousPage={NOOP}
+        hasMoreTxs={false}
+        hasPreviousPage={false}
+      >
+        <span></span>
+      </TxsListNavigation>
+    );
+
+    expect(screen.getByText('Newer')).toBeDisabled();
+    expect(screen.getByText('Older')).toBeDisabled();
+  });
+});

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

@@ -0,0 +1,63 @@
+import { t } from '@vegaprotocol/i18n';
+import { BlocksRefetch } from '../blocks';
+
+import { Button } from '@vegaprotocol/ui-toolkit';
+
+export interface TxListNavigationProps {
+  refreshTxs: () => void;
+  nextPage: () => void;
+  previousPage: () => void;
+  loading?: boolean;
+  hasPreviousPage: boolean;
+  hasMoreTxs: boolean;
+  children: React.ReactNode;
+}
+/**
+ * Displays a list of transactions with filters and controls to navigate through the list.
+ *
+ * @returns {JSX.Element} Transaction List and controls
+ */
+export const TxsListNavigation = ({
+  refreshTxs,
+  nextPage,
+  previousPage,
+  hasMoreTxs,
+  hasPreviousPage,
+  children,
+  loading = false,
+}: TxListNavigationProps) => {
+  return (
+    <>
+      <menu className="mb-2 w-full ">{children}</menu>
+      <menu className="mb-2 w-full">
+        <BlocksRefetch refetch={refreshTxs} />
+        <div className="float-right">
+          <Button
+            className="mr-2"
+            size="xs"
+            disabled={!hasPreviousPage || loading}
+            onClick={() => {
+              previousPage();
+            }}
+          >
+            {t('Newer')}
+          </Button>
+          <Button
+            size="xs"
+            disabled={!hasMoreTxs}
+            onClick={() => {
+              nextPage();
+            }}
+          >
+            {t('Older')}
+          </Button>
+        </div>
+        <div className="float-right mr-2">
+          {loading ? (
+            <span className="text-vega-light-300">{t('Loading...')}</span>
+          ) : null}
+        </div>
+      </menu>
+    </>
+  );
+};

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

@@ -16,7 +16,7 @@ interface StringMap {
 const displayString: StringMap = {
   OrderSubmission: 'Order Submission',
   'Submit Order': 'Order',
-  OrderCancellation: 'Order Cancellation',
+  OrderCancellation: 'Cancel order',
   OrderAmendment: 'Order Amendment',
   VoteSubmission: 'Vote Submission',
   WithdrawSubmission: 'Withdraw Submission',
@@ -24,6 +24,7 @@ const displayString: StringMap = {
   LiquidityProvisionSubmission: 'LP order',
   'Liquidity Provision Order': 'LP order',
   LiquidityProvisionCancellation: 'LP cancel',
+  'Cancel LiquidityProvision Order': 'LP cancel',
   LiquidityProvisionAmendment: 'LP update',
   'Amend LiquidityProvision Order': 'Amend LP',
   ProposalSubmission: 'Governance Proposal',
@@ -36,12 +37,34 @@ const displayString: StringMap = {
   UndelegateSubmission: 'Undelegation',
   KeyRotateSubmission: 'Key Rotation',
   StateVariableProposal: 'State Variable',
+  'State Variable Proposal': 'State Variable',
   Transfer: 'Transfer',
   CancelTransfer: 'Cancel Transfer',
+  'Cancel Transfer Funds': 'Cancel Transfer',
   ValidatorHeartbeat: 'Heartbeat',
+  'Validator Heartbeat': 'Heartbeat',
   'Batch Market Instructions': 'Batch',
+  'Stop Orders Submission': 'Stop',
+  StopOrdersSubmission: 'Stop',
+  StopOrdersCancellation: 'Cancel stop',
+  'Stop Orders Cancellation': 'Cancel stop',
 };
 
+export function getLabelForOrderType(
+  orderType: string,
+  command: components['schemas']['v1InputData']
+): string {
+  if (command.orderSubmission) {
+    if (command.orderSubmission.peggedOrder) {
+      return 'Peg';
+    }
+    if (command.orderSubmission.icebergOpts) {
+      return 'Iceberg';
+    }
+  }
+  return 'Order';
+}
+
 /**
  * Given a proposal, will return a specific label
  * @param chainEvent
@@ -113,6 +136,8 @@ export function getLabelForChainEvent(
       return t('Signer threshold');
     }
     return t('Multisig update');
+  } else if (chainEvent.contractCall) {
+    return t('Contract call');
   }
   return t('Chain Event');
 }
@@ -141,6 +166,7 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
     '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
+  // Note that colours are currently arbitrary
   if (type === 'Chain Event' && !!command?.chainEvent) {
     type = getLabelForChainEvent(command.chainEvent);
     colours = 'text-white dark-text-white bg-vega-pink dark:bg-vega-pink';
@@ -152,6 +178,9 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
       type = getLabelForProposal(command.proposalSubmission);
     }
     colours = 'text-black bg-vega-yellow';
+  } else if (type === 'Order' && command) {
+    type = getLabelForOrderType(orderType, command);
+    colours = 'text-white dark-text-white bg-vega-blue dark:bg-vega-blue';
   }
 
   if (type === 'Vote on Proposal') {
@@ -172,7 +201,7 @@ export const TxOrderType = ({ orderType, command }: TxOrderTypeProps) => {
   return (
     <div
       data-testid="tx-type"
-      className={`text-sm rounded-md leading-none px-2 py-2 inline-block ${colours}`}
+      className={`text-sm rounded-md leading-tight px-2 inline-block whitespace-nowrap ${colours}`}
     >
       {type}
     </div>

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

@@ -1,3 +1,4 @@
+import { MockedProvider } from '@apollo/client/testing';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
 import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
@@ -83,21 +84,26 @@ describe('Txs infinite list item', () => {
 
   it('renders data correctly', () => {
     render(
-      <MemoryRouter>
-        <TxsInfiniteListItem
-          type="testType"
-          submitter="testPubKey"
-          hash="testTxHash"
-          block="1"
-          code={0}
-          command={{}}
-        />
-      </MemoryRouter>
+      <MockedProvider>
+        <MemoryRouter>
+          <table>
+            <tbody>
+              <TxsInfiniteListItem
+                type="testType"
+                submitter="testPubKey"
+                hash="testTxHash"
+                block="1"
+                code={0}
+                command={{}}
+              />
+            </tbody>
+          </table>
+        </MemoryRouter>
+      </MockedProvider>
     );
     expect(screen.getByTestId('tx-hash')).toHaveTextContent('testTxHash');
     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');
   });
 });

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

@@ -1,4 +1,3 @@
-import React from 'react';
 import { TruncatedLink } from '../truncate/truncated-link';
 import { Routes } from '../../routes/route-names';
 import { TxOrderType } from './tx-order-type';
@@ -6,8 +5,25 @@ import type { BlockExplorerTransactionResult } from '../../routes/types/block-ex
 import { toHex } from '../search/detect-search';
 import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
 import isNumber from 'lodash/isNumber';
+import { PartyLink } from '../links';
+import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import type { Screen } from '@vegaprotocol/react-helpers';
+import { useMemo } from 'react';
 
-const TRUNCATE_LENGTH = 10;
+const DEFAULT_TRUNCATE_LENGTH = 7;
+
+export function getIdTruncateLength(screen: Screen): number {
+  if (['xxxl', 'xxl'].includes(screen)) {
+    return 32;
+  } else if (['xl', 'lg', 'md'].includes(screen)) {
+    return 16;
+  }
+  return DEFAULT_TRUNCATE_LENGTH;
+}
+
+export function shouldTruncateParty(screen: Screen): boolean {
+  return !['xxxl', 'xxl', 'xl'].includes(screen);
+}
 
 export const TxsInfiniteListItem = ({
   hash,
@@ -17,6 +33,12 @@ export const TxsInfiniteListItem = ({
   block,
   command,
 }: Partial<BlockExplorerTransactionResult>) => {
+  const { screenSize } = useScreenDimensions();
+  const idTruncateLength = useMemo(
+    () => getIdTruncateLength(screenSize),
+    [screenSize]
+  );
+
   if (
     !hash ||
     !submitter ||
@@ -29,68 +51,40 @@ export const TxsInfiniteListItem = ({
   }
 
   return (
-    <div
+    <tr
       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"
+      className="transaction-row text-left items-center h-full border-t border-neutral-600 dark:border-neutral-800 txs-infinite-list-item py-[2px]"
     >
-      <div
-        className="text-sm col-span-10 md:col-span-3 leading-none"
+      <td
+        className="text-sm leading-none whitespace-nowrap font-mono"
         data-testid="tx-hash"
       >
-        <span className="md:hidden uppercase text-vega-dark-300">
-          ID:&nbsp;
-        </span>
-        <TruncatedLink
-          to={`/${Routes.TX}/${toHex(hash)}`}
-          text={hash}
-          startChars={TRUNCATE_LENGTH}
-          endChars={TRUNCATE_LENGTH}
-        />
-      </div>
-      <div
-        className="text-sm col-span-10 md:col-span-3 leading-none"
-        data-testid="pub-key"
-      >
-        <span className="md:hidden uppercase text-vega-dark-300">
-          By:&nbsp;
-        </span>
-        <TruncatedLink
-          to={`/${Routes.PARTIES}/${submitter}`}
-          text={submitter}
-          startChars={TRUNCATE_LENGTH}
-          endChars={TRUNCATE_LENGTH}
-        />
-      </div>
-      <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 md:col-span-1 leading-none flex items-center"
-        data-testid="tx-block"
-      >
-        <span className="md:hidden uppercase text-vega-dark-300">
-          Block:&nbsp;
-        </span>
-        <TruncatedLink
-          to={`/${Routes.BLOCKS}/${block}`}
-          text={block}
-          startChars={TRUNCATE_LENGTH}
-          endChars={TRUNCATE_LENGTH}
-        />
-      </div>
-      <div
-        className="text-sm col-span-2 md:col-span-1 leading-none flex items-center"
-        data-testid="tx-success"
-      >
-        <span className="md:hidden uppercase text-vega-dark-300">
-          Success&nbsp;
-        </span>
         {isNumber(code) ? (
-          <ChainResponseCode code={code} hideLabel={true} />
+          <ChainResponseCode code={code} hideLabel={true} hideIfOk={true} />
         ) : (
           code
         )}
-      </div>
-    </div>
+        <TruncatedLink
+          to={`/${Routes.TX}/${toHex(hash)}`}
+          text={hash}
+          startChars={idTruncateLength}
+          endChars={0}
+        />
+      </td>
+      <td className="text-sm leading-none">
+        <TxOrderType orderType={type} command={command} />
+      </td>
+      <td className="text-sm leading-none" data-testid="pub-key">
+        <PartyLink truncate={shouldTruncateParty(screenSize)} id={submitter} />
+      </td>
+      <td className="text-sm items-center font-mono" data-testid="tx-block">
+        <TruncatedLink
+          to={`/${Routes.BLOCKS}/${block}`}
+          text={block}
+          startChars={5}
+          endChars={5}
+        />
+      </td>
+    </tr>
   );
 };

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

@@ -1,14 +1,21 @@
 import { TxsInfiniteList } from './txs-infinite-list';
-import { render, screen, fireEvent, act } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
 import { Side } from '@vegaprotocol/types';
+import { MockedProvider } from '@apollo/client/testing';
+
+const generateHash = (): string =>
+  Array.from(
+    { length: 64 },
+    () => '0123456789ABCDEF'[Math.floor(Math.random() * 16)]
+  ).join('');
 
 const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
   return Array.from(Array(number)).map((_) => ({
     block: '87901',
     index: 2,
-    hash: '0F8B98DA0923A50786B852D9CA11E051CACC4C733E1DB93D535C7D81DBD10F6F',
+    hash: generateHash(),
     submitter:
       '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
     type: 'Submit Order',
@@ -40,7 +47,7 @@ describe('Txs infinite list', () => {
   it('should display a "no items" message when no items provided', () => {
     render(
       <TxsInfiniteList
-        txs={undefined}
+        txs={undefined as unknown as BlockExplorerTransactionResult[]}
         areTxsLoading={false}
         hasMoreTxs={false}
         loadMoreTxs={() => null}
@@ -48,23 +55,7 @@ describe('Txs infinite list', () => {
       />
     );
     expect(screen.getByTestId('emptylist')).toBeInTheDocument();
-    expect(
-      screen.getByText('This chain has 0 transactions')
-    ).toBeInTheDocument();
-  });
-
-  it('error is displayed at item level', () => {
-    const txs = generateTxs(1);
-    render(
-      <TxsInfiniteList
-        txs={txs}
-        areTxsLoading={false}
-        hasMoreTxs={false}
-        loadMoreTxs={() => null}
-        error={Error('test error!')}
-      />
-    );
-    expect(screen.getByText('Cannot fetch transaction')).toBeInTheDocument();
+    expect(screen.getByText('No transactions found')).toBeInTheDocument();
   });
 
   it('item renders data of n length into list of n length', () => {
@@ -73,85 +64,22 @@ describe('Txs infinite list', () => {
     const txs = generateTxs(7);
     render(
       <MemoryRouter>
-        <TxsInfiniteList
-          txs={txs}
-          areTxsLoading={false}
-          hasMoreTxs={false}
-          loadMoreTxs={() => null}
-          error={undefined}
-        />
+        <MockedProvider>
+          <TxsInfiniteList
+            txs={txs}
+            areTxsLoading={false}
+            hasMoreTxs={false}
+            loadMoreTxs={() => null}
+            error={undefined}
+          />
+        </MockedProvider>
       </MemoryRouter>
     );
 
     expect(
       screen
-        .getByTestId('infinite-scroll-wrapper')
-        .querySelectorAll('.txs-infinite-list-item')
+        .getByTestId('transactions-list')
+        .querySelectorAll('.transaction-row')
     ).toHaveLength(7);
   });
-
-  it('tries to load more items when required to initially fill the list', () => {
-    // For example, if initially rendering 15, the bottom of the list is
-    // in view of the viewport, and the callback should be executed
-    const txs = generateTxs(15);
-    const callback = jest.fn();
-
-    render(
-      <MemoryRouter>
-        <TxsInfiniteList
-          txs={txs}
-          areTxsLoading={false}
-          hasMoreTxs={true}
-          loadMoreTxs={callback}
-          error={undefined}
-        />
-      </MemoryRouter>
-    );
-
-    expect(callback.mock.calls.length).toEqual(1);
-  });
-
-  it('does not try to load more items if there are no more', () => {
-    const txs = generateTxs(3);
-    const callback = jest.fn();
-
-    render(
-      <MemoryRouter>
-        <TxsInfiniteList
-          txs={txs}
-          areTxsLoading={false}
-          hasMoreTxs={false}
-          loadMoreTxs={callback}
-          error={undefined}
-        />
-      </MemoryRouter>
-    );
-
-    expect(callback.mock.calls.length).toEqual(0);
-  });
-
-  it('loads more items is called when scrolled', () => {
-    const txs = generateTxs(14);
-    const callback = jest.fn();
-
-    render(
-      <MemoryRouter>
-        <TxsInfiniteList
-          txs={txs}
-          areTxsLoading={false}
-          hasMoreTxs={true}
-          loadMoreTxs={callback}
-          error={undefined}
-        />
-      </MemoryRouter>
-    );
-
-    act(() => {
-      fireEvent.scroll(screen.getByTestId('infinite-scroll-wrapper'), {
-        target: { scrollY: 2000 },
-      });
-    });
-
-    expect(callback.mock.calls.length).toEqual(1);
-  });
 });

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

@@ -1,8 +1,4 @@
-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';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
 import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
 import EmptyList from '../empty-list/empty-list';
@@ -11,82 +7,46 @@ import { Loader } from '@vegaprotocol/ui-toolkit';
 interface TxsInfiniteListProps {
   hasMoreTxs: boolean;
   areTxsLoading: boolean | undefined;
-  txs: BlockExplorerTransactionResult[] | undefined;
+  txs: BlockExplorerTransactionResult[];
   loadMoreTxs: () => void;
   error: Error | undefined;
   className?: string;
+  hasFilters?: boolean;
 }
 
 interface ItemProps {
-  index: BlockExplorerTransactionResult;
-  style: React.CSSProperties;
-  isLoading: boolean;
-  error: Error | undefined;
+  tx: BlockExplorerTransactionResult;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-empty-function
-const NOOP = () => {};
-
-const Item = ({ index, style, isLoading, error }: ItemProps) => {
-  let content;
-  if (error) {
-    content = t(`Cannot fetch transaction`);
-  } else if (isLoading) {
-    content = <Loader />;
-  } else {
-    const {
-      hash,
-      submitter,
-      type,
-      command,
-      block,
-      code,
-      index: blockIndex,
-    } = index;
-    content = (
-      <TxsInfiniteListItem
-        type={type}
-        code={code}
-        command={command}
-        submitter={submitter}
-        hash={hash}
-        block={block}
-        index={blockIndex}
-      />
-    );
-  }
-
-  return <div style={style}>{content}</div>;
+const Item = ({ tx }: ItemProps) => {
+  const { hash, submitter, type, command, block, code, index: blockIndex } = tx;
+  return (
+    <TxsInfiniteListItem
+      type={type}
+      code={code}
+      command={command}
+      submitter={submitter}
+      hash={hash}
+      block={block}
+      index={blockIndex}
+    />
+  );
 };
 
 export const TxsInfiniteList = ({
-  hasMoreTxs,
   areTxsLoading,
   txs,
-  loadMoreTxs,
-  error,
   className,
+  hasFilters = false,
 }: TxsInfiniteListProps) => {
-  const { screenSize } = useScreenDimensions();
-  const isStacked = ['xs', 'sm'].includes(screenSize);
-  const infiniteLoaderRef = useRef<InfiniteLoader>(null);
-  const hasMountedRef = useRef(false);
-
-  useEffect(() => {
-    if (hasMountedRef.current) {
-      if (infiniteLoaderRef.current) {
-        infiniteLoaderRef.current.resetloadMoreItemsCache(true);
-      }
-    }
-    hasMountedRef.current = true;
-  }, [loadMoreTxs]);
-
-  if (!txs) {
+  if (!txs || txs.length === 0) {
     if (!areTxsLoading) {
       return (
         <EmptyList
-          heading={t('This chain has 0 transactions')}
-          label={t('Check back soon')}
+          heading={t('No transactions found')}
+          label={
+            hasFilters ? t('Try a different filter') : t('Check back soon')
+          }
         />
       );
     } else {
@@ -94,57 +54,26 @@ export const TxsInfiniteList = ({
     }
   }
 
-  // If there are more items to be loaded then add an extra row to hold a loading indicator.
-  const itemCount = hasMoreTxs ? txs.length + 1 : txs.length;
-
-  // Pass an empty callback to InfiniteLoader in case it asks us to load more than once.
-  // eslint-disable-next-line @typescript-eslint/no-empty-function
-  const loadMoreItems = areTxsLoading ? NOOP : loadMoreTxs;
-
-  // Every row is loaded except for our loading indicator row.
-  const isItemLoaded = (index: number) => !hasMoreTxs || index < txs.length;
-
   return (
-    <div className={className} data-testid="transactions-list">
-      <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">{t('Transaction')} &nbsp;</span>
-          <span>ID</span>
-        </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
-              className="List"
-              height={995}
-              itemCount={itemCount}
-              itemSize={isStacked ? 134 : 50}
-              onItemsRendered={onItemsRendered}
-              ref={ref}
-              width={'100%'}
-            >
-              {({ index, style }) => (
-                <Item
-                  index={txs[index]}
-                  style={style}
-                  isLoading={!isItemLoaded(index)}
-                  error={error}
-                />
-              )}
-            </List>
-          )}
-        </InfiniteLoader>
-      </div>
+    <div className="overflow-scroll">
+      <table className={className} data-testid="transactions-list">
+        <thead>
+          <tr className="w-full mb-3 text-vega-dark-300 uppercase text-left">
+            <th>
+              <span className="hidden xl:inline">{t('Txn')} &nbsp;</span>
+              <span>ID</span>
+            </th>
+            <th>{t('Type')}</th>
+            <th className="text-left">{t('From')}</th>
+            <th>{t('Block')}</th>
+          </tr>
+        </thead>
+        <tbody>
+          {txs.map((t) => (
+            <Item key={t.hash} tx={t} />
+          ))}
+        </tbody>
+      </table>
     </div>
   );
 };

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

@@ -1,26 +1,20 @@
-import { Routes } from '../../routes/route-names';
-import { TruncatedLink } from '../truncate/truncated-link';
-import { TxOrderType } from './tx-order-type';
-import { Table, TableRow, TableCell } from '../table';
+import { Table, TableRow } from '../table';
 import { t } from '@vegaprotocol/i18n';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type { BlockExplorerTransactions } from '../../routes/types/block-explorer-response';
-import isNumber from 'lodash/isNumber';
-import { ChainResponseCode } from './details/chain-response-code/chain-reponse.code';
-import { getTxsDataUrl } from '../../hooks/use-txs-data';
+import { getTxsDataUrl } from '../../hooks/get-txs-data-url';
 import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';
+import { TxsInfiniteListItem } from './txs-infinite-list-item';
 
 interface TxsPerBlockProps {
   blockHeight: string;
   txCount: number;
 }
 
-const truncateLength = 5;
-
 export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
   const filters = `filters[block.height]=${blockHeight}`;
-  const url = getTxsDataUrl({ limit: txCount.toString(), filters });
+  const url = getTxsDataUrl({ filters, count: txCount });
   const {
     state: { data, loading, error },
   } = useFetch<BlockExplorerTransactions>(url);
@@ -33,53 +27,23 @@ export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
             <thead>
               <TableRow modifier="bordered" className="font-mono">
                 <td>{t('Transaction')}</td>
-                <td>{t('From')}</td>
                 <td>{t('Type')}</td>
-                <td>{t('Status')}</td>
+                <td>{t('From')}</td>
+                <td>{t('Block')}</td>
               </TableRow>
             </thead>
             <tbody>
               {data.transactions.map(
-                ({ hash, submitter, type, command, code }) => {
+                ({ hash, submitter, type, command, code, block }) => {
                   return (
-                    <TableRow
-                      modifier="bordered"
-                      key={hash}
-                      data-testid="transaction-row"
-                    >
-                      <TableCell
-                        modifier="bordered"
-                        className="pr-12 font-mono"
-                      >
-                        <TruncatedLink
-                          to={`/${Routes.TX}/${hash}`}
-                          text={hash}
-                          startChars={truncateLength}
-                          endChars={truncateLength}
-                        />
-                      </TableCell>
-                      <TableCell
-                        modifier="bordered"
-                        className="pr-12 font-mono"
-                      >
-                        <TruncatedLink
-                          to={`/${Routes.PARTIES}/${submitter}`}
-                          text={submitter}
-                          startChars={truncateLength}
-                          endChars={truncateLength}
-                        />
-                      </TableCell>
-                      <TableCell modifier="bordered">
-                        <TxOrderType orderType={type} command={command} />
-                      </TableCell>
-                      <TableCell modifier="bordered" className="text">
-                        {isNumber(code) ? (
-                          <ChainResponseCode code={code} hideLabel={true} />
-                        ) : (
-                          code
-                        )}
-                      </TableCell>
-                    </TableRow>
+                    <TxsInfiniteListItem
+                      block={block}
+                      hash={hash}
+                      submitter={submitter}
+                      type={type}
+                      command={command}
+                      code={code}
+                    />
                   );
                 }
               )}

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

@@ -56,10 +56,14 @@ export function VoteIcon({
 
   return (
     <div
-      className={`voteicon inline-block my-1 py-1 px-2 py rounded-md text-white leading-one sm align-top ${bg}`}
+      className={`voteicon inline-block py-0 px-2 py rounded-md text-white whitespace-nowrap leading-tight 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">
+      <Icon
+        name={icon}
+        size={3}
+        className={`mr-2 p-0 mb-[-1px] fill-${fill}`}
+      />
+      <span className={`text-${text}`} data-testid="label">
         {label}
       </span>
     </div>

apps/explorer/src/app/config/env.ts

@@ -5,8 +5,6 @@ const windowOrDefault = (key: string) => {
   return (process.env[key] as string) || '';
 };
 
-const truthy = ['1', 'true'];
-
 export const ENV = {
   // Data sources
   // Environment
@@ -20,19 +18,6 @@ export const ENV = {
     governanceUrl: windowOrDefault('NX_VEGA_GOVERNANCE_URL'),
     vegaRepoUrl: windowOrDefault('NX_VEGA_REPO_URL'),
   },
-  flags: {
-    assets: truthy.includes(windowOrDefault('NX_EXPLORER_ASSETS')),
-    genesis: truthy.includes(windowOrDefault('NX_EXPLORER_GENESIS')),
-    governance: truthy.includes(windowOrDefault('NX_EXPLORER_GOVERNANCE')),
-    markets: truthy.includes(windowOrDefault('NX_EXPLORER_MARKETS')),
-    oracles: truthy.includes(windowOrDefault('NX_EXPLORER_ORACLES')),
-    txsList: truthy.includes(windowOrDefault('NX_EXPLORER_TXS_LIST')),
-    networkParameters: truthy.includes(
-      windowOrDefault('NX_EXPLORER_NETWORK_PARAMETERS')
-    ),
-    parties: truthy.includes(windowOrDefault('NX_EXPLORER_PARTIES')),
-    validators: truthy.includes(windowOrDefault('NX_EXPLORER_VALIDATORS')),
-  },
   addresses: {
     feedback: windowOrDefault('NX_GITHUB_FEEDBACK_URL'),
   },

apps/explorer/src/app/config/flags.ts

@@ -1,5 +0,0 @@
-import { ENV } from './env';
-
-export default {
-  ...ENV.flags,
-};

apps/explorer/src/app/hooks/get-txs-data-url.ts

@@ -0,0 +1,59 @@
+import { DATA_SOURCES } from '../config';
+
+type IGetTxsDataFirstPage = {
+  baseUrl?: string;
+  count?: number;
+  party?: string;
+  filters?: string;
+};
+
+interface IGetTxsDataPrevious extends IGetTxsDataFirstPage {
+  before: string;
+}
+
+interface IGetTxsDataNext extends IGetTxsDataFirstPage {
+  after: string;
+}
+
+type IGetTxsDataUrl =
+  | IGetTxsDataPrevious
+  | IGetTxsDataNext
+  | IGetTxsDataFirstPage;
+
+export const BE_TXS_PER_REQUEST = 25;
+
+/**
+ * Properly encodes the filters and parameters for a request to the block explorer
+ * API for transactions. As the API uses a slightly less common format for encoding
+ * filters, some of it is more manual than you might expect.
+ *
+ * @param params An object containing the pagination and filters
+ * @returns string URL to call
+ */
+export const getTxsDataUrl = (params: IGetTxsDataUrl) => {
+  const baseUrl =
+    params.baseUrl || `${DATA_SOURCES.blockExplorerUrl}/transactions`;
+  const url = new URL(baseUrl);
+  const count = `${params.count || BE_TXS_PER_REQUEST}`;
+
+  if ('before' in params && params.before?.length > 0) {
+    url.searchParams.append('last', count);
+    url.searchParams.append('before', params.before);
+  } else if ('after' in params && params.after?.length > 0) {
+    url.searchParams.append('first', count);
+    url.searchParams.append('after', params.after);
+  } else {
+    url.searchParams.append('first', count);
+  }
+
+  // Hacky fix for param as array
+  let urlAsString = url.toString();
+  if (params.filters && params.filters?.length > 0) {
+    urlAsString += '&' + params.filters.replaceAll(' ', '%20');
+  }
+  if (params.party && params.party?.length > 0) {
+    urlAsString += `&filters[tx.submitter]=${params.party}`;
+  }
+
+  return urlAsString;
+};

apps/explorer/src/app/hooks/get-txs-data-urls.spec.ts

@@ -0,0 +1,48 @@
+import { getTxsDataUrl } from './get-txs-data-url'; // import the function to be tested
+
+describe('getTxsDataUrl', () => {
+  it('should return the correct URL without filters and party', () => {
+    const params = {
+      count: 10,
+      baseUrl: 'https://example.com/transactions',
+    };
+    const expectedUrl = 'https://example.com/transactions?first=10';
+
+    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
+  });
+
+  it('should return the correct URL with "before" in params', () => {
+    const params = {
+      count: 5,
+      before: '100.1',
+      baseUrl: 'https://example.com/transactions',
+    };
+    const expectedUrl = 'https://example.com/transactions?last=5&before=100.1';
+
+    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
+  });
+
+  it('should return the correct URL with "after" in params', () => {
+    const params = {
+      count: 5,
+      after: '222.1',
+      baseUrl: 'https://example.com/transactions',
+    };
+    const expectedUrl = 'https://example.com/transactions?first=5&after=222.1';
+
+    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
+  });
+
+  it('should return the correct URL with filters and party', () => {
+    const params = {
+      count: 10,
+      filters: 'filters[cmd.type]=Made Up Transaction',
+      party: '1234',
+      baseUrl: 'https://example.com/transactions',
+    };
+    const expectedUrl =
+      'https://example.com/transactions?first=10&filters[cmd.type]=Made%20Up%20Transaction&filters[tx.submitter]=1234';
+
+    expect(getTxsDataUrl(params)).toEqual(expectedUrl);
+  });
+});

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

@@ -1,102 +1,141 @@
-import { useCallback, useEffect, useState } from 'react';
+import { useSearchParams } from 'react-router-dom';
+import type { URLSearchParamsInit } from 'react-router-dom';
+import { useCallback } from 'react';
 import { useFetch } from '@vegaprotocol/react-helpers';
 import type {
   BlockExplorerTransactionResult,
   BlockExplorerTransactions,
 } from '../routes/types/block-explorer-response';
-import { DATA_SOURCES } from '../config';
 import isNumber from 'lodash/isNumber';
+import { AllFilterOptions } from '../components/txs/tx-filter';
+import type { FilterOption } from '../components/txs/tx-filter';
+import { BE_TXS_PER_REQUEST, getTxsDataUrl } from './get-txs-data-url';
 
-export interface TxsStateProps {
-  txsData: BlockExplorerTransactionResult[];
-  hasMoreTxs: boolean;
-  lastCursor: string;
+export function getTypeFilters(filters?: Set<FilterOption>) {
+  if (!filters) {
+    return '';
+  } else if (filters.size > 1) {
+    return '';
+  }
+
+  const forcedSingleFilter = Array.from(filters)[0];
+  return `filters[cmd.type]=${forcedSingleFilter}`;
 }
 
 export interface IUseTxsData {
-  limit?: number;
-  filters?: string;
+  count?: number;
+  before?: string;
+  after?: string;
+  party?: string;
+  filters?: Set<FilterOption>;
 }
 
-interface IGetTxsDataUrl {
-  limit?: string;
-  filters?: string;
-}
+export const useTxsData = ({
+  count = 25,
+  before,
+  after,
+  filters,
+  party,
+}: IUseTxsData) => {
+  const [, setSearchParams] = useSearchParams();
+  let hasMoreTxs = true;
+  let txsData: BlockExplorerTransactionResult[] = [];
 
-export const getTxsDataUrl = ({ limit, filters }: IGetTxsDataUrl) => {
-  const url = new URL(`${DATA_SOURCES.blockExplorerUrl}/transactions`);
-
-  if (limit) {
-    url.searchParams.append('limit', limit);
-  }
-
-  // Hacky fix for param as array
-  let urlAsString = url.toString();
-  if (filters) {
-    urlAsString += '&' + filters.replace(' ', '%20');
-  }
-
-  return urlAsString;
-};
-
-export const useTxsData = ({ limit, filters }: IUseTxsData) => {
-  const [{ txsData, hasMoreTxs, lastCursor }, setTxsState] =
-    useState<TxsStateProps>({
-      txsData: [],
-      hasMoreTxs: true,
-      lastCursor: '',
-    });
-
-  const url = getTxsDataUrl({ limit: limit?.toString(), filters });
+  const url = getTxsDataUrl({
+    filters: getTypeFilters(filters),
+    count,
+    before,
+    after,
+    party,
+  });
 
   const {
     state: { data, error, loading },
     refetch,
-  } = useFetch<BlockExplorerTransactions>(url, {}, false);
+  } = useFetch<BlockExplorerTransactions>(url, {}, true);
 
-  useEffect(() => {
-    if (data && isNumber(data?.transactions?.length)) {
-      setTxsState((prev) => ({
-        txsData: [...prev.txsData, ...data.transactions],
-        hasMoreTxs: data.transactions.length > 0,
-        lastCursor:
-          data.transactions[data.transactions.length - 1]?.cursor || '',
-      }));
+  if (!loading && data && isNumber(data.transactions.length)) {
+    hasMoreTxs = data.transactions.length >= count;
+    txsData = data.transactions;
+  }
+
+  const nextPage = useCallback(() => {
+    const after = data?.transactions.at(-1)?.cursor || '';
+    const params: URLSearchParamsInit = { after };
+    if (filters) {
+      params.filters = Array.from(filters).join(',');
     }
-  }, [setTxsState, data]);
+    setSearchParams(params);
+  }, [filters, data, setSearchParams]);
 
-  useEffect(() => {
-    setTxsState((prev) => ({
-      txsData: [],
-      hasMoreTxs: true,
-      lastCursor: '',
-    }));
-  }, [filters]);
-
-  const loadTxs = useCallback(() => {
-    return refetch({
-      limit: limit,
-      before: lastCursor,
-    });
-  }, [lastCursor, limit, refetch]);
+  const previousPage = useCallback(() => {
+    const before = data?.transactions[0]?.cursor || '';
+    const params: URLSearchParamsInit = { before };
+    if (filters && filters.size > 0 && filters.size === 1) {
+      params.filters = Array.from(filters)[0];
+    }
+    setSearchParams(params);
+  }, [filters, data, setSearchParams]);
 
   const refreshTxs = useCallback(async () => {
-    setTxsState((prev) => ({
-      ...prev,
-      lastCursor: '',
-      hasMoreTxs: true,
-      txsData: [],
-    }));
-  }, [setTxsState]);
+    const params: URLSearchParamsInit = {};
+    if (filters && filters.size > 0 && filters.size === 1) {
+      params.filters = Array.from(filters)[0];
+    }
+    setSearchParams(params);
+
+    refetch({ count: BE_TXS_PER_REQUEST });
+  }, [setSearchParams, refetch, filters]);
+
+  const updateFilters = useCallback(
+    (newFilters: Set<FilterOption>) => {
+      const params: URLSearchParamsInit = {};
+      if (newFilters && newFilters.size === 1) {
+        params.filters = Array.from(newFilters)[0];
+      }
+
+      setSearchParams(params);
+    },
+    [setSearchParams]
+  );
 
   return {
-    data,
+    updateFilters,
+    txsData,
     loading,
     error,
-    txsData,
     hasMoreTxs,
-    lastCursor,
     refreshTxs,
-    loadTxs,
+    nextPage,
+    previousPage,
   };
 };
+
+/**
+ * Returns a Set of filters based on the URLSearchParams, or
+ * defaults to all.
+ * @param params
+ * @returns Set
+ */
+export function getInitialFilters(params: URLSearchParams): Set<FilterOption> {
+  const defaultFilters = new Set(AllFilterOptions);
+
+  const p = params.get('filters');
+
+  if (!p) {
+    return defaultFilters;
+  }
+
+  const filters = new Set<FilterOption>();
+  p.split(',').forEach((f) => {
+    if (AllFilterOptions.includes(f as FilterOption)) {
+      filters.add(f as FilterOption);
+    }
+  });
+
+  if (filters.size === 0) {
+    return defaultFilters;
+  }
+
+  return filters;
+}

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

@@ -204,6 +204,7 @@ describe('Block', () => {
     (useFetch as jest.Mock).mockReturnValue({
       state: { data: createBlockResponse(1), loading: false, error: null },
     });
+
     render(renderComponent(1));
     await waitFor(() => screen.getByTestId('block-header'));
     expect(screen.getByTestId('previous-block-button')).toHaveAttribute(

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

@@ -1,7 +1,5 @@
 import { Link, useParams } from 'react-router-dom';
-import { DATA_SOURCES } from '../../../config';
 import { getDateTimeFormat } from '@vegaprotocol/utils';
-import type { TendermintBlocksResponse } from '../tendermint-blocks-response';
 import { RouteTitle } from '../../../components/route-title';
 import { TimeAgo } from '../../../components/time-ago';
 import {
@@ -14,7 +12,7 @@ import { TxsPerBlock } from '../../../components/txs/txs-per-block';
 import { AsyncRenderer, Button } from '@vegaprotocol/ui-toolkit';
 import { Routes } from '../../route-names';
 import { t } from '@vegaprotocol/i18n';
-import { useFetch } from '@vegaprotocol/react-helpers';
+import { useBlockInfo } from '@vegaprotocol/tendermint';
 import { NodeLink } from '../../../components/links';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import EmptyList from '../../../components/empty-list/empty-list';
@@ -24,10 +22,7 @@ const Block = () => {
   useDocumentTitle(['Blocks', `Block #${block}`]);
   const {
     state: { data: blockData, loading, error },
-  } = useFetch<TendermintBlocksResponse>(
-    `${DATA_SOURCES.tendermintUrl}/block?height=${block}`,
-    { cache: 'force-cache' }
-  );
+  } = useBlockInfo(Number(block));
 
   return (
     <section>

apps/explorer/src/app/routes/layout.tsx

@@ -21,6 +21,7 @@ import {
 import { Footer } from '../components/footer/footer';
 import { Header } from '../components/header';
 import { Routes } from './route-names';
+import { useExplorerNodeNamesLazyQuery } from './validators/__generated__/NodeNames';
 
 const DialogsContainer = () => {
   const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
@@ -39,6 +40,7 @@ export const Layout = () => {
   const isHome = Boolean(useMatch(Routes.HOME));
   const { ANNOUNCEMENTS_CONFIG_URL } = useEnvironment();
   const fixedWidthClasses = 'w-full max-w-[1500px] mx-auto';
+  useExplorerNodeNamesLazyQuery();
 
   return (
     <>
@@ -49,7 +51,7 @@ export const Layout = () => {
           'grid grid-rows-[auto_1fr_auto] grid-cols-1',
           'border-vega-light-200 dark:border-vega-dark-200',
           'antialiased text-black dark:text-white',
-          'overflow-hidden relative'
+          'relative'
         )}
       >
         <div>

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

@@ -2,12 +2,15 @@ import { render } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
 import type { SourceType } from './oracle';
 import { OracleSigners } from './oracle-signers';
+import { MockedProvider } from '@apollo/client/testing';
 
 function renderComponent(sourceType: SourceType) {
   return (
-    <MemoryRouter>
-      <OracleSigners sourceType={sourceType} />
-    </MemoryRouter>
+    <MockedProvider>
+      <MemoryRouter>
+        <OracleSigners sourceType={sourceType} />
+      </MemoryRouter>
+    </MockedProvider>
   );
 }
 

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

@@ -54,7 +54,7 @@ export const PartyBlockStake = ({
       {p?.stakingSummary.currentStakeAvailable ? (
         <KeyValueTable>
           <KeyValueTableRow noBorder={true}>
-            <div>{t('Available stake')}</div>
+            <div>{t('Associated to key')}</div>
             <div>
               <GovernanceAssetBalance
                 price={p.stakingSummary.currentStakeAvailable}
@@ -62,7 +62,7 @@ export const PartyBlockStake = ({
             </div>
           </KeyValueTableRow>
           <KeyValueTableRow noBorder={true}>
-            <div>{t('Active stake')}</div>
+            <div>{t('Staked to validator')}</div>
             <div>
               <GovernanceAssetBalance price={linkedStake || '0'} />
             </div>

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

@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/i18n';
 import { useScreenDimensions } from '@vegaprotocol/react-helpers';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import { SubHeading } from '../../../components/sub-heading';
 import { toNonHex } from '../../../components/search/detect-search';
@@ -14,8 +14,15 @@ 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';
+import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';
+import type { FilterOption } from '../../../components/txs/tx-filter';
+import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
+import { useSearchParams } from 'react-router-dom';
 
 const Party = () => {
+  const [params] = useSearchParams();
+
+  const [filters, setFilters] = useState(new Set(AllFilterOptions));
   const { party } = useParams<{ party: string }>();
 
   useDocumentTitle(['Public keys', party || '-']);
@@ -24,10 +31,21 @@ const Party = () => {
   const partyId = toNonHex(party ? party : '');
   const { isMobile } = useScreenDimensions();
   const visibleChars = useMemo(() => (isMobile ? 10 : 14), [isMobile]);
-  const filters = `filters[tx.submitter]=${partyId}`;
-  const { hasMoreTxs, loadTxs, error, txsData, loading } = useTxsData({
-    limit: 10,
-    filters,
+
+  const {
+    nextPage,
+    refreshTxs,
+    previousPage,
+    error,
+    loading,
+    txsData,
+    hasMoreTxs,
+    updateFilters,
+  } = useTxsData({
+    filters: filters.size === 1 ? filters : undefined,
+    before: params.get('before') || undefined,
+    after: !params.get('before') ? params.get('after') || undefined : undefined,
+    party: partyId,
   });
 
   const variables = useMemo(() => ({ partyId }), [partyId]);
@@ -50,7 +68,7 @@ const Party = () => {
             text: t('Go back'),
             action: () => navigate(-1),
             className: 'py-1',
-            size: 'sm',
+            size: 'small',
           }}
         />
       </div>
@@ -81,14 +99,30 @@ const Party = () => {
       </div>
 
       <SubHeading>{t('Transactions')}</SubHeading>
+      <TxsListNavigation
+        refreshTxs={refreshTxs}
+        nextPage={nextPage}
+        previousPage={previousPage}
+        hasPreviousPage={true}
+        loading={loading}
+        hasMoreTxs={hasMoreTxs}
+      >
+        <TxsFilter
+          filters={filters}
+          setFilters={(f) => {
+            setFilters(f);
+            updateFilters(f as Set<FilterOption>);
+          }}
+        />
+      </TxsListNavigation>
       {!error && txsData ? (
         <TxsInfiniteList
-          hasMoreTxs={hasMoreTxs}
+          hasMoreTxs={true}
           areTxsLoading={loading}
           txs={txsData}
-          loadMoreTxs={loadTxs}
+          loadMoreTxs={nextPage}
           error={error}
-          className="mb-28"
+          className="mb-28 w-full"
         />
       ) : (
         <Splash>

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 flags from '../config/flags';
 import { t } from '@vegaprotocol/i18n';
 import { Routes } from './route-names';
 import { NetworkParameters } from './network-parameters';
@@ -30,6 +29,7 @@ import { truncateMiddle } from '@vegaprotocol/ui-toolkit';
 import { remove0x } from '@vegaprotocol/utils';
 import { PartyAccountsByAsset } from './parties/id/accounts';
 import { Disclaimer } from './pages/disclaimer';
+import { FLAGS } from '@vegaprotocol/environment';
 
 export type Navigable = {
   path: string;
@@ -59,7 +59,7 @@ type Route = RouteItem & {
   children?: RouteItem[];
 };
 
-const partiesRoutes: Route[] = flags.parties
+const partiesRoutes: Route[] = FLAGS.EXPLORER_PARTIES
   ? [
       {
         path: Routes.PARTIES,
@@ -119,7 +119,7 @@ const partiesRoutes: Route[] = flags.parties
     ]
   : [];
 
-const assetsRoutes: Route[] = flags.assets
+const assetsRoutes: Route[] = FLAGS.EXPLORER_ASSETS
   ? [
       {
         path: Routes.ASSETS,
@@ -147,7 +147,7 @@ const assetsRoutes: Route[] = flags.assets
     ]
   : [];
 
-const genesisRoutes: Route[] = flags.genesis
+const genesisRoutes: Route[] = FLAGS.EXPLORER_GENESIS
   ? [
       {
         path: Routes.GENESIS,
@@ -163,7 +163,7 @@ const genesisRoutes: Route[] = flags.genesis
     ]
   : [];
 
-const governanceRoutes: Route[] = flags.governance
+const governanceRoutes: Route[] = FLAGS.EXPLORER_GOVERNANCE
   ? [
       {
         path: Routes.GOVERNANCE,
@@ -179,7 +179,7 @@ const governanceRoutes: Route[] = flags.governance
     ]
   : [];
 
-const marketsRoutes: Route[] = flags.markets
+const marketsRoutes: Route[] = FLAGS.EXPLORER_MARKETS
   ? [
       {
         path: Routes.MARKETS,
@@ -207,7 +207,7 @@ const marketsRoutes: Route[] = flags.markets
     ]
   : [];
 
-const networkParametersRoutes: Route[] = flags.networkParameters
+const networkParametersRoutes: Route[] = FLAGS.EXPLORER_NETWORK_PARAMETERS
   ? [
       {
         path: Routes.NETWORK_PARAMETERS,
@@ -225,7 +225,7 @@ const networkParametersRoutes: Route[] = flags.networkParameters
     ]
   : [];
 
-const validators: Route[] = flags.validators
+const validators: Route[] = FLAGS.EXPLORER_VALIDATORS
   ? [
       {
         path: Routes.VALIDATORS,

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

@@ -1,14 +1,14 @@
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../../components/route-title';
-import { BlocksRefetch } from '../../../components/blocks';
 import { TxsInfiniteList } from '../../../components/txs';
-import { useTxsData } from '../../../hooks/use-txs-data';
+import { useTxsData, getInitialFilters } from '../../../hooks/use-txs-data';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 
 import { useState } from 'react';
-import { AllFilterOptions, TxsFilter } from '../../../components/txs/tx-filter';
-
-const BE_TXS_PER_REQUEST = 15;
+import { TxsFilter } from '../../../components/txs/tx-filter';
+import type { FilterOption } from '../../../components/txs/tx-filter';
+import { TxsListNavigation } from '../../../components/txs/tx-list-navigation';
+import { useSearchParams } from 'react-router-dom';
 
 export const TxsList = () => {
   useDocumentTitle(['Transactions']);
@@ -21,34 +21,56 @@ export const TxsList = () => {
   );
 };
 
+/**
+ * Displays a list of transactions with filters and controls to navigate through the list.
+ *
+ * @returns {JSX.Element} Transaction List and controls
+ */
 export const TxsListFiltered = () => {
-  const [filters, setFilters] = useState(new Set(AllFilterOptions));
+  const [params] = useSearchParams();
+  const [filters, setFilters] = useState(getInitialFilters(params));
 
-  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,
-    });
+  const {
+    nextPage,
+    previousPage,
+    error,
+    refreshTxs,
+    loading,
+    txsData,
+    hasMoreTxs,
+    updateFilters,
+  } = useTxsData({
+    filters: filters.size === 1 ? filters : undefined,
+    before: params.get('before') || undefined,
+    after: !params.get('before') ? params.get('after') || undefined : undefined,
+  });
 
   return (
     <>
-      <menu className="mb-2">
-        <BlocksRefetch refetch={refreshTxs} />
-        <TxsFilter filters={filters} setFilters={setFilters} />
-      </menu>
-
+      <TxsListNavigation
+        refreshTxs={refreshTxs}
+        nextPage={nextPage}
+        previousPage={previousPage}
+        hasPreviousPage={true}
+        loading={loading}
+        hasMoreTxs={hasMoreTxs}
+      >
+        <TxsFilter
+          filters={filters}
+          setFilters={(f) => {
+            setFilters(f);
+            updateFilters(f as Set<FilterOption>);
+          }}
+        />
+      </TxsListNavigation>
       <TxsInfiniteList
+        hasFilters={filters.size > 0}
         hasMoreTxs={hasMoreTxs}
         areTxsLoading={loading}
         txs={txsData}
-        loadMoreTxs={loadTxs}
+        loadMoreTxs={nextPage}
         error={error}
-        className="mb-28"
+        className="mb-28 w-full min-w-[400px]"
       />
     </>
   );

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

@@ -1,10 +1,11 @@
-import { BrowserRouter as Router } from 'react-router-dom';
 import { render, screen } from '@testing-library/react';
 import { TxDetails } from './tx-details';
 import type {
   BlockExplorerTransactionResult,
   ValidatorHeartbeat,
 } from '../../../routes/types/block-explorer-response';
+import { MemoryRouter } from 'react-router-dom';
+import { MockedProvider } from '@apollo/client/testing';
 
 // Note: Long enough that there is a truncated output and a full output
 const pubKey =
@@ -27,9 +28,11 @@ const txData: BlockExplorerTransactionResult = {
 };
 
 const renderComponent = (txData: BlockExplorerTransactionResult) => (
-  <Router>
-    <TxDetails txData={txData} pubKey={pubKey} />
-  </Router>
+  <MemoryRouter>
+    <MockedProvider>
+      <TxDetails txData={txData} pubKey={pubKey} />
+    </MockedProvider>
+  </MemoryRouter>
 );
 
 describe('Transaction details', () => {

apps/explorer/src/app/routes/validators/NodeNames.graphql

@@ -0,0 +1,13 @@
+query ExplorerNodeNames {
+  nodesConnection {
+    edges {
+      node {
+        id
+        name
+        pubkey
+        tmPubkey
+        ethereumAddress
+      }
+    }
+  }
+}

apps/explorer/src/app/routes/validators/Nodes.graphql

@@ -15,6 +15,9 @@ query ExplorerNodes {
         stakedByDelegates
         stakedTotal
         pendingStake
+        rankingScore {
+          performanceScore
+        }
         epochData {
           total
           offline

apps/explorer/src/app/routes/validators/__generated__/NodeNames.ts

@@ -0,0 +1,53 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerNodeNamesQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type ExplorerNodeNamesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, pubkey: string, tmPubkey: string, ethereumAddress: string } } | null> | null } };
+
+
+export const ExplorerNodeNamesDocument = gql`
+    query ExplorerNodeNames {
+  nodesConnection {
+    edges {
+      node {
+        id
+        name
+        pubkey
+        tmPubkey
+        ethereumAddress
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useExplorerNodeNamesQuery__
+ *
+ * To run a query within a React component, call `useExplorerNodeNamesQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerNodeNamesQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useExplorerNodeNamesQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useExplorerNodeNamesQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>(ExplorerNodeNamesDocument, options);
+      }
+export function useExplorerNodeNamesLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>(ExplorerNodeNamesDocument, options);
+        }
+export type ExplorerNodeNamesQueryHookResult = ReturnType<typeof useExplorerNodeNamesQuery>;
+export type ExplorerNodeNamesLazyQueryHookResult = ReturnType<typeof useExplorerNodeNamesLazyQuery>;
+export type ExplorerNodeNamesQueryResult = Apollo.QueryResult<ExplorerNodeNamesQuery, ExplorerNodeNamesQueryVariables>;

apps/explorer/src/app/routes/validators/__generated__/Nodes.ts

@@ -6,7 +6,7 @@ const defaultOptions = {} as const;
 export type ExplorerNodesQueryVariables = Types.Exact<{ [key: string]: never; }>;
 
 
-export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };
+export type ExplorerNodesQuery = { __typename?: 'Query', nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, infoUrl: string, avatarUrl?: string | null, pubkey: string, tmPubkey: string, ethereumAddress: string, location: string, status: Types.NodeStatus, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, rankingScore: { __typename?: 'RankingScore', performanceScore: string }, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null } } | null> | null } };
 
 
 export const ExplorerNodesDocument = gql`
@@ -27,6 +27,9 @@ export const ExplorerNodesDocument = gql`
         stakedByDelegates
         stakedTotal
         pendingStake
+        rankingScore {
+          performanceScore
+        }
         epochData {
           total
           offline

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

@@ -91,7 +91,15 @@ export const ValidatorsPage = () => {
   const { data: tmData } = useTendermintValidators(5000);
   const { data, loading, error, refetch } = useExplorerNodesQuery();
 
-  const validators = compact(data?.nodesConnection.edges?.map((e) => e?.node));
+  const validators = compact(
+    data?.nodesConnection.edges
+      ?.map((e) => e?.node)
+      .filter(
+        (node) =>
+          node?.rankingScore?.performanceScore &&
+          new BigNumber(node.rankingScore.performanceScore).isGreaterThan(0)
+      )
+  );
 
   // voting power
   const powers = compact(tmData?.result.validators).map(

apps/explorer/src/styles.css

@@ -1,6 +1,5 @@
-@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';
+@import 'ag-grid-community/styles/ag-grid.css';
+@import 'ag-grid-community/styles/ag-theme-balham.css';
 
 /* You can add global styles to this file, and also import other style files */
 @tailwind base;

apps/explorer/src/types/explorer.d.ts

@@ -3,7 +3,7 @@
  * Do not make direct changes to the file.
  */
 
-/** Type helpers */
+/** OneOf type helpers */
 type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
 type XOR<T, U> = T | U extends object
   ? (Without<T, U> & U) | (Without<U, T> & T)
@@ -41,6 +41,8 @@ export interface paths {
   };
 }
 
+export type webhooks = Record<string, never>;
+
 export interface components {
   schemas: {
     /**
@@ -101,6 +103,17 @@ export interface components {
       | 'TIME_IN_FORCE_FOK'
       | 'TIME_IN_FORCE_GFA'
       | 'TIME_IN_FORCE_GFN';
+    /**
+     * @description  - EXPIRY_STRATEGY_UNSPECIFIED: Never valid
+     *  - EXPIRY_STRATEGY_CANCELS: Stop order should be cancelled if the expiry time is reached.
+     *  - EXPIRY_STRATEGY_SUBMIT: Order should be submitted if the expiry time is reached.
+     * @default EXPIRY_STRATEGY_UNSPECIFIED
+     * @enum {string}
+     */
+    readonly StopOrderExpiryStrategy:
+      | 'EXPIRY_STRATEGY_UNSPECIFIED'
+      | 'EXPIRY_STRATEGY_CANCELS'
+      | 'EXPIRY_STRATEGY_SUBMIT';
     /**
      * @default METHOD_UNSPECIFIED
      * @enum {string}
@@ -143,6 +156,36 @@ export interface components {
       /** Type of transaction */
       readonly type?: string;
     };
+    /** Request for cancelling a recurring transfer */
+    readonly commandsv1CancelTransfer: {
+      /** @description Transfer ID of the transfer to cancel. */
+      readonly transferId?: string;
+    };
+    /** Specific details for a one off transfer */
+    readonly commandsv1OneOffTransfer: {
+      /**
+       * Format: int64
+       * @description Timestamp in Unix nanoseconds for when the transfer should be delivered into the receiver's account.
+       */
+      readonly deliverOn?: string;
+    };
+    /** Specific details for a recurring transfer */
+    readonly commandsv1RecurringTransfer: {
+      /** @description Optional parameter defining how a transfer is dispatched. */
+      readonly dispatchStrategy?: components['schemas']['vegaDispatchStrategy'];
+      /**
+       * Format: uint64
+       * @description Last epoch at which this transfer shall be paid.
+       */
+      readonly endEpoch?: string;
+      /** @description Factor needs to be > 0. */
+      readonly factor?: string;
+      /**
+       * Format: uint64
+       * @description First epoch from which this transfer shall be paid.
+       */
+      readonly startEpoch?: string;
+    };
     /** Transfer initiated by a party */
     readonly commandsv1Transfer: {
       /** @description Amount to be taken from the source account. This field is an unsigned integer scaled to the asset's decimal places. */
@@ -154,8 +197,8 @@ export interface components {
        * should be taken.
        */
       readonly fromAccountType?: components['schemas']['vegaAccountType'];
-      readonly oneOff?: components['schemas']['v1OneOffTransfer'];
-      readonly recurring?: components['schemas']['v1RecurringTransfer'];
+      readonly oneOff?: components['schemas']['commandsv1OneOffTransfer'];
+      readonly recurring?: components['schemas']['commandsv1RecurringTransfer'];
       /** @description Reference to be attached to the transfer. */
       readonly reference?: string;
       /** @description Public key of the destination account. */
@@ -171,8 +214,19 @@ export interface components {
     };
     readonly protobufAny: {
       readonly '@type'?: string;
-      [key: string]: unknown | undefined;
+      [key: string]: unknown;
     };
+    /**
+     * @description `NullValue` is a singleton enumeration to represent the null value for the
+     * `Value` type union.
+     *
+     *  The JSON representation for `NullValue` is JSON `null`.
+     *
+     *  - NULL_VALUE: Null value.
+     * @default NULL_VALUE
+     * @enum {string}
+     */
+    readonly protobufNullValue: 'NULL_VALUE';
     /** Used to announce a node as a new pending validator */
     readonly v1AnnounceNode: {
       /** @description AvatarURL of the validator. */
@@ -225,18 +279,19 @@ export interface components {
       readonly amendments?: readonly components['schemas']['v1OrderAmendment'][];
       /** @description List of order cancellations to be processed sequentially. */
       readonly cancellations?: readonly components['schemas']['v1OrderCancellation'][];
+      /** @description List of stop order cancellations to be processed sequentially. */
+      readonly stopOrdersCancellation?: readonly components['schemas']['v1StopOrdersCancellation'][];
+      /** @description List of stop order submissions to be processed sequentially. */
+      readonly stopOrdersSubmission?: readonly components['schemas']['v1StopOrdersSubmission'][];
       /** @description List of order submissions to be processed sequentially. */
       readonly submissions?: readonly components['schemas']['v1OrderSubmission'][];
     };
-    /** Request for cancelling a recurring transfer */
-    readonly v1CancelTransfer: {
-      /** @description Transfer ID of the transfer to cancel. */
-      readonly transferId?: string;
-    };
     /** Event forwarded to the Vega network to provide information on events happening on other networks */
     readonly v1ChainEvent: {
       /** @description Built-in asset event. */
       readonly builtin?: components['schemas']['vegaBuiltinAssetEvent'];
+      /** Arbitrary contract call */
+      readonly contractCall?: components['schemas']['vegaEthContractCallEvent'];
       /** @description Ethereum ERC20 event. */
       readonly erc20?: components['schemas']['vegaERC20Event'];
       /** @description Ethereum ERC20 multisig event. */
@@ -301,6 +356,19 @@ export interface components {
       /** Transaction corresponding to the hash */
       readonly transaction?: components['schemas']['blockexplorerapiv1Transaction'];
     };
+    /** Iceberg order options */
+    readonly v1IcebergOpts: {
+      /**
+       * Format: uint64
+       * @description Minimum allowed remaining size of the order before it is replenished back to its peak size.
+       */
+      readonly minimumVisibleSize?: string;
+      /**
+       * Format: uint64
+       * @description Size of the order that is made visible and can be traded with during the execution of a single order.
+       */
+      readonly peakSize?: string;
+    };
     readonly v1InfoResponse: {
       /** Commit hash from which the data node was built */
       readonly commitHash?: string;
@@ -325,7 +393,7 @@ export interface components {
        */
       readonly blockHeight?: string;
       /** @description Command to request cancelling a recurring transfer. */
-      readonly cancelTransfer?: components['schemas']['v1CancelTransfer'];
+      readonly cancelTransfer?: components['schemas']['commandsv1CancelTransfer'];
       /**
        * @description Command used by a validator to submit an event forwarded to the Vega network to provide information
        * on events happening on other networks, to be used by a foreign chain
@@ -381,6 +449,10 @@ export interface components {
       readonly protocolUpgradeProposal?: components['schemas']['v1ProtocolUpgradeProposal'];
       /** @description Command used by a validator to submit a floating point value. */
       readonly stateVariableProposal?: components['schemas']['v1StateVariableProposal'];
+      /** @description Command to cancel stop orders. */
+      readonly stopOrdersCancellation?: components['schemas']['v1StopOrdersCancellation'];
+      /** @description Command to submit a pair of stop orders. */
+      readonly stopOrdersSubmission?: components['schemas']['v1StopOrdersSubmission'];
       /** @description Command to submit a transfer. */
       readonly transfer?: components['schemas']['commandsv1Transfer'];
       /** @description Command to remove tokens delegated to a validator. */
@@ -448,9 +520,9 @@ export interface components {
       readonly commitmentAmount?: string;
       /** @description Nominated liquidity fee factor, which is an input to the calculation of taker fees on the market, as per setting fees and rewarding liquidity providers. */
       readonly fee?: string;
-      /** @description Market ID for the order, required field. */
+      /** @description Market ID for the order. */
       readonly marketId?: string;
-      /** @description Reference to be added to every order created out of this liquidityProvisionSubmission. */
+      /** @description Reference to be added to every order created out of this liquidity provision submission. */
       readonly reference?: string;
       /** @description Set of liquidity sell orders to meet the liquidity provision obligation. */
       readonly sells?: readonly components['schemas']['vegaLiquidityOrder'][];
@@ -530,15 +602,6 @@ export interface components {
       | 'TYPE_STAKE_TOTAL_SUPPLY'
       | 'TYPE_SIGNER_THRESHOLD_SET'
       | 'TYPE_GOVERNANCE_VALIDATE_ASSET';
-    /** Specific details for a one off transfer */
-    readonly v1OneOffTransfer: {
-      /**
-       * Format: int64
-       * @description Unix timestamp in nanoseconds. Time at which the
-       * transfer should be delivered into the To account.
-       */
-      readonly deliverOn?: string;
-    };
     /** Command to submit new Oracle data from third party providers */
     readonly v1OracleDataSubmission: {
       /**
@@ -596,10 +659,12 @@ export interface components {
     readonly v1OrderSubmission: {
       /**
        * Format: int64
-       * @description Timestamp for when the order will expire, in nanoseconds,
+       * @description Timestamp in Unix nanoseconds for when the order will expire,
        * required field only for `Order.TimeInForce`.TIME_IN_FORCE_GTT`.
        */
       readonly expiresAt?: string;
+      /** @description Parameters used to specify an iceberg order. */
+      readonly icebergOpts?: components['schemas']['v1IcebergOpts'];
       /** @description Market ID for the order, required field. */
       readonly marketId?: string;
       /** @description Used to specify the details for a pegged order. */
@@ -699,23 +764,6 @@ export interface components {
     readonly v1PubKey: {
       readonly key?: string;
     };
-    /** Specific details for a recurring transfer */
-    readonly v1RecurringTransfer: {
-      /** @description Optional parameter defining how a transfer is dispatched. */
-      readonly dispatchStrategy?: components['schemas']['vegaDispatchStrategy'];
-      /**
-       * Format: uint64
-       * @description Last epoch at which this transfer shall be paid.
-       */
-      readonly endEpoch?: string;
-      /** @description Factor needs to be > 0. */
-      readonly factor?: string;
-      /**
-       * Format: uint64
-       * @description First epoch from which this transfer shall be paid.
-       */
-      readonly startEpoch?: string;
-    };
     /**
      * @description Signature to authenticate a transaction and to be verified by the Vega
      * network.
@@ -732,7 +780,7 @@ export interface components {
       readonly version?: number;
     };
     readonly v1Signer: {
-      /** In case of an open oracle - Ethereum address will be submitted */
+      /** @description In case of an open oracle - Ethereum address will be submitted. */
       readonly ethAddress?: components['schemas']['v1ETHAddress'];
       /**
        * @description List of authorized public keys that signed the data for this
@@ -746,6 +794,55 @@ export interface components {
       /** @description State value proposal details. */
       readonly proposal?: components['schemas']['vegaStateValueProposal'];
     };
+    /** Price and expiry configuration for a stop order */
+    readonly v1StopOrderSetup: {
+      /**
+       * Format: int64
+       * @description Optional expiry timestamp.
+       */
+      readonly expiresAt?: string;
+      /** @description Strategy to adopt if the expiry time is reached. */
+      readonly expiryStrategy?: components['schemas']['StopOrderExpiryStrategy'];
+      /** @description Order to be submitted once the trigger is breached. */
+      readonly orderSubmission?: components['schemas']['v1OrderSubmission'];
+      /** @description Fixed price at which the order will be submitted. */
+      readonly price?: string;
+      /** @description Trailing percentage at which the order will be submitted. */
+      readonly trailingPercentOffset?: string;
+    };
+    /**
+     * Cancel a stop order.
+     * The following combinations are available:
+     * Empty object will cancel all stop orders for the party
+     * Market ID alone will cancel all stop orders in a market
+     * Market ID and order ID will cancel a specific stop order in a market
+     * If the stop order is part of an OCO, both stop orders will be cancelled
+     */
+    readonly v1StopOrdersCancellation: {
+      /** @description Optional market ID. */
+      readonly marketId?: string;
+      /** @description Optional order ID. */
+      readonly stopOrderId?: string;
+    };
+    /**
+     * Stop order submission submits stops orders.
+     * It is possible to make a single stop order submission by
+     * specifying a single direction,
+     * or an OCO (One Cancels the Other) stop order submission
+     * by specifying a configuration for both directions
+     */
+    readonly v1StopOrdersSubmission: {
+      /**
+       * @description Stop order that will be triggered
+       * if the price falls below a given trigger price.
+       */
+      readonly fallsBelow?: components['schemas']['v1StopOrderSetup'];
+      /**
+       * @description Stop order that will be triggered
+       * if the price rises above a given trigger price.
+       */
+      readonly risesAbove?: components['schemas']['v1StopOrderSetup'];
+    };
     readonly v1UndelegateSubmission: {
       /**
        * @description Optional, if not specified = ALL.
@@ -822,6 +919,7 @@ export interface components {
      *  - ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: Per asset reward account for fees received by makers
      *  - ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: Per asset reward account for fees received by liquidity providers
      *  - ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: Per asset reward account for market proposers when the market goes above some trading threshold
+     *  - ACCOUNT_TYPE_HOLDING: Per asset account for holding in-flight unfilled orders' funds
      * @default ACCOUNT_TYPE_UNSPECIFIED
      * @enum {string}
      */
@@ -842,7 +940,8 @@ export interface components {
       | 'ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES'
       | 'ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES'
       | 'ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES'
-      | 'ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS';
+      | 'ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS'
+      | 'ACCOUNT_TYPE_HOLDING';
     /** Vega representation of an external asset */
     readonly vegaAssetDetails: {
       /** @description Vega built-in asset. */
@@ -898,6 +997,14 @@ export interface components {
       /** @description Vega network internal asset ID. */
       readonly vegaAssetId?: string;
     };
+    readonly vegaCancelTransfer: {
+      /** Configuration for cancellation of a governance-initiated transfer */
+      readonly changes?: components['schemas']['vegaCancelTransferConfiguration'];
+    };
+    readonly vegaCancelTransferConfiguration: {
+      /** @description ID of the governance transfer proposal. */
+      readonly transferId?: string;
+    };
     /**
      * @description DataSourceDefinition represents the top level object that deals with data sources.
      * DataSourceDefinition can be external or internal, with whatever number of data sources are defined
@@ -912,6 +1019,7 @@ export interface components {
      * It contains one of any of the defined `SourceType` variants.
      */
     readonly vegaDataSourceDefinitionExternal: {
+      readonly ethCall?: components['schemas']['vegaEthCallSpec'];
       readonly oracle?: components['schemas']['vegaDataSourceSpecConfiguration'];
     };
     /**
@@ -1147,6 +1255,64 @@ export interface components {
       /** @description Address into which the bridge will release the funds. */
       readonly receiverAddress?: string;
     };
+    /** @description Specifies a data source that derives its content from calling a read method on an Ethereum contract. */
+    readonly vegaEthCallSpec: {
+      /** @description The ABI of that contract. */
+      readonly abi?: readonly Record<string, never>[];
+      /** @description Ethereum address of the contract to call. */
+      readonly address?: string;
+      /**
+       * @description List of arguments to pass to method call.
+       * Protobuf 'Value' wraps an arbitrary JSON type that is mapped to an Ethereum type according to the ABI.
+       */
+      readonly args?: readonly Record<string, never>[];
+      /** @description Name of the method on the contract to call. */
+      readonly method?: string;
+      /** @description Conditions for determining when to call the contract method. */
+      readonly trigger?: components['schemas']['vegaEthCallTrigger'];
+    };
+    /** @description Determines when the contract method should be called. */
+    readonly vegaEthCallTrigger: {
+      readonly timeTrigger?: components['schemas']['vegaEthTimeTrigger'];
+    };
+    /** Result of calling an arbitrary Ethereum contract method */
+    readonly vegaEthContractCallEvent: {
+      /**
+       * Format: uint64
+       * @description Ethereum block height.
+       */
+      readonly blockHeight?: string;
+      /**
+       * Format: uint64
+       * @description Ethereum block time in Unix seconds.
+       */
+      readonly blockTime?: string;
+      /**
+       * Format: byte
+       * @description Result of contract call, packed according to the ABI stored in the associated data source spec.
+       */
+      readonly result?: string;
+      /** @description ID of the data source spec that triggered this contract call. */
+      readonly specId?: string;
+    };
+    /** @description Trigger for an Ethereum call based on the Ethereum block timestamp. Can be one-off or repeating. */
+    readonly vegaEthTimeTrigger: {
+      /**
+       * Format: uint64
+       * @description Repeat the call every n seconds after the inital call. If no time for initial call was specified, begin repeating immediately.
+       */
+      readonly every?: string;
+      /**
+       * Format: uint64
+       * @description Trigger when the Ethereum time is greater or equal to this time, in Unix seconds.
+       */
+      readonly initial?: string;
+      /**
+       * Format: uint64
+       * @description If repeating, stop once Ethereum time is greater than this time, in Unix seconds. If not set, then repeat indefinitely.
+       */
+      readonly until?: string;
+    };
     /** Future product configuration */
     readonly vegaFutureProduct: {
       /** @description Binding between the data source spec and the settlement data. */
@@ -1160,6 +1326,14 @@ export interface components {
       /** @description Asset ID for the product's settlement asset. */
       readonly settlementAsset?: string;
     };
+    /**
+     * @default GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED
+     * @enum {string}
+     */
+    readonly vegaGovernanceTransferType:
+      | 'GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED'
+      | 'GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING'
+      | 'GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT';
     /** Instrument configuration */
     readonly vegaInstrumentConfiguration: {
       /** @description Instrument code, human-readable shortcode used to describe the instrument. */
@@ -1168,6 +1342,8 @@ export interface components {
       readonly future?: components['schemas']['vegaFutureProduct'];
       /** @description Instrument name. */
       readonly name?: string;
+      /** @description Spot. */
+      readonly spot?: components['schemas']['vegaSpotProduct'];
     };
     readonly vegaKeyValueBundle: {
       readonly key?: string;
@@ -1258,14 +1434,14 @@ export interface components {
       /** @description Configuration of the new market. */
       readonly changes?: components['schemas']['vegaNewMarketConfiguration'];
     };
-    /** Configuration for a new market on Vega */
+    /** Configuration for a new futures market on Vega */
     readonly vegaNewMarketConfiguration: {
       /**
        * Format: uint64
-       * @description Decimal places used for the new market, sets the smallest price increment on the book.
+       * @description Decimal places used for the new futures market, sets the smallest price increment on the book.
        */
       readonly decimalPlaces?: string;
-      /** @description New market instrument configuration. */
+      /** @description New futures market instrument configuration. */
       readonly instrument?: components['schemas']['vegaInstrumentConfiguration'];
       /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */
       readonly linearSlippageFactor?: string;
@@ -1278,11 +1454,11 @@ export interface components {
        * price levels over which automated liquidity provision orders will be deployed.
        */
       readonly lpPriceRange?: string;
-      /** @description Optional new market metadata, tags. */
+      /** @description Optional new futures market metadata, tags. */
       readonly metadata?: readonly string[];
       /**
        * Format: int64
-       * @description Decimal places for order sizes, sets what size the smallest order / position on the market can be.
+       * @description Decimal places for order sizes, sets what size the smallest order / position on the futures market can be.
        */
       readonly positionDecimalPlaces?: string;
       /** @description Price monitoring parameters. */
@@ -1291,6 +1467,80 @@ export interface components {
       readonly quadraticSlippageFactor?: string;
       /** @description Simple risk model parameters, valid only if MODEL_SIMPLE is selected. */
       readonly simple?: components['schemas']['vegaSimpleModelParams'];
+      /** @description Successor configuration. If this proposal is meant to succeed a given market, then this should be set. */
+      readonly successor?: components['schemas']['vegaSuccessorConfiguration'];
+    };
+    /** New spot market on Vega */
+    readonly vegaNewSpotMarket: {
+      /** @description Configuration of the new spot market. */
+      readonly changes?: components['schemas']['vegaNewSpotMarketConfiguration'];
+    };
+    /** Configuration for a new spot market on Vega */
+    readonly vegaNewSpotMarketConfiguration: {
+      /**
+       * Format: uint64
+       * @description Decimal places used for the new spot market, sets the smallest price increment on the book.
+       */
+      readonly decimalPlaces?: string;
+      /** @description New spot market instrument configuration. */
+      readonly instrument?: components['schemas']['vegaInstrumentConfiguration'];
+      /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
+      readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
+      /** @description Optional new spot market metadata, tags. */
+      readonly metadata?: readonly string[];
+      /**
+       * Format: int64
+       * @description Decimal places for order sizes, sets what size the smallest order / position on the spot market can be.
+       */
+      readonly positionDecimalPlaces?: string;
+      /** @description Price monitoring parameters. */
+      readonly priceMonitoringParameters?: components['schemas']['vegaPriceMonitoringParameters'];
+      /** @description Simple risk model parameters, valid only if MODEL_SIMPLE is selected. */
+      readonly simple?: components['schemas']['vegaSimpleModelParams'];
+      /** @description Specifies parameters related to target stake calculation. */
+      readonly targetStakeParameters?: components['schemas']['vegaTargetStakeParameters'];
+    };
+    /** New governance transfer */
+    readonly vegaNewTransfer: {
+      /** @description Configuration for a new transfer. */
+      readonly changes?: components['schemas']['vegaNewTransferConfiguration'];
+    };
+    readonly vegaNewTransferConfiguration: {
+      /** Maximum amount to transfer */
+      readonly amount?: string;
+      /** ID of asset to transfer */
+      readonly asset?: string;
+      /**
+       * Specifies the account to transfer to, depending on the account type:
+       * Network treasury: leave empty
+       * Party: party's public key
+       * Market insurance pool: market ID
+       */
+      readonly destination?: string;
+      /** Specifies the account type to transfer to: reward pool, party, network insurance pool, market insurance pool */
+      readonly destinationType?: components['schemas']['vegaAccountType'];
+      /** Maximum fraction of the source account's balance to transfer as a decimal - i.e. 0.1 = 10% of the balance */
+      readonly fractionOfBalance?: string;
+      readonly oneOff?: components['schemas']['vegaOneOffTransfer'];
+      readonly recurring?: components['schemas']['vegaRecurringTransfer'];
+      /** If network treasury, field is empty, otherwise uses the market ID */
+      readonly source?: string;
+      /** Source account type, such as network treasury, market insurance pool */
+      readonly sourceType?: components['schemas']['vegaAccountType'];
+      /**
+       * "All or nothing" or "best effort":
+       * All or nothing: Transfers the specified amount or does not transfer anything
+       * Best effort: Transfers the specified amount or the max allowable amount if this is less than the specified amount
+       */
+      readonly transferType?: components['schemas']['vegaGovernanceTransferType'];
+    };
+    /** Specific details for a one off transfer */
+    readonly vegaOneOffTransfer: {
+      /**
+       * Format: int64
+       * @description Timestamp in Unix nanoseconds for when the transfer should be delivered into the receiver's account.
+       */
+      readonly deliverOn?: string;
     };
     /**
      * Type values for an order
@@ -1369,6 +1619,8 @@ export interface components {
     };
     /** Terms for a governance proposal on Vega */
     readonly vegaProposalTerms: {
+      /** @description Cancel a governance transfer. */
+      readonly cancelTransfer?: components['schemas']['vegaCancelTransfer'];
       /**
        * Format: int64
        * @description Timestamp as Unix time in seconds when voting closes for this proposal,
@@ -1388,20 +1640,39 @@ export interface components {
        * and can be used to gauge community sentiment.
        */
       readonly newFreeform?: components['schemas']['vegaNewFreeform'];
-      /** @description Proposal change for creating new market on Vega. */
+      /** @description Proposal change for creating new futures market on Vega. */
       readonly newMarket?: components['schemas']['vegaNewMarket'];
+      /** @description Proposal change for creating new spot market on Vega. */
+      readonly newSpotMarket?: components['schemas']['vegaNewSpotMarket'];
+      /** @description Proposal change for a governance transfer. */
+      readonly newTransfer?: components['schemas']['vegaNewTransfer'];
       /** @description Proposal change for updating an asset. */
       readonly updateAsset?: components['schemas']['vegaUpdateAsset'];
-      /** @description Proposal change for modifying an existing market on Vega. */
+      /** @description Proposal change for modifying an existing futures market on Vega. */
       readonly updateMarket?: components['schemas']['vegaUpdateMarket'];
       /** @description Proposal change for updating Vega network parameters. */
       readonly updateNetworkParameter?: components['schemas']['vegaUpdateNetworkParameter'];
+      /** @description Proposal change for modifying an existing spot market on Vega. */
+      readonly updateSpotMarket?: components['schemas']['vegaUpdateSpotMarket'];
       /**
        * Format: int64
        * @description Validation timestamp as Unix time in seconds.
        */
       readonly validationTimestamp?: string;
     };
+    /** Specific details for a recurring transfer */
+    readonly vegaRecurringTransfer: {
+      /**
+       * Format: uint64
+       * @description Last epoch at which this transfer shall be paid.
+       */
+      readonly endEpoch?: string;
+      /**
+       * Format: uint64
+       * @description First epoch from which this transfer shall be paid.
+       */
+      readonly startEpoch?: string;
+    };
     readonly vegaScalarValue: {
       readonly value?: string;
     };
@@ -1442,6 +1713,15 @@ export interface components {
        */
       readonly probabilityOfTrading?: number;
     };
+    /** Spot product configuration */
+    readonly vegaSpotProduct: {
+      /** @description Base asset ID. */
+      readonly baseAsset?: string;
+      /** @description Product name. */
+      readonly name?: string;
+      /** @description Quote asset ID. */
+      readonly quoteAsset?: string;
+    };
     readonly vegaStakeDeposited: {
       /** @description Amount deposited as an unsigned base 10 integer scaled to the asset's decimal places. */
       readonly amount?: string;
@@ -1507,6 +1787,13 @@ export interface components {
       readonly scalarVal?: components['schemas']['vegaScalarValue'];
       readonly vectorVal?: components['schemas']['vegaVectorValue'];
     };
+    /** @description Configuration required to turn a new market proposal in to a successor market proposal. */
+    readonly vegaSuccessorConfiguration: {
+      /** @description A decimal value between or equal to 0 and 1, specifying the fraction of the insurance pool balance that is carried over from the parent market to the successor. */
+      readonly insurancePoolFraction?: string;
+      /** @description ID of the market that the successor should take over from. */
+      readonly parentMarketId?: string;
+    };
     /** TargetStakeParameters contains parameters used in target stake calculation */
     readonly vegaTargetStakeParameters: {
       /**
@@ -1547,14 +1834,14 @@ export interface components {
     };
     /** Update an existing market on Vega */
     readonly vegaUpdateMarket: {
-      /** @description Updated configuration of the market. */
+      /** @description Updated configuration of the futures market. */
       readonly changes?: components['schemas']['vegaUpdateMarketConfiguration'];
       /** @description Market ID the update is for. */
       readonly marketId?: string;
     };
-    /** Configuration to update a market on Vega */
+    /** Configuration to update a futures market on Vega */
     readonly vegaUpdateMarketConfiguration: {
-      /** @description Updated market instrument configuration. */
+      /** @description Updated futures market instrument configuration. */
       readonly instrument?: components['schemas']['vegaUpdateInstrumentConfiguration'];
       /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */
       readonly linearSlippageFactor?: string;
@@ -1567,7 +1854,7 @@ export interface components {
        * price levels over which automated liquidity provision orders will be deployed.
        */
       readonly lpPriceRange?: string;
-      /** @description Optional market metadata, tags. */
+      /** @description Optional futures market metadata, tags. */
       readonly metadata?: readonly string[];
       /** @description Price monitoring parameters. */
       readonly priceMonitoringParameters?: components['schemas']['vegaPriceMonitoringParameters'];
@@ -1581,6 +1868,26 @@ export interface components {
       /** @description The network parameter to update. */
       readonly changes?: components['schemas']['vegaNetworkParameter'];
     };
+    /** Update an existing spot market on Vega */
+    readonly vegaUpdateSpotMarket: {
+      /** @description Updated configuration of the spot market. */
+      readonly changes?: components['schemas']['vegaUpdateSpotMarketConfiguration'];
+      /** @description Market ID the update is for. */
+      readonly marketId?: string;
+    };
+    /** Configuration to update a spot market on Vega */
+    readonly vegaUpdateSpotMarketConfiguration: {
+      /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
+      readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
+      /** @description Optional spot market metadata, tags. */
+      readonly metadata?: readonly string[];
+      /** @description Price monitoring parameters. */
+      readonly priceMonitoringParameters?: components['schemas']['vegaPriceMonitoringParameters'];
+      /** @description Simple risk model parameters, valid only if MODEL_SIMPLE is selected. */
+      readonly simple?: components['schemas']['vegaSimpleModelParams'];
+      /** @description Specifies parameters related to target stake calculation. */
+      readonly targetStakeParameters?: components['schemas']['vegaTargetStakeParameters'];
+    };
     readonly vegaVectorValue: {
       readonly value?: readonly string[];
     };
@@ -1609,12 +1916,12 @@ export interface components {
 export type external = Record<string, never>;
 
 export interface operations {
+  /**
+   * Info
+   * @description Get information about the block explorer.
+   * Response contains a semver formatted version of the data node and the commit hash, from which the block explorer was built
+   */
   BlockExplorer_Info: {
-    /**
-     * Info
-     * @description Get information about the block explorer.
-     * Response contains a semver formatted version of the data node and the commit hash, from which the block explorer was built
-     */
     responses: {
       /** @description A successful response. */
       200: {
@@ -1630,19 +1937,38 @@ export interface operations {
       };
     };
   };
+  /**
+   * List transactions
+   * @description List transactions from the Vega blockchain
+   */
   BlockExplorer_ListTransactions: {
-    /**
-     * List transactions
-     * @description List transactions from the Vega blockchain
-     */
-    parameters?: {
-      /** @description Number of transactions to be returned from the blockchain. */
-      /** @description Optional cursor to paginate the request. */
-      /** @description Optional cursor to paginate the request. */
-      readonly query?: {
+    parameters: {
+      query?: {
+        /**
+         * @description Number of transactions to be returned from the blockchain.
+         * This is deprecated, use first and last instead.
+         */
         limit?: number;
+        /** @description Optional cursor to paginate the request. */
         before?: string;
+        /** @description Optional cursor to paginate the request. */
         after?: string;
+        /** @description Transaction command types filter, for listing transactions with specified command types. */
+        cmdTypes?: readonly string[];
+        /** @description Transaction command types exclusion filter, for listing all the transactions except the ones with specified command types. */
+        excludeCmdTypes?: readonly string[];
+        /** @description Party IDs filter, can be sender or receiver. */
+        parties?: readonly string[];
+        /**
+         * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `after` cursor to paginate forwards.
+         * On its own, this will return the first `first` transactions.
+         */
+        first?: number;
+        /**
+         * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `before` cursor to paginate backwards.
+         * On its own, this will return the last `last` transactions.
+         */
+        last?: number;
       };
     };
     responses: {
@@ -1660,14 +1986,14 @@ export interface operations {
       };
     };
   };
+  /**
+   * Get transaction
+   * @description Get a transaction from the Vega blockchain
+   */
   BlockExplorer_GetTransaction: {
-    /**
-     * Get transaction
-     * @description Get a transaction from the Vega blockchain
-     */
     parameters: {
-      /** @description Hash of the transaction */
-      readonly path: {
+      path: {
+        /** @description Hash of the transaction */
         hash: string;
       };
     };

apps/explorer/tailwind.config.js

@@ -1,5 +1,5 @@
 const { join } = require('path');
-const { createGlobPatternsForDependencies } = require('@nrwl/next/tailwind');
+const { createGlobPatternsForDependencies } = require('@nx/react/tailwind');
 const theme = require('../../libs/tailwindcss-config/src/theme');
 const vegaCustomClasses = require('../../libs/tailwindcss-config/src/vega-custom-classes');
 

apps/explorer/tsconfig.app.json

@@ -5,8 +5,8 @@
     "types": ["node"]
   },
   "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
+    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nx/react/typings/image.d.ts"
   ],
   "exclude": [
     "**/*.spec.ts",

apps/explorer/tsconfig.spec.json

@@ -18,7 +18,7 @@
     "jest.config.ts"
   ],
   "files": [
-    "../../node_modules/@nrwl/react/typings/cssmodule.d.ts",
-    "../../node_modules/@nrwl/react/typings/image.d.ts"
+    "../../node_modules/@nx/react/typings/cssmodule.d.ts",
+    "../../node_modules/@nx/react/typings/image.d.ts"
   ]
 }

apps/explorer/webpack.config.js

@@ -1,6 +1,8 @@
+const { composePlugins, withNx } = require('@nx/webpack');
+const { withReact } = require('@nx/react');
 const SentryPlugin = require('@sentry/webpack-plugin');
 
-module.exports = (config, context) => {
+module.exports = composePlugins(withNx(), withReact(), (config) => {
   const additionalPlugins = process.env.SENTRY_AUTH_TOKEN
     ? [
         new SentryPlugin({
@@ -13,5 +15,6 @@ module.exports = (config, context) => {
   return {
     ...config,
     plugins: [...additionalPlugins, ...config.plugins],
+    ignoreWarnings: [/Failed to parse source map/],
   };
-};
+});

apps/governance-e2e/project.json

@@ -1,10 +1,11 @@
 {
+  "name": "governance-e2e",
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/governance-e2e/src",
   "projectType": "application",
   "targets": {
     "e2e": {
-      "executor": "@nrwl/cypress:cypress",
+      "executor": "@nx/cypress:cypress",
       "options": {
         "cypressConfig": "apps/governance-e2e/cypress.config.js",
         "devServerTarget": "governance:serve"
@@ -16,14 +17,14 @@
       }
     },
     "lint": {
-      "executor": "@nrwl/linter:eslint",
+      "executor": "@nx/linter:eslint",
       "outputs": ["{options.outputFile}"],
       "options": {
         "lintFilePatterns": ["apps/governance-e2e/**/*.{js,ts}"]
       }
     },
     "build": {
-      "executor": "@nrwl/workspace:run-commands",
+      "executor": "nx:run-commands",
       "outputs": [],
       "options": {
         "command": "yarn tsc --project ./apps/governance-e2e/"

apps/governance-e2e/src/fixtures/proposals/successor-market.json

@@ -0,0 +1,107 @@
+{
+  "changes": {
+    "decimalPlaces": "5",
+    "positionDecimalPlaces": "5",
+    "linearSlippageFactor": "0.001",
+    "quadraticSlippageFactor": "0",
+    "lpPriceRange": "10",
+    "instrument": {
+      "name": "Token test market",
+      "code": "Token.24h",
+      "future": {
+        "settlementAsset": "816af99af60d684502a40824758f6b5377e6af48e50a9ee8ef478ecb879ea8bc",
+        "quoteName": "fUSDC",
+        "dataSourceSpecForSettlementData": {
+          "external": {
+            "oracle": {
+              "signers": [
+                {
+                  "pubKey": {
+                    "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                  }
+                }
+              ],
+              "filters": [
+                {
+                  "key": {
+                    "name": "prices.BTC.value",
+                    "type": "TYPE_INTEGER",
+                    "numberDecimalPlaces": "0"
+                  },
+                  "conditions": [
+                    {
+                      "operator": "OPERATOR_GREATER_THAN",
+                      "value": "0"
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        "dataSourceSpecForTradingTermination": {
+          "external": {
+            "oracle": {
+              "signers": [
+                {
+                  "pubKey": {
+                    "key": "70d14a321e02e71992fd115563df765000ccc4775cbe71a0e2f9ff5a3b9dc680"
+                  }
+                }
+              ],
+              "filters": [
+                {
+                  "key": {
+                    "name": "trading.terminated.ETH5",
+                    "type": "TYPE_BOOLEAN"
+                  },
+                  "conditions": [
+                    {
+                      "operator": "OPERATOR_EQUALS",
+                      "value": "true"
+                    }
+                  ]
+                }
+              ]
+            }
+          }
+        },
+        "dataSourceSpecBinding": {
+          "settlementDataProperty": "prices.BTC.value",
+          "tradingTerminationProperty": "trading.terminated.ETH5"
+        }
+      }
+    },
+    "metadata": ["sector:food", "sector:materials", "source:docs.vega.xyz"],
+    "priceMonitoringParameters": {
+      "triggers": [
+        {
+          "horizon": "43200",
+          "probability": "0.9999999",
+          "auctionExtension": "600"
+        }
+      ]
+    },
+    "liquidityMonitoringParameters": {
+      "targetStakeParameters": {
+        "timeWindow": "3600",
+        "scalingFactor": 10
+      },
+      "triggeringRatio": "0.7",
+      "auctionExtension": "1"
+    },
+    "logNormal": {
+      "tau": 0.0001140771161,
+      "riskAversionParameter": 0.001,
+      "params": {
+        "mu": 0,
+        "r": 0.016,
+        "sigma": 0.8
+      }
+    },
+    "successor": {
+      "parentMarketId": "",
+      "insurancePoolFraction": "0.75"
+    }
+  }
+}

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

@@ -28,18 +28,17 @@ import type { testFreeformProposal } from '../../support/common-interfaces';
 import { formatDateWithLocalTimezone } from '@vegaprotocol/utils';
 
 const proposalVoteProgressForPercentage =
-  '[data-testid="vote-progress-indicator-percentage-for"]';
+  'vote-progress-indicator-percentage-for';
 const proposalVoteProgressAgainstPercentage =
-  '[data-testid="vote-progress-indicator-percentage-against"]';
-const proposalVoteProgressForTokens =
-  '[data-testid="vote-progress-indicator-tokens-for"]';
+  'vote-progress-indicator-percentage-against';
+const proposalVoteProgressForTokens = 'vote-progress-indicator-tokens-for';
 const proposalVoteProgressAgainstTokens =
-  '[data-testid="vote-progress-indicator-tokens-against"]';
-const changeVoteButton = '[data-testid="change-vote-button"]';
-const proposalDetailsTitle = '[data-testid="proposal-title"]';
-const proposalDetailsDescription = '[data-testid="proposal-description"]';
-const openProposals = '[data-testid="open-proposals"]';
-const viewProposalButton = '[data-testid="view-proposal-btn"]';
+  'vote-progress-indicator-tokens-against';
+const changeVoteButton = 'change-vote-button';
+const proposalDetailsTitle = 'proposal-title';
+const proposalDetailsDescription = 'proposal-description';
+const openProposals = 'open-proposals';
+const viewProposalButton = 'view-proposal-btn';
 const proposalDescriptionToggle = 'proposal-description-toggle';
 const voteBreakdownToggle = 'vote-breakdown-toggle';
 const proposalTermsToggle = 'proposal-json-toggle';
@@ -72,18 +71,18 @@ describe(
 
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
-        cy.get(openProposals).within(() => {
+        cy.getByTestId(openProposals).within(() => {
           getProposalFromTitle(rawProposal.rationale.title).within(() => {
-            cy.get(viewProposalButton).should('be.visible').click();
+            cy.getByTestId(viewProposalButton).should('be.visible').click();
           });
         });
-        cy.get(proposalDetailsTitle).should(
+        cy.getByTestId(proposalDetailsTitle).should(
           'contain.text',
           rawProposal.rationale.title
         );
         cy.getByTestId(proposalDescriptionToggle).click();
         cy.getByTestId('proposal-description-toggle');
-        cy.get(proposalDetailsDescription)
+        cy.getByTestId(proposalDetailsDescription)
           .find('p')
           .should('have.text', proposalDescription);
       });
@@ -117,7 +116,7 @@ describe(
       });
       navigateTo(navigation.proposals);
       getProposalFromTitle(proposalTitle).within(() =>
-        cy.get(viewProposalButton).click()
+        cy.getByTestId(viewProposalButton).click()
       );
       cy.wrap(
         formatDateWithLocalTimezone(new Date(proposalTimeStamp * 1000))
@@ -139,7 +138,7 @@ describe(
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
+          cy.getByTestId(viewProposalButton).click()
         );
       });
       cy.contains('Participation: Not Met 0.00 0.00%(0.00% Required)').should(
@@ -166,7 +165,7 @@ describe(
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
+          cy.getByTestId(viewProposalButton).click()
         );
       });
       // 3001-VOTE-080
@@ -183,14 +182,16 @@ describe(
           .contains(votedDate)
           .should('be.visible');
       });
-      cy.get(proposalVoteProgressForPercentage) // 3001-VOTE-072
+      cy.getByTestId(proposalVoteProgressForPercentage) // 3001-VOTE-072
         .contains('100.00%')
         .and('be.visible');
-      cy.get(proposalVoteProgressAgainstPercentage)
+      cy.getByTestId(proposalVoteProgressAgainstPercentage)
         .contains('0.00%')
         .and('be.visible');
-      cy.get(proposalVoteProgressForTokens).contains('1.00').and('be.visible');
-      cy.get(proposalVoteProgressAgainstTokens)
+      cy.getByTestId(proposalVoteProgressForTokens)
+        .contains('1.00')
+        .and('be.visible');
+      cy.getByTestId(proposalVoteProgressAgainstTokens)
         .contains('0.00')
         .and('be.visible');
       cy.getByTestId(voteBreakdownToggle).click();
@@ -211,23 +212,39 @@ describe(
       getProposalInformationFromTable('Number of voting parties')
         .should('have.text', '1')
         .and('be.visible');
-      cy.get(changeVoteButton).should('be.visible').click();
+      cy.getByTestId(changeVoteButton).should('be.visible').click();
       voteForProposal('for');
       // 3001-VOTE-064
       getProposalInformationFromTable('Tokens for proposal')
         .should('have.text', (1).toFixed(2))
         .and('be.visible');
-      cy.get(changeVoteButton).should('be.visible').click();
+      navigateTo(navigation.proposals);
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getProposalFromTitle(rawProposal.rationale.title).within(() => {
+          // 3002-PROP-021
+          cy.getByTestId('user-voted-yes').should('exist');
+          cy.getByTestId(viewProposalButton).click();
+        });
+      });
+      cy.getByTestId(changeVoteButton).should('be.visible').click();
       voteForProposal('against');
-      cy.get(proposalVoteProgressAgainstPercentage)
+      cy.getByTestId(proposalVoteProgressAgainstPercentage)
         .contains('100.00%')
         .and('be.visible');
+      cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Tokens against proposal')
         .should('have.text', (1).toFixed(2))
         .and('be.visible');
       getProposalInformationFromTable('Number of voting parties')
         .should('have.text', '1')
         .and('be.visible');
+      navigateTo(navigation.proposals);
+      cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
+        getProposalFromTitle(rawProposal.rationale.title).within(() => {
+          cy.getByTestId('user-voted-no').should('exist');
+          cy.getByTestId(viewProposalButton).click();
+        });
+      });
     });
 
     // 3001-VOTE-042, 3001-VOTE-057, 3001-VOTE-058, 3001-VOTE-059, 3001-VOTE-060
@@ -236,13 +253,15 @@ describe(
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
+          cy.getByTestId(viewProposalButton).click()
         );
       });
       voteForProposal('for');
       // 3001-VOTE-079
       cy.contains('You voted: For').should('be.visible');
-      cy.get(proposalVoteProgressForTokens).contains('1').and('be.visible');
+      cy.getByTestId(proposalVoteProgressForTokens)
+        .contains('1')
+        .and('be.visible');
       cy.getByTestId(voteBreakdownToggle).click();
       getProposalInformationFromTable('Total Supply')
         .invoke('text')
@@ -258,22 +277,22 @@ describe(
           navigateTo(navigation.proposals);
           cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
             getProposalFromTitle(rawProposal.rationale.title).within(() =>
-              cy.get(viewProposalButton).click()
+              cy.getByTestId(viewProposalButton).click()
             );
           });
-          cy.get(proposalVoteProgressForPercentage)
+          cy.getByTestId(proposalVoteProgressForPercentage)
             .contains('100.00%')
             .and('be.visible');
-          cy.get(proposalVoteProgressAgainstPercentage)
+          cy.getByTestId(proposalVoteProgressAgainstPercentage)
             .contains('0.00%')
             .and('be.visible');
           // 3001-VOTE-065
-          cy.get(changeVoteButton).should('be.visible').click();
+          cy.getByTestId(changeVoteButton).should('be.visible').click();
           voteForProposal('for');
-          cy.get(proposalVoteProgressForTokens)
+          cy.getByTestId(proposalVoteProgressForTokens)
             .contains(tokensRequiredToAchieveResult)
             .and('be.visible');
-          cy.get(proposalVoteProgressAgainstTokens)
+          cy.getByTestId(proposalVoteProgressAgainstTokens)
             .contains('0.00')
             .and('be.visible');
           cy.getByTestId(voteBreakdownToggle).click();
@@ -310,7 +329,7 @@ describe(
       createRawProposal();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
+          cy.getByTestId(viewProposalButton).click()
         );
         voteForProposal('for');
         cy.contains('You voted: For').should('be.visible');
@@ -319,13 +338,16 @@ describe(
         stakingPageAssociateTokens('2');
         navigateTo(navigation.proposals);
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
+          cy.getByTestId(viewProposalButton).click()
         );
         cy.getByTestId('you-voted').should('not.exist');
         voteForProposal('against');
         cy.contains('You voted: Against').should('be.visible');
         switchVegaWalletPubKey();
-        cy.get(proposalVoteProgressForTokens).should('contain.text', '1.00');
+        cy.getByTestId(proposalVoteProgressForTokens).should(
+          'contain.text',
+          '1.00'
+        );
         // Checking vote status for different public keys is displayed correctly
         cy.contains('You voted: For').should('be.visible');
       });

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

@@ -19,13 +19,15 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-functions';
 
 const proposalListItem = '[data-testid="proposals-list-item"]';
-const closedProposals = '[data-testid="closed-proposals"]';
-const proposalStatus = '[data-testid="proposal-status"]';
-const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const votesTable = '[data-testid="votes-table"]';
-const openProposals = '[data-testid="open-proposals"]';
+const closedProposals = 'closed-proposals';
+const proposalStatus = 'proposal-status';
+const viewProposalButton = 'view-proposal-btn';
+const votesTable = 'votes-table';
+const openProposals = 'open-proposals';
 const proposalVoteProgressForPercentage =
-  '[data-testid="vote-progress-indicator-percentage-for"]';
+  'vote-progress-indicator-percentage-for';
+const majorityVoteReached = 'majority-reached';
+const minParticipationReached = 'participation-reached';
 const proposalTimeout = { timeout: 8000 };
 
 context(
@@ -55,24 +57,24 @@ context(
       cy.createMarket();
       cy.reload();
       waitForSpinner();
-      cy.get(closedProposals).within(() => {
+      cy.getByTestId(closedProposals).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
           .within(() => {
-            cy.get(proposalStatus).should('have.text', 'Enacted');
-            cy.get(viewProposalButton).click();
+            cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
+            cy.getByTestId(viewProposalButton).click();
           });
       });
       cy.getByTestId('proposal-type').should('have.text', 'New market');
-      cy.get(proposalStatus).should('have.text', 'Enacted');
-      cy.get(votesTable).within(() => {
+      cy.getByTestId(proposalStatus).should('have.text', 'Enacted');
+      cy.getByTestId(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
       });
     });
 
-    // 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
+    // 3001-VOTE-020 3001-VOTE-021 3001-VOTE-046 3001-VOTE-044 3001-VOTE-074 3001-VOTE-074
     it('Able to enact proposal by voting', function () {
       const proposalTitle = 'Add New proposal with short enactment';
       const proposalTx = createUpdateNetworkProposalTxBody();
@@ -81,29 +83,45 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.get(openProposals).within(() => {
+      cy.getByTestId(openProposals).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
-          .within(() => cy.get(viewProposalButton).click());
+          .within(() => {
+            // 3001-VOTE-019 time to vote is highlighted red
+            cy.getByTestId('vote-details')
+              .find('span')
+              .should('have.class', 'text-vega-pink');
+            cy.getByTestId(viewProposalButton).click();
+          });
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      cy.getByTestId(proposalStatus).should('have.text', 'Open');
       voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout)
+      cy.getByTestId(majorityVoteReached).should('exist');
+      cy.getByTestId(minParticipationReached).should('exist');
+      cy.getByTestId(proposalStatus, proposalTimeout)
         .should('have.text', 'Passed')
         .then(() => {
-          cy.get(proposalStatus, proposalTimeout).should(
+          cy.getByTestId(proposalStatus, proposalTimeout).should(
             'have.text',
             'Enacted'
           );
         });
-      cy.get(votesTable).within(() => {
+      cy.getByTestId(votesTable).within(() => {
         cy.contains('Vote passed.').should('be.visible');
         cy.contains('Voting has ended.').should('be.visible');
       });
-      cy.get(proposalVoteProgressForPercentage)
+      cy.getByTestId(proposalVoteProgressForPercentage)
         .contains('100.00%')
         .and('be.visible');
+      navigateTo(navigation.proposals);
+      cy.contains(proposalTitle)
+        .parentsUntil(proposalListItem)
+        .last()
+        .within(() => {
+          cy.getByTestId(majorityVoteReached).should('exist');
+          cy.getByTestId(minParticipationReached).should('exist');
+        });
     });
 
     // 3001-VOTE-047
@@ -115,15 +133,18 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.get(openProposals, { timeout: 6000 }).within(() => {
+      cy.getByTestId(openProposals, { timeout: 6000 }).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
-          .within(() => cy.get(viewProposalButton).click());
+          .within(() => cy.getByTestId(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
+      cy.getByTestId(proposalStatus).should('have.text', 'Open');
       voteForProposal('for');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Enacted');
+      cy.getByTestId(proposalStatus, proposalTimeout).should(
+        'have.text',
+        'Enacted'
+      );
     });
 
     // 3001-VOTE-048 3001-VOTE-049 3001-VOTE-050
@@ -134,14 +155,17 @@ context(
       navigateTo(navigation.proposals);
       cy.reload();
       waitForSpinner();
-      cy.get(openProposals).within(() => {
+      cy.getByTestId(openProposals).within(() => {
         cy.contains(proposalTitle)
           .parentsUntil(proposalListItem)
           .last()
-          .within(() => cy.get(viewProposalButton).click());
+          .within(() => cy.getByTestId(viewProposalButton).click());
       });
-      cy.get(proposalStatus).should('have.text', 'Open');
-      cy.get(proposalStatus, proposalTimeout).should('have.text', 'Declined');
+      cy.getByTestId(proposalStatus).should('have.text', 'Open');
+      cy.getByTestId(proposalStatus, proposalTimeout).should(
+        'have.text',
+        'Declined'
+      );
       getProposalInformationFromTable('Rejection reason')
         .contains('PROPOSAL_ERROR_PARTICIPATION_THRESHOLD_NOT_REACHED')
         .and('be.visible');

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

@@ -36,20 +36,19 @@ import {
 import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import type { testFreeformProposal } from '../../support/common-interfaces';
 
-const vegaWalletStakedBalances =
-  '[data-testid="vega-wallet-balance-staked-validators"]';
-const vegaWalletAssociatedBalance = '[data-testid="associated-amount"]';
-const vegaWalletNameElement = '[data-testid="wallet-name"]';
-const vegaWallet = '[data-testid="vega-wallet"]';
-const connectToVegaWalletButton = '[data-testid="connect-to-vega-wallet-btn"]';
-const newProposalSubmitButton = '[data-testid="proposal-submit"]';
-const viewProposalButton = '[data-testid="view-proposal-btn"]';
-const rawProposalData = '[data-testid="proposal-data"]';
-const voteButtons = '[data-testid="vote-buttons"]';
+const vegaWalletStakedBalances = 'vega-wallet-balance-staked-validators';
+const vegaWalletAssociatedBalance = 'associated-amount';
+const vegaWalletNameElement = 'wallet-name';
+const vegaWallet = 'vega-wallet';
+const connectToVegaWalletButton = 'connect-to-vega-wallet-btn';
+const newProposalSubmitButton = 'proposal-submit';
+const viewProposalButton = 'view-proposal-btn';
+const rawProposalData = 'proposal-data';
+const voteButtons = 'vote-buttons';
 const rejectProposalsLink = '[href="/proposals/rejected"]';
-const feedbackError = '[data-testid="Error"]';
-const noOpenProposals = '[data-testid="no-open-proposals"]';
-const noClosedProposals = '[data-testid="no-closed-proposals"]';
+const feedbackError = 'Error';
+const noOpenProposals = 'no-open-proposals';
+const noClosedProposals = 'no-closed-proposals';
 const txTimeout = Cypress.env('txTimeout');
 const epochTimeout = Cypress.env('epochTimeout');
 const proposalTimeout = { timeout: 14000 };
@@ -93,10 +92,10 @@ context(
     // Test can only pass if run before other proposal tests.
     it.skip('Should be able to see that no proposals exist', function () {
       // 3001-VOTE-003
-      cy.get(noOpenProposals)
+      cy.getByTestId(noOpenProposals)
         .should('be.visible')
         .and('have.text', 'There are no open or yet to enact proposals');
-      cy.get(noClosedProposals)
+      cy.getByTestId(noClosedProposals)
         .should('be.visible')
         .and('have.text', 'There are no enacted or rejected proposals');
     });
@@ -126,7 +125,10 @@ context(
       stakingValidatorPageAddStake('2');
       closeStakingDialog();
 
-      cy.get(vegaWalletStakedBalances, txTimeout).should('contain', '2');
+      cy.getByTestId(vegaWalletStakedBalances, txTimeout).should(
+        'contain',
+        '2'
+      );
       createRawProposal();
     });
 
@@ -168,7 +170,7 @@ context(
         getProposalFromTitle(rawProposal.rationale.title).within(() => {
           cy.contains('Rejected').should('be.visible');
           cy.contains('Close time too late').should('be.visible');
-          cy.get(viewProposalButton).click();
+          cy.getByTestId(viewProposalButton).click();
         });
       });
       cy.getByTestId('proposal-status').should('have.text', 'Rejected');
@@ -185,14 +187,14 @@ context(
       const errorMsg =
         'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)';
       vegaWalletTeardown();
-      cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
+      cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).contains(
         '0.00',
         txTimeout
       );
       goToMakeNewProposal(governanceProposalType.RAW);
       enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should('have.text', errorMsg);
+      cy.getByTestId(feedbackError).should('have.text', errorMsg);
       closeDialog();
     });
 
@@ -205,7 +207,7 @@ context(
       goToMakeNewProposal(governanceProposalType.RAW);
       enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should('have.text', errorMsg);
+      cy.getByTestId(feedbackError).should('have.text', errorMsg);
       closeDialog();
     });
 
@@ -221,17 +223,17 @@ context(
           createTenDigitUnixTimeStampForSpecifiedDays(8);
         freeformProposal.unexpected = `i shouldn't be here`;
         const proposalPayload = JSON.stringify(freeformProposal);
-        cy.get(rawProposalData).type(proposalPayload, {
+        cy.getByTestId(rawProposalData).type(proposalPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
 
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should('have.text', errorMsg);
+      cy.getByTestId(feedbackError).should('have.text', errorMsg);
       closeDialog();
-      cy.get(rawProposalData)
+      cy.getByTestId(rawProposalData)
         .invoke('val')
         .should('contain', "i shouldn't be here");
     });
@@ -249,15 +251,15 @@ context(
         rawProposal.terms.unexpectedField = `i shouldn't be here`;
         const proposalPayload = JSON.stringify(rawProposal);
 
-        cy.get(rawProposalData).type(proposalPayload, {
+        cy.getByTestId(rawProposalData).type(proposalPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
 
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
-      cy.get(feedbackError).should('have.text', errorMsg);
+      cy.getByTestId(feedbackError).should('have.text', errorMsg);
       closeDialog();
     });
 
@@ -265,10 +267,10 @@ context(
     // 3006-PASC-006 3006-PASC-007 3008-PFRO-018 3008-PFRO-019 3003-PMAN-006 3003-PMAN-007
     it('Unable to submit proposal without valid json', function () {
       goToMakeNewProposal(governanceProposalType.RAW);
-      cy.get(newProposalSubmitButton).click();
+      cy.getByTestId(newProposalSubmitButton).click();
       cy.getByTestId('input-error-text').should('have.text', 'Required');
-      cy.get(rawProposalData).type('Not a valid json string');
-      cy.get(newProposalSubmitButton).click();
+      cy.getByTestId(rawProposalData).type('Not a valid json string');
+      cy.getByTestId(newProposalSubmitButton).click();
       cy.getByTestId('input-error-text').should(
         'have.text',
         'Must be valid JSON'
@@ -283,22 +285,22 @@ context(
       submitUniqueRawProposal({ proposalTitle: proposalTitle });
       ethereumWalletConnect();
       stakingPageDisassociateTokens('0.0001');
-      cy.get(vegaWallet)
+      cy.getByTestId(vegaWallet)
         .first()
         .within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '0.9999'
           );
         });
       navigateTo(navigation.proposals);
       getProposalFromTitle(proposalTitle).within(() =>
-        cy.get(viewProposalButton).click()
+        cy.getByTestId(viewProposalButton).click()
       );
       cy.contains('Vote breakdown').should('be.visible', {
         timeout: 10000,
       });
-      cy.get(voteButtons).should('not.exist');
+      cy.getByTestId(voteButtons).should('not.exist');
       cy.getByTestId('min-proposal-requirements').should(
         'have.text',
         `You must have at least ${this.minVoterBalance} VEGA associated to vote on this proposal`
@@ -311,20 +313,20 @@ context(
       cy.get('[data-testid="disconnect"]').click();
       cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
         getProposalFromTitle(rawProposal.rationale.title).within(() =>
-          cy.get(viewProposalButton).click()
+          cy.getByTestId(viewProposalButton).click()
         );
       });
       // 3001-VOTE-075
       // 3001-VOTE-076
-      cy.get(connectToVegaWalletButton)
+      cy.getByTestId(connectToVegaWalletButton)
         .should('be.visible')
-        .and('have.text', 'Connect Vega wallet')
-        .click();
+        .and('have.text', 'Connect Vega wallet');
+      cy.getByTestId(connectToVegaWalletButton).click();
       cy.getByTestId('connector-jsonRpc').click();
-      cy.get(vegaWalletNameElement).should('be.visible');
-      cy.get(connectToVegaWalletButton).should('not.exist');
+      cy.getByTestId(vegaWalletNameElement).should('be.visible');
+      cy.getByTestId(connectToVegaWalletButton).should('not.exist');
       // 3001-VOTE-100
-      cy.get(vegaWalletAssociatedBalance, txTimeout).contains(
+      cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).contains(
         '1.00',
         txTimeout
       );

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

@@ -31,27 +31,25 @@ import {
 } from '../../support/wallet-functions';
 
 const proposalListItem = '[data-testid="proposals-list-item"]';
-const openProposals = '[data-testid="open-proposals"]';
-const proposalType = '[data-testid="proposal-type"]';
-const proposalDetails = '[data-testid="proposal-details"]';
-const newProposalSubmitButton = '[data-testid="proposal-submit"]';
-const proposalVoteDeadline = '[data-testid="proposal-vote-deadline"]';
-const proposalParameterSelect = '[data-testid="proposal-parameter-select"]';
-const proposalMarketSelect = '[data-testid="proposal-market-select"]';
-const newProposalTitle = '[data-testid="proposal-title"]';
-const newProposalDescription = '[data-testid="proposal-description"]';
-const newProposalTerms = '[data-testid="proposal-terms"]';
-const newProposedParameterValue =
-  '[data-testid="selected-proposal-param-new-value"]';
-const minVoteDeadline = '[data-testid="min-vote"]';
-const maxVoteDeadline = '[data-testid="max-vote"]';
-const minValidationDeadline = '[data-testid="min-validation"]';
-const minEnactDeadline = '[data-testid="min-enactment"]';
-const maxEnactDeadline = '[data-testid="max-enactment"]';
-const inputError = '[data-testid="input-error-text"]';
-const enactmentDeadlineError =
-  '[data-testid="enactment-before-voting-deadline"]';
-const proposalDownloadBtn = '[data-testid="proposal-download-json"]';
+const openProposals = 'open-proposals';
+const proposalType = 'proposal-type';
+const proposalDetails = 'proposal-details';
+const newProposalSubmitButton = 'proposal-submit';
+const proposalVoteDeadline = 'proposal-vote-deadline';
+const proposalParameterSelect = 'proposal-parameter-select';
+const proposalMarketSelect = 'proposal-market-select';
+const newProposalTitle = 'proposal-title';
+const newProposalDescription = 'proposal-description';
+const newProposalTerms = 'proposal-terms';
+const newProposedParameterValue = 'selected-proposal-param-new-value';
+const minVoteDeadline = 'min-vote';
+const maxVoteDeadline = 'max-vote';
+const minValidationDeadline = 'min-validation';
+const minEnactDeadline = 'min-enactment';
+const maxEnactDeadline = 'max-enactment';
+const inputError = 'input-error-text';
+const enactmentDeadlineError = 'enactment-before-voting-deadline';
+const proposalDownloadBtn = 'proposal-download-json';
 const feedbackError = '[data-testid="Error"]';
 const viewProposalBtn = 'view-proposal-btn';
 const liquidityVoteStatus = 'liquidity-votes-status';
@@ -88,18 +86,20 @@ context(
     it('Unable to submit network parameter with missing/invalid fields', function () {
       navigateTo(navigation.proposals);
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.get(proposalDownloadBtn).click();
-      cy.get(inputError).should('have.length', 3);
-      cy.get(newProposalTitle).type(
+      cy.getByTestId(proposalDownloadBtn).click();
+      cy.getByTestId(inputError).should('have.length', 3);
+      cy.getByTestId(newProposalTitle).type(
         'Invalid update network parameter proposal'
       );
-      cy.get(newProposalDescription).type('E2E invalid test for proposals');
-      cy.get(proposalParameterSelect).select(
+      cy.getByTestId(newProposalDescription).type(
+        'E2E invalid test for proposals'
+      );
+      cy.getByTestId(proposalParameterSelect).select(
         'spam_protection_proposal_min_tokens'
       );
-      cy.get(newProposedParameterValue).type('0');
-      cy.get(proposalVoteDeadline).clear().type('0');
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(newProposedParameterValue).type('0');
+      cy.getByTestId(proposalVoteDeadline).clear().type('0');
+      cy.getByTestId(proposalDownloadBtn)
         .click()
         .then(() => {
           cy.wrap(
@@ -109,7 +109,7 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.get(newProposalSubmitButton).click();
+      cy.getByTestId(newProposalSubmitButton).click();
       validateDialogContentMsg('PROPOSAL_ERROR_CLOSE_TIME_TOO_SOON');
     });
 
@@ -117,29 +117,33 @@ context(
     it('Able to download and submit network param proposal', function () {
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
       // 3007-PNEC-006
-      cy.get(newProposalTitle)
+      cy.getByTestId(newProposalTitle)
         .siblings()
         .should('contain.text', '(100 characters or less)');
       // 3007-PNEC-004 3007-PNEC-005
-      cy.get(newProposalTitle).type('Test update network parameter proposal');
+      cy.getByTestId(newProposalTitle).type(
+        'Test update network parameter proposal'
+      );
       // 3007-PNEC-009
-      cy.get(newProposalDescription)
+      cy.getByTestId(newProposalDescription)
         .siblings()
         .should('contain.text', '(20,000 characters or less)');
       // 3007-PNEC-007 3007-PNEC-008
-      cy.get(newProposalDescription).type('E2E test for downloading proposals');
+      cy.getByTestId(newProposalDescription).type(
+        'E2E test for downloading proposals'
+      );
       // 3007-PNEC-010
-      cy.get(proposalParameterSelect).select(
+      cy.getByTestId(proposalParameterSelect).select(
         'governance_proposal_asset_minClose'
       );
       // 3007-PNEC-011
-      cy.get(newProposedParameterValue).type('10s');
+      cy.getByTestId(newProposedParameterValue).type('10s');
       // 3007-PNEC-012
-      cy.get(proposalVoteDeadline).clear().type('2');
+      cy.getByTestId(proposalVoteDeadline).clear().type('2');
       // 3007-PNEC-013 3007-PNEC-014
       cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
       // 3007-PNEC-015
-      cy.get(maxEnactDeadline).click();
+      cy.getByTestId(maxEnactDeadline).click();
       // 3007-PNEC-016
       cy.getByTestId('enactment-date').invoke('text').should('not.be.empty');
       // 3007-PNEC-017
@@ -148,7 +152,7 @@ context(
       ).should('be.visible');
       // 3007-PNE-018
       cy.log('Download updated proposal file');
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -178,19 +182,21 @@ context(
     it('Unable to submit network parameter proposal with vote deadline above enactment deadline', function () {
       navigateTo(navigation.proposals);
       goToMakeNewProposal(governanceProposalType.NETWORK_PARAMETER);
-      cy.get(newProposalTitle).type('Test update network parameter proposal');
-      cy.get(newProposalDescription).type('invalid deadlines');
-      cy.get(proposalParameterSelect).select(
+      cy.getByTestId(newProposalTitle).type(
+        'Test update network parameter proposal'
+      );
+      cy.getByTestId(newProposalDescription).type('invalid deadlines');
+      cy.getByTestId(proposalParameterSelect).select(
         'spam_protection_proposal_min_tokens'
       );
-      cy.get(newProposedParameterValue).type('0');
-      cy.get(proposalVoteDeadline).clear().type('0');
-      cy.get(maxVoteDeadline).click();
-      cy.get(enactmentDeadlineError).should(
+      cy.getByTestId(newProposedParameterValue).type('0');
+      cy.getByTestId(proposalVoteDeadline).clear().type('0');
+      cy.getByTestId(maxVoteDeadline).click();
+      cy.getByTestId(enactmentDeadlineError).should(
         'have.text',
         'The proposal will fail if enactment is earlier than the voting deadline'
       );
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -201,7 +207,7 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.get(newProposalSubmitButton).click();
+      cy.getByTestId(newProposalSubmitButton).click();
       validateFeedBackMsg(
         'Invalid params: proposal_submission.terms.closing_timestamp (cannot be after enactment time)'
       );
@@ -214,16 +220,16 @@ context(
       function () {
         const proposalTitle = 'Test new market proposal';
         goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-        cy.get(newProposalTitle).type('Test new market proposal');
-        cy.get(newProposalDescription).type('E2E test for proposals');
+        cy.getByTestId(newProposalTitle).type(proposalTitle);
+        cy.getByTestId(newProposalDescription).type('E2E test for proposals');
         cy.fixture('/proposals/new-market').then((newMarketProposal) => {
           const newMarketPayload = JSON.stringify(newMarketProposal);
-          cy.get(newProposalTerms).type(newMarketPayload, {
+          cy.getByTestId(newProposalTerms).type(newMarketPayload, {
             parseSpecialCharSequences: false,
             delay: 2,
           });
         });
-        cy.get(proposalDownloadBtn)
+        cy.getByTestId(proposalDownloadBtn)
           .should('be.visible')
           .click()
           .then(() => {
@@ -259,19 +265,19 @@ context(
         'Invalid params: the transaction does not use a valid Vega command: unknown field "invalid" in vega.NewMarket';
 
       goToMakeNewProposal(governanceProposalType.NEW_MARKET);
-      cy.get(proposalDownloadBtn).should('be.visible').click();
-      cy.get(inputError).should('have.length', 3);
-      cy.get(newProposalTitle).type('Test new market proposal');
-      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
+      cy.getByTestId(inputError).should('have.length', 3);
+      cy.getByTestId(newProposalTitle).type('Test new market proposal');
+      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/new-market').then((newMarketProposal) => {
         newMarketProposal.invalid = 'I am an invalid field';
         const newMarketPayload = JSON.stringify(newMarketProposal);
-        cy.get(newProposalTerms).type(newMarketPayload, {
+        cy.getByTestId(newProposalTerms).type(newMarketPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -282,28 +288,30 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       validateFeedBackMsg(errorMsg);
     });
 
     // Will fail if run after 'Able to submit update market proposal and vote for proposal'
     // 3002-PROP-022
-    it('Unable to submit update market proposal without equity-like share in the market', function () {
+    it.skip('Unable to submit update market proposal without equity-like share in the market', function () {
       switchVegaWalletPubKey();
       stakingPageAssociateTokens('1');
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.get(newProposalTitle).type('Test update market proposal - rejected');
-      cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.get(proposalMarketSelect).select('Test market 1');
+      cy.getByTestId(newProposalTitle).type(
+        'Test update market proposal - rejected'
+      );
+      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.getByTestId(proposalMarketSelect).select('Test market 1');
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -314,7 +322,7 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
       validateDialogContentMsg('PROPOSAL_ERROR_INSUFFICIENT_EQUITY_LIKE_SHARE');
       closeDialog();
@@ -332,17 +340,19 @@ context(
         vegaWalletPublicKey
       );
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.get(newProposalTitle).type('Test update market proposal - rejected');
-      cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.get(proposalMarketSelect).select('Test market 1');
+      cy.getByTestId(newProposalTitle).type(
+        'Test update market proposal - rejected'
+      );
+      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.getByTestId(proposalMarketSelect).select('Test market 1');
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -353,7 +363,7 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false });
           });
         });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       cy.contains('Transaction failed', proposalTimeout).should('be.visible');
       validateFeedBackMsg(
         'Network error: the network blocked the transaction through the spam protection: party has insufficient associated governance tokens in their staking account to submit proposal request (ABCI code 89)'
@@ -368,9 +378,9 @@ context(
         vegaWalletPublicKey
       );
       goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
-      cy.get(newProposalTitle).type('Test update market proposal');
-      cy.get(newProposalDescription).type('E2E test for proposals');
-      cy.get(proposalMarketSelect).select('Test market 1');
+      cy.getByTestId(newProposalTitle).type('Test update market proposal');
+      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
+      cy.getByTestId(proposalMarketSelect).select('Test market 1');
       cy.get('[data-testid="update-market-details"]').within(() => {
         cy.get('dd').eq(0).should('have.text', 'Test market 1');
         cy.get('dd').eq(1).should('have.text', 'TEST.24h');
@@ -385,12 +395,12 @@ context(
       });
       cy.fixture('/proposals/update-market').then((updateMarketProposal) => {
         const newUpdateMarketProposal = JSON.stringify(updateMarketProposal);
-        cy.get(newProposalTerms).type(newUpdateMarketProposal, {
+        cy.getByTestId(newProposalTerms).type(newUpdateMarketProposal, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -437,19 +447,19 @@ context(
     it('Able to submit new asset proposal using min deadlines', function () {
       const proposalTitle = 'Test new asset proposal';
       goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.get(newProposalTitle).type(proposalTitle);
-      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.getByTestId(newProposalTitle).type(proposalTitle);
+      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/new-asset').then((newAssetProposal) => {
         const newAssetPayload = JSON.stringify(newAssetProposal);
-        cy.get(newProposalTerms).type(newAssetPayload, {
+        cy.getByTestId(newProposalTerms).type(newAssetPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });
       });
-      cy.get(minVoteDeadline).click();
-      cy.get(minValidationDeadline).click();
-      cy.get(minEnactDeadline).click();
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(minVoteDeadline).click();
+      cy.getByTestId(minValidationDeadline).click();
+      cy.getByTestId(minEnactDeadline).click();
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -460,9 +470,9 @@ context(
             submitUniqueRawProposal({ proposalBody: filePath, submit: false }); // 3005-PASN-003
           });
         });
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       closeDialog();
-      cy.get(newProposalSubmitButton).should('be.visible').click();
+      cy.getByTestId(newProposalSubmitButton).should('be.visible').click();
       // cannot submit a proposal with ERC20 address already in use
       cy.contains('Proposal rejected', proposalTimeout).should('be.visible');
       validateDialogContentMsg('PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE');
@@ -483,8 +493,8 @@ context(
 
     it('Unable to submit new asset proposal with missing/invalid fields', function () {
       goToMakeNewProposal(governanceProposalType.NEW_ASSET);
-      cy.get(proposalDownloadBtn).should('be.visible').click();
-      cy.get(inputError).should('have.length', 3);
+      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
+      cy.getByTestId(inputError).should('have.length', 3);
     });
 
     it('Able to submit update asset proposal using min deadline', function () {
@@ -493,9 +503,9 @@ context(
 
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
-      cy.get(minVoteDeadline).click();
-      cy.get(minEnactDeadline).click();
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(minVoteDeadline).click();
+      cy.getByTestId(minEnactDeadline).click();
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -507,13 +517,16 @@ context(
           });
         });
       navigateTo(navigation.proposals);
-      cy.get(openProposals).within(() => {
-        cy.get(proposalType)
+      cy.getByTestId(openProposals).within(() => {
+        cy.getByTestId(proposalType)
           .contains('Update asset')
           .parentsUntil(proposalListItem)
           .last()
           .within(() => {
-            cy.get(proposalDetails).should('contain.text', assetId.slice(0, 6)); // 3001-VOTE-029
+            cy.getByTestId(proposalDetails).should(
+              'contain.text',
+              assetId.slice(0, 6)
+            ); // 3001-VOTE-029
             cy.getByTestId(viewProposalBtn).click();
           });
       });
@@ -533,9 +546,9 @@ context(
     it('Able to submit update asset proposal using max deadline', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
       enterUpdateAssetProposalDetails();
-      cy.get(maxVoteDeadline).click();
-      cy.get(maxEnactDeadline).click();
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(maxVoteDeadline).click();
+      cy.getByTestId(maxEnactDeadline).click();
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -550,36 +563,36 @@ context(
 
     it('Unable to submit edit asset proposal with missing/invalid fields', function () {
       goToMakeNewProposal(governanceProposalType.UPDATE_ASSET);
-      cy.get(proposalDownloadBtn).should('be.visible').click();
-      cy.get(inputError).should('have.length', 3);
+      cy.getByTestId(proposalDownloadBtn).should('be.visible').click();
+      cy.getByTestId(inputError).should('have.length', 3);
     });
 
     it('Able to download and submit freeform proposal', function () {
       goToMakeNewProposal(governanceProposalType.FREEFORM);
       // 3008-PFRO-006
-      cy.get(newProposalTitle)
+      cy.getByTestId(newProposalTitle)
         .siblings()
         .should('contain.text', '(100 characters or less)'); // 3008-PFRO-007
       // 3008-PFRO-005
-      cy.get(newProposalTitle).type('Test freeform proposal form');
+      cy.getByTestId(newProposalTitle).type('Test freeform proposal form');
       // 3008-PFRO-009
-      cy.get(newProposalDescription)
+      cy.getByTestId(newProposalDescription)
         .siblings()
         .should('contain.text', '(20,000 characters or less)'); // 3008-PFRO-010
       // 3008-PFRO-008 3002-PROP-012 3002-PROP-016
-      cy.get(newProposalDescription).type(
+      cy.getByTestId(newProposalDescription).type(
         'E2E test for downloading freeform proposal'
       );
       // 3008-PFRO-012
-      cy.get(minVoteDeadline).should('exist'); // 3002-PROP-008
-      cy.get(maxVoteDeadline).should('exist');
+      cy.getByTestId(minVoteDeadline).should('exist'); // 3002-PROP-008
+      cy.getByTestId(maxVoteDeadline).should('exist');
       // 3008-PFRO-011
-      cy.get(proposalVoteDeadline).clear().type('2');
+      cy.getByTestId(proposalVoteDeadline).clear().type('2');
       // 3008-PFRO-013 3008-PFRO-014
       cy.getByTestId('voting-date').invoke('text').should('not.be.empty');
       // 3008-PFRO-015
       cy.log('Download updated proposal file');
-      cy.get(proposalDownloadBtn)
+      cy.getByTestId(proposalDownloadBtn)
         .should('be.visible')
         .click()
         .then(() => {
@@ -593,6 +606,94 @@ context(
         });
     });
 
+    it('able to submit successor market proposal', function () {
+      const proposalTitle = 'Test successor market proposal';
+
+      cy.createMarket();
+      cy.reload();
+      waitForSpinner();
+      cy.getByTestId('closed-proposals').within(() => {
+        cy.contains('Add Lorem Ipsum market')
+          .parentsUntil(proposalListItem)
+          .last()
+          .within(() => {
+            cy.getByTestId(viewProposalBtn).click();
+          });
+      });
+      getProposalInformationFromTable('ID').invoke('text').as('parentMarketId');
+      goToMakeNewProposal(governanceProposalType.NEW_MARKET);
+      cy.getByTestId(newProposalTitle).type(proposalTitle);
+      cy.getByTestId(newProposalDescription).type(
+        'E2E test for successor market'
+      );
+      cy.fixture('/proposals/successor-market').then((newMarketProposal) => {
+        newMarketProposal.changes.successor.parentMarketId =
+          this.parentMarketId;
+        const newMarketPayload = JSON.stringify(newMarketProposal);
+        cy.getByTestId(newProposalTerms).type(newMarketPayload, {
+          parseSpecialCharSequences: false,
+          delay: 2,
+        });
+      });
+      cy.getByTestId(proposalDownloadBtn)
+        .should('be.visible')
+        .click()
+        .then(() => {
+          cy.wrap(
+            getDownloadedProposalJsonPath('vega-new-market-proposal-')
+          ).then((filePath) => {
+            goToMakeNewProposal(governanceProposalType.RAW);
+            submitUniqueRawProposal({ proposalBody: filePath });
+          });
+        });
+      navigateTo(navigation.proposals);
+      getProposalFromTitle(proposalTitle).within(() => {
+        // 3003-PMAN-008
+        cy.getByTestId('proposal-successor-info')
+          .should('have.text', 'Successor market to: TEST.24h')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', this.parentMarketId);
+        cy.getByTestId('view-proposal-btn').click();
+      });
+      // #3003-PMAN-010
+      cy.getByTestId(proposalJsonToggle).click();
+      cy.get('.language-json').within(() => {
+        cy.get('.hljs-attr').should('contain.text', 'parentMarketId');
+        cy.get('.hljs-string').should('contain.text', this.parentMarketId);
+        cy.get('.hljs-attr').should('contain.text', 'insurancePoolFraction');
+        cy.get('.hljs-string').should('contain.text', '0.75');
+      });
+      cy.getByTestId('proposal-market-data').within(() => {
+        cy.getByTestId('proposal-market-data-toggle').click();
+        cy.contains('Key details').click();
+        // 3003-PMAN-009
+        getMarketProposalDetailsFromTable('Parent Market ID').should(
+          'have.text',
+          this.parentMarketId
+        );
+        getMarketProposalDetailsFromTable('Insurance Pool Fraction').should(
+          'have.text',
+          '0.75'
+        );
+        getMarketProposalDetailsFromTable('Trading Mode').should(
+          'have.text',
+          'No trading'
+        );
+      });
+      // 3003-PMAN-011
+      cy.contains('Parent Market ID').realHover();
+      cy.getByTestId('tooltip-content').should(
+        'contain.text',
+        'The ID of the market this market succeeds.'
+      );
+      cy.contains('Insurance Pool Fraction').realHover();
+      cy.getByTestId('tooltip-content').should(
+        'contain.text',
+        'The fraction of the insurance pool balance that is carried over from the parent market to the successor.'
+      );
+    });
+
     after('Disassociate from second wallet key if present', function () {
       cy.reload();
       waitForSpinner();
@@ -613,11 +714,11 @@ context(
     }
 
     function enterUpdateAssetProposalDetails() {
-      cy.get(newProposalTitle).type('Test update asset proposal');
-      cy.get(newProposalDescription).type('E2E test for proposals');
+      cy.getByTestId(newProposalTitle).type('Test update asset proposal');
+      cy.getByTestId(newProposalDescription).type('E2E test for proposals');
       cy.fixture('/proposals/update-asset').then((newAssetProposal) => {
         const newAssetPayload = JSON.stringify(newAssetProposal);
-        cy.get(newProposalTerms).type(newAssetPayload, {
+        cy.getByTestId(newProposalTerms).type(newAssetPayload, {
           parseSpecialCharSequences: false,
           delay: 2,
         });

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

@@ -24,12 +24,12 @@ import { ethereumWalletConnect } from '../../support/wallet-eth.functions';
 import { vegaWalletSetSpecifiedApprovalAmount } from '../../support/wallet-functions';
 
 const proposalListItem = 'proposals-list-item';
-const openProposals = '[data-testid="open-proposals"]';
+const openProposals = 'open-proposals';
 const voteStatus = 'vote-status';
 const proposalType = 'proposal-type';
 const proposalStatus = 'proposal-status';
-const proposalClosingDate = '[data-testid="vote-details"]';
-const viewProposalButton = '[data-testid="view-proposal-btn"]';
+const proposalClosingDate = 'vote-details';
+const viewProposalButton = 'view-proposal-btn';
 const voteBreakDownToggle = 'vote-breakdown-toggle';
 
 describe('Governance flow for proposal list', { tags: '@slow' }, function () {
@@ -49,8 +49,8 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     navigateTo(navigation.proposals);
   });
 
+  // 3001-VOTE-018
   it('Newly created proposals list - proposals closest to closing date appear higher in list', function () {
-    // 3001-VOTE-005
     const proposalDays = [364, 50, 2];
     for (let index = 0; index < proposalDays.length; index++) {
       goToMakeNewProposal(governanceProposalType.RAW);
@@ -62,13 +62,13 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     }
 
     navigateTo(navigation.proposals);
-    cy.get(openProposals).within(() => {
-      cy.get(proposalClosingDate)
+    cy.getByTestId(openProposals).within(() => {
+      cy.getByTestId(proposalClosingDate)
         .first()
         .invoke('text')
         .should('match', /days|minutes/);
-      cy.get(proposalClosingDate).should('contain.text', 'months');
-      cy.get(proposalClosingDate).last().should('contain.text', 'year');
+      cy.getByTestId(proposalClosingDate).should('contain.text', 'months');
+      cy.getByTestId(proposalClosingDate).last().should('contain.text', 'year');
     });
   });
 
@@ -77,7 +77,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     const proposalTitle = generateFreeFormProposalTitle();
 
     submitUniqueRawProposal({ proposalTitle: proposalTitle });
-    cy.get('[data-testid="set-proposals-filter-visible"]').click();
+    cy.get('[data-testid="proposal-filter-toggle"]').click();
     cy.get('[data-testid="filter-input"]').type(proposerId);
     // cy.get(`#${proposalId}`).should('contain', proposalId);
     cy.contains(proposalTitle).should('be.visible');
@@ -106,7 +106,7 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     createRawProposal(this.minProposerBalance);
     cy.get<testFreeformProposal>('@rawProposal').then((rawProposal) => {
       getProposalFromTitle(rawProposal.rationale.title).within(() => {
-        cy.get(viewProposalButton).should('be.visible');
+        cy.getByTestId(viewProposalButton).should('be.visible');
         cy.getByTestId(proposalType).should('have.text', 'Freeform');
         cy.getByTestId(proposalStatus).should('have.text', 'Open');
       });
@@ -120,17 +120,25 @@ describe('Governance flow for proposal list', { tags: '@slow' }, function () {
     submitUniqueRawProposal({ proposalTitle: proposalTitle });
     getProposalFromTitle(proposalTitle).within(() => {
       // 3001-VOTE-039
-      cy.getByTestId(voteStatus).should(
+      cy.getByTestId('participation-not-reached').should(
         'have.text',
-        'Participation not reached'
+        'Min. participation not reached'
       );
-      cy.get(viewProposalButton).click();
+      cy.getByTestId(viewProposalButton).click();
     });
     voteForProposal('for');
     navigateTo(navigation.proposals);
     getProposalFromTitle(proposalTitle).within(() => {
-      cy.getByTestId(voteStatus).should('have.text', 'Set to pass');
-      cy.get(viewProposalButton).click();
+      cy.getByTestId(voteStatus).should(
+        'have.text',
+        'Currently expected to  pass'
+      );
+      cy.getByTestId('user-voted-yes').should('exist');
+      cy.getByTestId('participation-reached').should(
+        'have.text',
+        'Min. participation reached'
+      );
+      cy.getByTestId(viewProposalButton).click();
     });
     cy.getByTestId(voteBreakDownToggle).click();
     getProposalInformationFromTable('Token participation met')

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

@@ -17,8 +17,7 @@ import {
 } from '../../support/wallet-functions';
 
 const vegaAssetAddress = '0x67175Da1D5e966e40D11c4B2519392B2058373de';
-const vegaWalletUnstakedBalance =
-  '[data-testid="vega-wallet-balance-unstaked"]';
+const vegaWalletUnstakedBalance = 'vega-wallet-balance-unstaked';
 const rewardsTable = 'epoch-total-rewards-table';
 const txTimeout = Cypress.env('txTimeout');
 const rewardsTimeOut = { timeout: 60000 };
@@ -40,7 +39,7 @@ context('rewards - flow', { tags: '@slow' }, function () {
     cy.associateTokensToVegaWallet('6000');
     navigateTo(navigation.validators);
     cy.VegaWalletTopUpRewardsPool();
-    cy.get(vegaWalletUnstakedBalance, txTimeout).should(
+    cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
       'contain',
       '6,000.0',
       txTimeout
@@ -97,12 +96,14 @@ context('rewards - flow', { tags: '@slow' }, function () {
       .within(() => {
         cy.get('h2').first().should('contain.text', 'EPOCH');
         cy.getByTestId('individual-rewards-asset').should('have.text', 'Vega');
-        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut)
-          .should('contain.text', '0.4415')
-          .and('contain.text', '(44.15%)');
-        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE')
-          .should('contain.text', '0.0004')
-          .and('contain.text', '(44.15%)');
+        cy.getByTestId('ACCOUNT_TYPE_GLOBAL_REWARD', rewardsTimeOut).should(
+          'contain.text',
+          '0.4415'
+        );
+        cy.getByTestId('ACCOUNT_TYPE_FEES_INFRASTRUCTURE').should(
+          'contain.text',
+          '0.0004'
+        );
         cy.getByTestId('total').should('have.text', '0.4419');
       });
   });

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

@@ -4,7 +4,6 @@ import {
   verifyStakedBalance,
   verifyEthWalletTotalAssociatedBalance,
   verifyEthWalletAssociatedBalance,
-  waitForSpinner,
   navigateTo,
   navigation,
   turnTelemetryOff,
@@ -58,6 +57,7 @@ context(
     before('visit staking tab and connect vega wallet', function () {
       cy.visit('/');
       ethereumWalletConnect();
+      cy.connectVegaWallet();
       vegaWalletSetSpecifiedApprovalAmount('1000');
     });
 
@@ -67,10 +67,9 @@ context(
         function () {
           cy.clearLocalStorage();
           turnTelemetryOff();
-          cy.reload();
-          waitForSpinner();
-          cy.connectVegaWallet();
-          ethereumWalletConnect();
+          // Go to homepage to allow wallet teardown without epoch timer refreshing page
+          navigateTo(navigation.home);
+          vegaWalletTeardown();
           navigateTo(navigation.validators);
         }
       );
@@ -128,6 +127,7 @@ context(
         cy.getByTestId('staked-by-user-tooltip')
           .first()
           .should('have.text', 'Staked by me: 2.00');
+        waitForBeginningOfEpoch();
         cy.getByTestId('total-pending-stake').first().realHover();
         cy.getByTestId('pending-user-stake-tooltip')
           .first()
@@ -144,7 +144,7 @@ context(
         closeStakingDialog();
         navigateTo(navigation.validators);
         cy.getByTestId(viewStakedByMeToggle).click();
-        cy.getByTestId(userStakeBtn).should('have.length', 2);
+        cy.getByTestId(userStakeBtn, epochTimeout).should('have.length', 2);
       });
 
       it('Able to stake against a validator - using vega from vesting contract', function () {
@@ -398,6 +398,7 @@ context(
         vegaWalletSetSpecifiedApprovalAmount('1000');
         cy.reload();
         ethereumWalletConnect();
+        cy.connectVegaWallet();
         stakingPageAssociateTokens('3');
         verifyUnstakedBalance(3.0);
         cy.get('button').contains('Select a validator to nominate').click();
@@ -503,11 +504,6 @@ context(
         );
       });
 
-      afterEach('Teardown Wallet', function () {
-        navigateTo(navigation.home);
-        vegaWalletTeardown();
-      });
-
       function verifyNextEpochValue(amount: number) {
         cy.getByTestId('stake-next-epoch', epochTimeout)
           .contains(amount, epochTimeout)

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

@@ -21,25 +21,24 @@ import {
   vegaWalletTeardown,
 } from '../../support/wallet-functions';
 
-const ethWalletContainer = '[data-testid="ethereum-wallet"]';
-const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
-const vegaWalletUnstakedBalance =
-  '[data-testid="vega-wallet-balance-unstaked"]';
-const txTimeout = Cypress.env('txTimeout');
-const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const ethWalletContainer = 'ethereum-wallet';
+const vegaWalletAssociatedBalance = 'currency-value';
+const vegaWalletUnstakedBalance = 'vega-wallet-balance-unstaked';
 const ethWalletAssociateButton = '[data-testid="associate-btn"]:visible';
-const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
-const tokenAmountInputBox = '[data-testid="token-amount-input"]';
-const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
+const associateWalletRadioButton = 'associate-radio-wallet';
+const tokenAmountInputBox = 'token-amount-input';
+const tokenSubmitButton = 'token-input-submit-button';
 const ethWalletDissociateButton = '[href="/token/disassociate"]:visible';
-const vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
-const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
-const connectedVegaKey = '[data-testid="connected-vega-key"]';
-const associatedKey = '[data-testid="associated-key"]';
-const associatedAmount = '[data-testid="associated-amount"]';
-const associateCompleteText = '[data-testid="transaction-complete-body"]';
-const disassociationWarning = '[data-testid="disassociation-warning"]';
+const vestingContractSection = 'vega-in-vesting-contract';
+const vegaInWalletSection = 'vega-in-wallet';
+const connectedVegaKey = 'connected-vega-key';
+const associatedKey = 'associated-key';
+const associatedAmount = 'associated-amount';
+const associateCompleteText = 'transaction-complete-body';
+const disassociationWarning = 'disassociation-warning';
 const vegaWallet = 'aside [data-testid="vega-wallet"]';
+const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
+const txTimeout = Cypress.env('txTimeout');
 
 context(
   'Token association flow - with eth and vega wallets connected',
@@ -89,12 +88,15 @@ context(
           verifyEthWalletAssociatedBalance('2.0');
           verifyEthWalletTotalAssociatedBalance('2.0');
           cy.get(vegaWallet).within(() => {
-            cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+            cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
               'contain',
               2.0
             );
           });
-          cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
+          cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
+            'contain',
+            2.0
+          );
         }
       );
 
@@ -127,7 +129,7 @@ context(
         verifyEthWalletAssociatedBalance('1,001.00');
         verifyEthWalletTotalAssociatedBalance('7,001.00');
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should(
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
             'contain',
             '1,001.00'
           );
@@ -137,14 +139,20 @@ context(
       it('Able to disassociate a partial amount of tokens currently associated', function () {
         stakingPageAssociateTokens('2');
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            2.0
+          );
         });
         cy.get('button').contains('Select a validator to nominate').click();
         cy.getByTestId('epoch-countdown').should('be.visible');
         stakingPageDisassociateTokens('1');
         verifyEthWalletAssociatedBalance('1.0');
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 1.0);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            1.0
+          );
         });
       });
 
@@ -154,21 +162,24 @@ context(
           'Warning: Any tokens that have been nominated to a node will sacrifice rewards they are due for the current epoch. If you do not wish to sacrifice these, you should remove stake from a node at the end of an epoch before disassociation.';
         stakingPageAssociateTokens('2');
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            2.0
+          );
         });
         cy.get('button').contains('Select a validator to nominate').click();
         cy.getByTestId('epoch-countdown').should('be.visible');
         cy.get(ethWalletDissociateButton).click();
-        cy.get(disassociationWarning).should('contain', warningText);
+        cy.getByTestId(disassociationWarning).should('contain', warningText);
         stakingPageDisassociateAllTokens();
-        cy.get(ethWalletContainer)
+        cy.getByTestId(ethWalletContainer)
           .first()
           .within(() => {
             cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
               'not.exist'
             );
           });
-        cy.get(ethWalletContainer)
+        cy.getByTestId(ethWalletContainer)
           .first()
           .within(() => {
             cy.contains(vegaWalletPublicKeyShort, { timeout: 20000 }).should(
@@ -176,7 +187,10 @@ context(
             );
           });
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 0.0);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            0.0
+          );
         });
       });
 
@@ -198,9 +212,15 @@ context(
         verifyEthWalletAssociatedBalance('2.0');
         verifyEthWalletTotalAssociatedBalance('2.0');
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            2.0
+          );
         });
-        cy.get(vegaWalletUnstakedBalance, txTimeout).should('contain', 2.0);
+        cy.getByTestId(vegaWalletUnstakedBalance, txTimeout).should(
+          'contain',
+          2.0
+        );
         stakingPageDisassociateTokens('1', {
           type: 'contract',
           skipConfirmation: true,
@@ -221,45 +241,54 @@ context(
         cy.get('button').contains('Select a validator to nominate').click();
         cy.getByTestId('epoch-countdown').should('be.visible');
         stakingPageAssociateTokens('37', { type: 'contract' });
-        cy.get(vestingContractSection)
+        cy.getByTestId(vestingContractSection)
           .first()
           .within(() => {
-            cy.get(associatedKey).should(
+            cy.getByTestId(associatedKey).should(
               'contain',
               Cypress.env('vegaWalletPublicKeyShort')
             );
-            cy.get(associatedAmount, txTimeout).should('contain', 37);
+            cy.getByTestId(associatedAmount, txTimeout).should('contain', 37);
           });
-        cy.get(vegaInWalletSection)
+        cy.getByTestId(vegaInWalletSection)
           .first()
           .within(() => {
-            cy.get(associatedKey).should(
+            cy.getByTestId(associatedKey).should(
               'contain',
               Cypress.env('vegaWalletPublicKeyShort')
             );
-            cy.get(associatedAmount, txTimeout).should('contain', 21);
+            cy.getByTestId(associatedAmount, txTimeout).should('contain', 21);
           });
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 58);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            58
+          );
         });
         stakingPageDisassociateTokens('6', { type: 'contract' });
-        cy.get(vestingContractSection)
+        cy.getByTestId(vestingContractSection)
           .first()
           .within(() => {
-            cy.get(associatedAmount, txTimeout).should('contain', 31);
+            cy.getByTestId(associatedAmount, txTimeout).should('contain', 31);
           });
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 52);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            52
+          );
         });
         navigateTo(navigation.validators);
         stakingPageDisassociateTokens('9', { type: 'wallet' });
-        cy.get(vegaInWalletSection)
+        cy.getByTestId(vegaInWalletSection)
           .first()
           .within(() => {
-            cy.get(associatedAmount, txTimeout).should('contain', 12);
+            cy.getByTestId(associatedAmount, txTimeout).should('contain', 12);
           });
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 43);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            43
+          );
         });
       });
 
@@ -268,10 +297,10 @@ context(
         // 1004-ASSO-010
         // No warning visible as described in AC, but the button is disabled
         cy.get(ethWalletAssociateButton).click();
-        cy.get(associateWalletRadioButton, { timeout: 30000 }).click();
-        cy.get(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
-        cy.get(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
-        cy.get(tokenSubmitButton, txTimeout).should('be.disabled');
+        cy.getByTestId(associateWalletRadioButton, { timeout: 30000 }).click();
+        cy.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled'); // button disabled with no input
+        cy.getByTestId(tokenAmountInputBox, { timeout: 10000 }).type('6500000');
+        cy.getByTestId(tokenSubmitButton, txTimeout).should('be.disabled');
       });
 
       // 1004-ASSO-004
@@ -296,22 +325,25 @@ context(
 
       it('Able to associate tokens to different public key of connected vega wallet', function () {
         cy.get(ethWalletAssociateButton).click();
-        cy.get(associateWalletRadioButton).click();
-        cy.get(connectedVegaKey).should(
+        cy.getByTestId(associateWalletRadioButton).click();
+        cy.getByTestId(connectedVegaKey).should(
           'have.text',
           Cypress.env('vegaWalletPublicKey')
         );
 
         switchVegaWalletPubKey();
-        cy.get(connectedVegaKey).should(
+        cy.getByTestId(connectedVegaKey).should(
           'have.text',
           Cypress.env('vegaWalletPublicKey2')
         );
         stakingPageAssociateTokens('2');
         cy.get(vegaWallet).within(() => {
-          cy.get(vegaWalletAssociatedBalance, txTimeout).should('contain', 2.0);
+          cy.getByTestId(vegaWalletAssociatedBalance, txTimeout).should(
+            'contain',
+            2.0
+          );
         });
-        cy.get(associateCompleteText).should(
+        cy.getByTestId(associateCompleteText).should(
           'have.text',
           `Vega key ${Cypress.env(
             'vegaWalletPublicKey2Short'
@@ -319,6 +351,12 @@ context(
         );
         stakingPageDisassociateAllTokens();
       });
+
+      it('Able to associate over 1 million tokens', function () {
+        cy.get(ethWalletAssociateButton).click();
+        stakingPageAssociateTokens('2000000', { approve: true });
+        stakingPageDisassociateAllTokens();
+      });
     });
   }
 );