feat(ci): remove extra files

feat(ci): disable linting / building
feat(ci): disable hooks
2023-09-05 12:12:41 +02:00 · 2023-09-05 11:53:46 +02:00 · 2023-09-05 11:53:02 +02:00 · 2023-09-05 11:44:27 +02:00
1208 changed files with 21865 additions and 46895 deletions
@@ -51,8 +51,7 @@
            "ul": ["list"],
            "ol": ["list"]
          }
-        ],
-        "no-console": ["error", { "allow": ["warn", "error"] }]
+        ]
      }
    },
    {
@@ -1,6 +1,6 @@
 # Related issues 🔗

-Closes #[Issue number here]
+Issue: #[Issue number here]

 # Description ℹ️

@@ -82,38 +82,3 @@ jobs:
            https://${{ env.IPFS_V1 }}.ipfs.dweb.link/
            https://${{ env.IPFS_V1 }}.ipfs.cf-ipfs.com/
            ipfs://${{ env.IPFS_V0 }}/
-
-      - name: Ensure 'Released' label exists
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          REPO="${{ github.repository }}"
-          LABEL_EXIST=$(curl -s -H "Authorization: token $GITHUB_TOKEN" \
-                            -H "Accept: application/vnd.github.v3+json" \
-                            "https://api.github.com/repos/$REPO/labels/Released")
-          if [[ "$LABEL_EXIST" == *"Not Found"* ]]; then
-            curl -s -H "Authorization: token $GITHUB_TOKEN" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -X POST "https://api.github.com/repos/$REPO/labels" \
-                  -d '{"name": "Released", "color": "FFFFFF"}'
-          fi
-
-      - name: Extract issues from release notes
-        id: extract-issues
-        run: |
-          ISSUES=$(echo "${{ github.event.release.body }}" | grep -o -E '#[0-9]+' | tr -d '#' | jq -R . | jq -cs .)
-          echo "Issues to label: $ISSUES"
-          echo "::set-output name=issue_numbers::$ISSUES"
-
-      - name: Add 'Released' label to issues
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          ISSUE_NUMBERS="${{ steps.extract-issues.outputs.issue_numbers }}"
-          REPO="${{ github.repository }}"
-          for ISSUE in $(echo "$ISSUE_NUMBERS" | jq -r '.[]'); do
-            curl -s -H "Authorization: token $GITHUB_TOKEN" \
-                  -H "Accept: application/vnd.github.v3+json" \
-                  -X POST "https://api.github.com/repos/$REPO/issues/$ISSUE/labels" \
-                  -d '{"labels": ["Released"]}'
-          done
@@ -5,17 +5,15 @@ on:
    branches:
      - release/*
      - develop
-      - main
  pull_request:
    types:
      - opened
      - ready_for_review
      - reopened
+      - edited
      - synchronize
 jobs:
  node-modules:
-    # All jobs depend on node_modules, so none should run if the PR is in draft
-    if: github.event.pull_request.draft == false
    runs-on: ubuntu-22.04
    name: 'Cache yarn modules'
    steps:
@@ -23,6 +21,7 @@ jobs:
        uses: actions/checkout@v3
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}
+
      - name: Cache node modules
        id: cache
        uses: actions/cache@v3
@@ -40,15 +39,23 @@ jobs:
          node-version-file: '.nvmrc'
          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
          cache: yarn
+
      - name: yarn install
        if: steps.cache.outputs.cache-hit != 'true'
        run: yarn install --pure-lockfile

-  lint-format:
-    timeout-minutes: 20
+  lint-pr-title:
+    needs: node-modules
+    if: ${{ github.event_name == 'pull_request' }}
+    name: Verify PR title
+    uses: ./.github/workflows/lint-pr.yml
+    secrets: inherit
+
+  lint-test-build:
+    timeout-minutes: 60
    needs: node-modules
    runs-on: ubuntu-22.04
-    name: '(CI) lint + format check'
+    name: '(CI) lint + unit test + build'
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@@ -74,76 +81,6 @@ jobs:
        with:
          main-branch-name: develop

-      - name: Check formatting
-        run: yarn nx format:check
-
-      - name: Lint affected
-        run: yarn nx affected:lint --max-warnings=0
-
-      - name: Build affected spec
-        run: yarn nx affected --target=build-spec
-
-  test-affected:
-    timeout-minutes: 30
-    needs: build-sources
-    runs-on: ubuntu-22.04
-    name: 'run unit test of affected apps'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: develop
-
-      - name: Test affected
-        run: yarn nx affected:test
-
-  build-sources:
-    timeout-minutes: 30
-    needs: lint-format
-    runs-on: ubuntu-22.04
-    name: 'Build sources of affected apps'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version-file: '.nvmrc'
-          cache: yarn
-
-      - name: Cache node modules
-        uses: actions/cache@v3
-        with:
-          path: node_modules
-          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
-
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v3
-        with:
-          main-branch-name: develop
-
      # See affected apps
      - name: See affected apps
        run: |
@@ -160,8 +97,21 @@ jobs:
          echo "preview_explorer: ${{ env.PREVIEW_EXPLORER }}"
          echo "preview_tools: ${{ env.PREVIEW_TOOLS }}"

-      - name: Build affected
-        run: yarn nx affected:build || (yarn install && yarn nx affected:build)
+      # - name: Check formatting
+      #   run: yarn nx format:check
+
+      # - name: Lint affected
+      #   run: yarn nx affected:lint --max-warnings=0
+
+      # - name: Build affected spec
+      #   run: yarn nx affected --target=build-spec
+
+      # - name: Test affected
+      #   run: yarn nx affected:test
+
+      # - name: Build affected
+      #   run: yarn nx affected:build || (yarn install && yarn nx affected:build)
+
    outputs:
      projects: ${{ env.PROJECTS }}
      projects-e2e: ${{ env.PROJECTS_E2E }}
@@ -170,62 +120,39 @@ jobs:
      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
      preview_tools: ${{ env.PREVIEW_TOOLS }}

-  check-e2e-needed:
-    runs-on: ubuntu-latest
-    needs: build-sources
-    name: '(CI) check if e2e needed'
-    outputs:
-      run-tests: ${{ steps.check-test.outputs.e2e-needed }}
-    steps:
-      - name: Check branch
-        id: check-test
-        run: |
-          if [[ "${{ github.base_ref }}" == "develop" ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "main" ]]; then 
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push"  &&  "${{ github.ref_name }}" == *"release/"* ]]; then
-            echo "e2e-needed=true" >> $GITHUB_OUTPUT
-          else
-            echo "e2e-needed=false" >> $GITHUB_OUTPUT
-          fi
-      - name: Print result
-        run: |
-          echo "e2e-needed: ${{ steps.check-test.outputs.e2e-needed }}"
-
-  cypress:
-    needs: [build-sources, check-e2e-needed]
-    name: '(CI) cypress'
-    if: ${{ needs.check-e2e-needed.outputs.run-tests == 'true' }}
-    uses: ./.github/workflows/cypress-run.yml
-    secrets: inherit
-    with:
-      projects: ${{ needs.build-sources.outputs.projects-e2e }}
-      tags: '@smoke'
-
  console-e2e:
-    needs: [build-sources, check-e2e-needed]
+    needs: lint-test-build
    name: '(CI) console python'
    uses: ./.github/workflows/console-test-run.yml
    secrets: inherit
-    if: needs.check-e2e-needed.outputs.run-tests == 'true' && contains(needs.build-sources.outputs.projects, 'trading')
+    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 != '[]' }}
+    uses: ./.github/workflows/cypress-run.yml
+    secrets: inherit
+    with:
+      projects: ${{ needs.lint-test-build.outputs.projects-e2e }}
+      tags: '@smoke'
+
  publish-dist:
-    needs: build-sources
+    needs: lint-test-build
    name: '(CD) publish dist'
    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:
-      projects: ${{ needs.build-sources.outputs.projects }}
+      projects: ${{ needs.lint-test-build.outputs.projects }}

  dist-check:
    runs-on: ubuntu-latest
    needs:
      - publish-dist
-      - build-sources
+      - lint-test-build
    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'
@@ -241,27 +168,27 @@ jobs:
        run: |
          # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
          regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
-          if [[ "${{ needs.build-sources.outputs.preview_governance }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_governance }}"; do
-              echo "waiting for governance preview: ${{ needs.build-sources.outputs.preview_governance }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
+            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.build-sources.outputs.preview_explorer }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_explorer }}"; do
-              echo "waiting for explorer preview: ${{ needs.build-sources.outputs.preview_explorer }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
+            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.build-sources.outputs.preview_trading }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_trading }}"; do
-              echo "waiting for trading preview: ${{ needs.build-sources.outputs.preview_trading }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
+            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.build-sources.outputs.preview_tools }}" =~ $regex ]]; then
-            until curl --insecure --location --fail "${{ needs.build-sources.outputs.preview_tools }}"; do
-              echo "waiting for tools preview: ${{ needs.build-sources.outputs.preview_tools }}"
+          if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then
+            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
@@ -273,10 +200,10 @@ jobs:
          issue-number: ${{ github.event.pull_request.number }}
          body: |
            Previews
-            * governance: ${{ needs.build-sources.outputs.preview_governance }}
-            * explorer: ${{ needs.build-sources.outputs.preview_explorer  }}
-            * trading: ${{ needs.build-sources.outputs.preview_trading }}
-            * tools: ${{ needs.build-sources.outputs.preview_tools }}
+            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
+            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
+            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
+            * tools: ${{ needs.lint-test-build.outputs.preview_tools }}

  # Report single result at the end, to avoid mess with required checks in PR
  cypress-check:
@@ -1,29 +0,0 @@
-# https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#managing-caches
-name: cleanup caches by a branch
-on:
-  pull_request:
-    types:
-      - closed
-jobs:
-  cleanup:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Cleanup
-        run: |
-          gh extension install actions/gh-actions-cache
-
-          echo "Fetching list of cache key"
-          cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 )
-
-          ## Setting this to not fail the workflow while deleting cache keys.
-          set +e
-          echo "Deleting caches..."
-          for cacheKey in $cacheKeysForPR
-          do
-              gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm
-          done
-          echo "Done"
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          REPO: ${{ github.repository }}
-          BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge
@@ -6,37 +6,23 @@ on:
      github-sha:
        required: true
        type: string
-  workflow_dispatch:
-    inputs:
-      console-test-branch:
-        type: choice
-        description: 'main: v0.72.14, develop: v0.73.0-preview7'
-        options:
-          - main
-          - develop

 jobs:
-  create-docker-image:
-    name: Create docker image for console-test
-    runs-on: ubuntu-22.04
+  run-tests:
+    name: run-tests
+    runs-on: 8-cores
    timeout-minutes: 20
    steps:
      #----------------------------------------------
      #       check-out frontend-monorepo
      #----------------------------------------------
-      - name: Checkout frontend-monorepo
+      - name: Checkout console test repo
        uses: actions/checkout@v3
        with:
-          ref: ${{ inputs.github-sha || github.sha }}
+          ref: ${{ inputs.github-sha }}
      #----------------------------------------------
      #       cache node modules
      #----------------------------------------------
-      - name: setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: '16'
-          cache: yarn
-
      - name: Cache node modules
        id: cache
        uses: actions/cache@v3
@@ -47,6 +33,15 @@ jobs:
          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
@@ -55,105 +50,23 @@ jobs:
      #----------------------------------------------
      #       build trading
      #----------------------------------------------
-      - name: Build trading app
+      - name: Build affected spec
        run: |
          yarn env-cmd -f ./apps/trading/.env.stagnet1 yarn nx export trading
-          DIST_LOCATION=dist/apps/trading/exported
-          mv $DIST_LOCATION dist-result
-          tree dist-result
-
      #----------------------------------------------
-      #       export trading app docker image
+      #       run trading server
      #----------------------------------------------
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and export to local Docker
-        id: docker_build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: docker/node-outside-docker.Dockerfile
-          load: true
-          build-args: |
-            APP=trading
-            ENV_NAME=stagnet1
-          tags: ci/trading:local
-          outputs: type=docker,dest=/tmp/console-image.tar
-
-      - name: Verify docker image created
+      - name: Run trading server
        run: |
-          echo ${{ steps.docker_build.outputs.digest }}
-          echo ${{ steps.docker_build.outputs.imageid }}
-
-      - name: Upload docker image for console-test usage
-        uses: actions/upload-artifact@v3
-        with:
-          name: console-image
-          path: /tmp/console-image.tar
-
-  console-test-branch:
-    name: Choose console-test branch to run on
-    runs-on: ubuntu-22.04
-    timeout-minutes: 5
-    outputs:
-      console-branch: ${{ steps.output-step.outputs.branch }}
-    steps:
-      - name: Workflow dispatch input
-        id: dispatch-step
-        if: github.event_name == 'workflow_dispatch'
-        run: echo "branch=${{ inputs.console-test-branch }}" >> $GITHUB_OUTPUT
-
-      - name: Print Workflow dispatch input
-        if: github.event_name == 'workflow_dispatch'
-        run: echo ${{ steps.dispatch-step.outputs.branch }}
-
-      - name: Workflow_call input
-        id: workflow_call-step
-        if: github.event_name != 'workflow_dispatch'
-        run: |
-          if [[ "${{ github.base_ref }}" == "main" ]]; then
-            echo "branch=main" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
-            echo "branch=main" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
-            echo "branch=main" >> $GITHUB_OUTPUT
-          else
-            echo "branch=develop" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Print Workflow_call input
-        if: github.event_name != 'workflow_dispatch'
-        run: echo ${{ steps.workflow_call-step.outputs.branch }}
-
-      - name: Set output
-        id: output-step
-        run: echo "branch=${{ steps.dispatch-step.outputs.branch || steps.workflow_call-step.outputs.branch }}" >> $GITHUB_OUTPUT
-
-      - name: Print final output
-        run: echo ${{ steps.output-step.outputs.branch }}
-
-  run-tests:
-    name: run-tests
-    runs-on: 8-cores
-    needs: [create-docker-image, console-test-branch]
-    timeout-minutes: 20
-    steps:
+          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
      #----------------------------------------------
-      #       load docker image
+      #       check if container persists between runs
      #----------------------------------------------
-      - name: Download docker image from previous job
-        uses: actions/download-artifact@v3
-        with:
-          name: console-image
-          path: /tmp
-
-      - name: Load Docker image
+      - name: Check server
        run: |
-          docker load --input /tmp/console-image.tar
-          docker image ls -a
-
+          docker ps
      #----------------------------------------------
      #       check-out tests repo
      #----------------------------------------------
@@ -161,24 +74,15 @@ jobs:
        uses: actions/checkout@v3
        with:
          repository: vegaprotocol/console-test
-          ref: ${{ needs.console-test-branch.outputs.console-branch }}
-
-      - name: Load console test envs
-        id: console-test-env
-        uses: falti/dotenv-action@v1.0.4
-        with:
-          path: '.env.${{ needs.console-test-branch.outputs.console-branch  }}'
-          export-variables: true
-          keys-case: upper
-          log-variables: true
-
+          path: './console-test'
      #----------------------------------------------
-      #  -----  Setup python  -----
+      #       set-up python
      #----------------------------------------------
-      - name: Setup Python
+      - name: Set up python
+        id: setup-python
        uses: actions/setup-python@v4
        with:
-          python-version: '3.10'
+          python-version: '3.10.11'
      #----------------------------------------------
      #  -----  install & configure poetry  -----
      #----------------------------------------------
@@ -187,29 +91,45 @@ jobs:
        with:
          virtualenvs-create: true
          virtualenvs-in-project: true
-          virtualenvs-path: .venv
-
+          virtualenvs-path: console-test/.venv
      #----------------------------------------------
-      # install python dependencies
+      #       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
-        run: poetry run python -m vega_sim.tools.load_binaries --force --version ${{ env.VEGA_VERSION }}
+        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 --with-deps chromium
+        run: poetry run playwright install
+        working-directory: ./console-test
      #----------------------------------------------
      # run tests
      #----------------------------------------------
      - name: Run tests
-        run: CONSOLE_IMAGE_NAME=ci/trading:local poetry run pytest -v -s --numprocesses 4 --dist loadfile --durations=15
-
+        working-directory: ./console-test
+        run: poetry run pytest -v -s --numprocesses auto --dist loadfile --durations=20
+      - name: Check files
+        run: |
+          ls -al .
+          ls -al console-test
      #----------------------------------------------
      # upload traces
      #----------------------------------------------
@@ -220,13 +140,3 @@ jobs:
          name: playwright-trace
          path: ./traces/
          retention-days: 15
-      #----------------------------------------------
-      #  -----  upload logs  -----
-      #----------------------------------------------
-      - name: Upload worker logs
-        uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: worker-logs
-          path: ./logs/
-          retention-days: 15
@@ -13,35 +13,13 @@ on:
        type: string

 jobs:
-  runner-choice:
-    runs-on: ubuntu-latest
-    outputs:
-      runner: ${{ steps.step.outputs.runner }}
-    steps:
-      - name: Check branch
-        id: step
-        run: |
-          if [[ "${{ github.base_ref }}" == "main" ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.base_ref }}" == "develop" && "${{ github.ref_name }}" == "main" ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          elif [[ "${{ github.event_name }}" == "push" && "${{ github.ref_name }}" == *"release/mainnet"* ]]; then
-            echo "runner=mainnet-compatible-runner" >> $GITHUB_OUTPUT
-          else
-            echo "runner=self-hosted-runner" >> $GITHUB_OUTPUT
-          fi
-
-      - name: Print runner
-        run: echo ${{ steps.step.outputs.runner }}
-
  e2e:
    strategy:
      fail-fast: false
      matrix:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
-    needs: runner-choice
-    runs-on: ${{ needs.runner-choice.outputs.runner }}
+    runs-on: self-hosted-runner
    timeout-minutes: 120
    steps:
      # Checks if skip cache was requested
@@ -59,7 +37,6 @@ jobs:

      # Restore node_modules from cache if possible
      - name: Restore node_modules from cache
-        id: cache-node-modules
        uses: actions/cache@v3
        with:
          path: |
@@ -69,7 +46,6 @@ jobs:

      # Install frontend dependencies
      - name: Install root dependencies
-        if: steps.cache-node-modules.outputs.cache-hit != 'true'
        run: yarn install --frozen-lockfile
        working-directory: frontend-monorepo

@@ -85,14 +61,13 @@ jobs:
      - name: Run Vegacapsule network and Vega wallet
        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        timeout-minutes: 10

      ######
      ## Run some tests
      ######

      - name: Run Cypress tests
-        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --browser chrome --env.grepTags="${{ inputs.tags }}"
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }}  --browser chrome --env.grepTags="${{ inputs.tags }}"
        working-directory: frontend-monorepo
        env:
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
@@ -2,12 +2,7 @@
 name: Verify PR title

 on:
-  pull_request:
-    types:
-      - opened
-      - edited
-      - reopened
-      - synchronize
+  workflow_call:

 jobs:
  lint_pr:
@@ -16,16 +11,21 @@ jobs:
    steps:
      - name: Checkout
        uses: actions/checkout@v3
+        with:
+          ref: ${{ github.event.pull_request.head.sha || github.sha }}

      - name: Setup node
        uses: actions/setup-node@v3
        with:
-          node-version: 16
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn

-      - name: Install dependencies
-        run: |
-          rm package.json 
-          npm install --no-save @commitlint/cli @commitlint/config-conventional @commitlint/config-nx-scopes nx
+      - name: Cache node modules
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}

      - name: Check PR title
        run: echo "${{ github.event.pull_request.title }}" | npx commitlint --config ./commitlint.config-ci.js
@@ -30,18 +30,12 @@ jobs:
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
          echo IS_S3_RELEASE=false >> $GITHUB_ENV
          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
-          echo IS_MAIN_IMAGE=false >> $GITHUB_ENV

      - name: Is dev image
-        if: ${{ github.ref_name == 'develop' && github.event_name == 'push' && matrix.app == 'trading' }}
+        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
        run: |
          echo IS_DEV_IMAGE=true >> $GITHUB_ENV

-      - name: Is main image
-        if: ${{ github.ref_name == 'main' && github.event_name == 'push' && matrix.app == 'trading' }}
-        run: |
-          echo IS_MAIN_IMAGE=true >> $GITHUB_ENV
-
      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
        run: |
@@ -63,7 +57,7 @@ jobs:
          echo IS_IPFS_RELEASE=true >> $GITHUB_ENV

      - name: Is S3 Release
-        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' && github.ref_name != 'main'}}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
        run: |
          echo IS_S3_RELEASE=true >> $GITHUB_ENV

@@ -87,7 +81,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -161,10 +155,10 @@ jobs:
      - name: Sanity check docker image
        run: |
          echo "Check ipfs-hash"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'cat /ipfs-hash'
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'cat /ipfs-hash' > ${{ matrix.app }}-ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local cat /ipfs-hash > ${{ matrix.app }}-ipfs-hash
          echo "List html directory"
-          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local /bin/sh -c 'apk add --update tree; tree /usr/share/nginx/html'
+          docker run --rm ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local sh -c 'apk add --update tree; tree /usr/share/nginx/html'

      - name: Publish dist as docker image (ghcr)
        uses: docker/build-push-action@v3
@@ -185,7 +179,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' || env.IS_MAIN_IMAGE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -195,7 +189,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            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
@@ -222,7 +216,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || env.IS_MAIN_IMAGE == 'true' && 'main' || '' }}
+            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
@@ -335,9 +329,7 @@ jobs:
            fi

            # create commit
-            if ! git diff --cached --exit-code; then
-              commit_msg="Automated hash update from ${{ github.ref }}"
-              git commit -m "$commit_msg"
-              git push -u origin "main"
-            fi
+            commit_msg="Automated hash update from ${{ github.ref }}"
+            git commit -m "$commit_msg"
+            git push -u origin "main"
          )
@@ -2,4 +2,7 @@
 . "$(dirname "$0")/_/husky.sh"

 # Lint commit messages to ensure they follow conventional commit standards
-yarn commitlint --edit "${1}"
+# yarn commitlint --edit "${1}"
+
+# Lint all staged files
+# yarn lint-staged
@@ -2,4 +2,4 @@
 . "$(dirname "$0")/_/husky.sh"

 # Lint all staged files
-yarn lint-staged
+# yarn lint-staged
@@ -2,7 +2,7 @@
 . "$(dirname "$0")/_/husky.sh"

 # Lint all staged files
-yarn nx format:check
+# yarn nx format:check

 # Test all projects with changes
-yarn nx affected -t test --exclude trading
+# yarn nx affected -t test --exclude trading
@@ -1 +1 @@
-16.20.2
+16.15.1
@@ -1,3 +1,2 @@
 * @vegaprotocol/frontend
-* @vegaprotocol/frontend-qa
 *.graphql @vegaprotocol/core
@@ -11,7 +11,7 @@ recalculate-ipfs:
 	echo "ipfs hash inside the image"
 	docker run --rm ${TAG} cat /ipfs-hash
 	echo "recalculating ipfs hash"
-	docker run --rm ${TAG} ipfs add -rQ /usr/share/nginx/html
+	docker run --rm ${TAG} ipfs add -r /usr/share/nginx/html

 .PHONY: eject-ipfs-hash
 unpack:
@@ -113,47 +113,13 @@ In order to run a container on port 3000:
 docker run -p 3000:80 [TAG]
 ```

-On top of that there are two possible scenarios for running docker image - using nginx server (default) of ipfs daemon.
-
-to run ipfs on port 3000:
-
-```bash
-docker run -p 3000:80 [TAG] /run-ipfs.sh
-```
-
-to run nginx on port 3000:
-
-```bash
-docker run -p 3000:80 [TAG]
-```
-
 ## Build instructions

-The [`docker`](./docker) subfolder has some docker configurations for easily setting up your own hosted version of Console either for the web, or ready for pinning on IPFS.
-
-### nx build inside the docker
-
-Using multistage dockerfile dist is compiled using [node](https://hub.docker.com/_/node) image and later packed to nginx as in [dist build](#dist-build). The multistage builds ensures consistent CPU architecture and build toolchains are used so that the result will be identical.
-
-```bash
-docker build --build-arg APP=[YOUR APP] --build-arg NODE_VERSION=16.5.1 --build-arg ENV_NAME=mainnet -t [TAG] -f docker/node-inside-docker.Dockerfile .
-```
-
-### Computing ipfs-hash of the build
-
-At the moment this feature is important only for Console releases.
-
-Each docker build finishes with hash calculation for ` dist`` directory. Resulting hash is added to file named as  `/ipfs-hash`. Once docker image is produced you can run following commad to display ipfs-hash:
-
-```bash
-make recalculate-ipfs TAG=vegaprotocol/trading:{YOUR_VERSION}
-```
-
-**updating hash:** recompiling dist directory (even if there are no changed to source code) results in different hash computed by ipfs command.
+The [`docker`](./docker) subfolder has some docker configurations for easily setting up your own hosted version of console either for the web, or ready for pinning on IPFS

 ### nx build outside the docker

-This Docker image packages a pre-built `dist` folder into an [`nginx`](https://hub.docker.com/_/nginx)([server configuration](./nginx/nginx.conf)) docker image. In this case, the application on docker host machine from source.
+Packaging prepared dist into [`nginx`](https://hub.docker.com/_/nginx)([server configuration](./nginx/nginx.conf)) docker image involves building the application on docker host machine from source.

 As a prerequisite you need to perform build of `dist` directory and move its content for specific application to `dist-result` directory. Use following script to do it with a single command:

@@ -164,21 +130,41 @@ As a prerequisite you need to perform build of `dist` directory and move its con
 You can build any of the containers locally with the following command:

 ```bash
-docker build -f docker/node-outside-docker.Dockerfile . --tag=[TAG]
+docker build --dockerfile docker/node-outside-docker.Dockerfile . --tag=[TAG]
 ```

+### nx build inside the docker
+
+Using multistage dockerfile dist is compiled using [node](https://hub.docker.com/_/node) image and later packed to nginx as in [dist build](#dist-build) example.
+
+```bash
+docker build --build-arg APP=[YOUR APP] --build-arg NODE_VERSION=$(cat .nvmrc) --build-arg ENV_NAME=mainnet -t [TAG] -f docker/node-inside-docker.Dockerfile .
+```
+
+### Computing ipfs-hash of the build
+
+At the moment this feature is important only for `trading` (console) releases.
+
+Each docker build finishes with hash calculation for dist directory. Resulting hash is added to file named as `/ipfs-hash`. Once docker image is produced you can run following commad to display ipfs-hash:
+
+```bash
+make recalculate-ipfs TAG=vegaprotocol/trading:{YOUR_VERSION}
+```
+
+**updating hash:** recompiling dist directory (even if there are no changed to source code) results in different hash computed by ipfs command.
+
 ### Verifying ipfs-hash of existing current application version

 An IPFS CID will be attached to every [release](https://github.com/vegaprotocol/frontend-monorepo/releases). If you are intending to pin an application on IPFS, you can check that your build matches by running the following steps:

-1. Show latest release by running: `make latest-release`. You need to configure [`gh`](https://cli.github.com/) for this step to work, otherwise please provide release manually from [github](https://github.com/vegaprotocol/frontend-monorepo/releases) or [dockerhub](https://hub.docker.com/r/vegaprotocol/trading)
+1. Show latest release by runnning: `make latest-release`. You need to configure [`gh`](https://cli.github.com/) for this step to work, otherwise please provide release manually from [github](https://github.com/vegaprotocol/frontend-monorepo/releases) or [dockerhub](https://hub.docker.com/r/vegaprotocol/trading)
 2. Set RELEASE environment variable to value that you want to validate: `export RELEASE=$(make latest-release)` or `export RELEASE=vXX.XX.XX`
 3. Set TAG environment variable to image that you want to validate: `export TAG=vegaprotocol/trading:$RELEASE`
 4. Download docker image with the desired release `docker pull $TAG`.
 5. Recalculate hash: `make recalculate-ipfs`
 6. You should see exactly same hash produced by ipfs command as one placed with the release notes: `make show-latest-release`
 7. If you want to extract dist from docker image to your local filesystem you can run following command: `make unpack`
-8. Now `dist` directory contains valid application build
+8. Now `dist` directory contains valid application build. **it is not possible to calculate same ipfs hash on files that are result of copy operation**

 ## Config

@@ -16,10 +16,5 @@ NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1

-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=
+CYPRESS_VEGA_URL=http://localhost:3008/graphql
@@ -4,8 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocke
 NX_VEGA_URL=https://api.vega.community/graphql
 NX_VEGA_ENV=MAINNET
 NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -4,7 +4,6 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://lb.testnet.vega.xyz/tm/websocket
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -23,7 +23,6 @@ module.exports = defineConfig({
    viewportWidth: 1440,
    viewportHeight: 900,
    testIsolation: false,
-    experimentalMemoryManagement: true,
  },
  env: {
    environment: 'CUSTOM',
@@ -1,26 +0,0 @@
-{
-  "proposalSubmission": {
-    "rationale": {
-      "title": "Test new asset proposal",
-      "description": "E2E test for proposals"
-    },
-    "terms": {
-      "newAsset": {
-        "changes": {
-          "name": "USDT Coin",
-          "symbol": "USDT",
-          "decimals": "18",
-          "quantum": "1",
-          "erc20": {
-            "contractAddress": "0xb404c51bbc10dcbe948077f18a4b8e553d160084",
-            "withdrawThreshold": "10",
-            "lifetimeLimit": "10"
-          }
-        }
-      },
-      "closingTimestamp": 1724339572,
-      "enactmentTimestamp": 1724339572,
-      "validationTimestamp": 1692799617
-    }
-  }
-}
@@ -1,169 +1,19 @@
-import { createSuccessorMarketProposal } from '../support/governance.functions';
-
-context('Market page', { tags: '@regression' }, function () {
+//Tests set to skip until market bug for capsule checkpoint is fixed
+context.skip('Market page', { tags: '@regression' }, function () {
  describe('Verify elements on page', function () {
-    const marketHeaders = 'markets-heading';
+    const marketHeaders = '[data-testid="markets-header"]';
+    const marketNavigation = 'a[href="/markets"]';

-    before('Create market', function () {
+    it('Markets page is displayed', function () {
      cy.visit('/');
-      cy.createMarket();
+      cy.get(marketNavigation).click();
+      cy.common_validate_blocks_data_displayed(marketHeaders);
    });

-    beforeEach('Get market id', function () {
-      cy.navigate_to('markets');
-      cy.get('[col-id="id"]').last().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.contains('Test market 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');
-      // Liquidity price range
-      cy.validate_element_from_table(
-        'Liquidity Price Range',
-        '95.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');
-      cy.getByTestId('icon-cross').click();
-    });
-
-    // Skipping due to resize observer loop limit error
-    it.skip('Markets page displayed on mobile', function () {
+    it('Markets page displayed on mobile', function () {
      cy.common_switch_to_mobile_and_click_toggle();
-      cy.navigate_to('markets', true);
-      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 for successor market', function () {
-      const successionLineItem = 'succession-line-item';
-      const successionLineMarketId = 'succession-line-item-market-id';
-
-      createSuccessorMarketProposal(this.createdMarketId);
-      cy.navigate_to('markets');
-      cy.reload();
-      cy.contains('Token test market', { timeout: 8000 }).should('be.visible');
-      cy.get('[row-index="0"]')
-        .invoke('attr', 'row-id')
-        .as('successorMarketId');
-      cy.contains('Token test market').click();
-      cy.getByTestId(marketHeaders).should('have.text', 'Token test market');
-      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');
-
-      cy.getByTestId(successionLineItem)
-        .first()
-        .within(() => {
-          cy.contains('Test market 1');
-          cy.getByTestId(successionLineMarketId).should(
-            'have.text',
-            this.createdMarketId
-          );
-        });
-      cy.getByTestId(successionLineItem)
-        .eq(1)
-        .within(() => {
-          cy.contains('Token test market');
-          cy.getByTestId(successionLineMarketId).should(
-            'have.text',
-            this.successorMarketId
-          );
-        });
+      cy.get(marketNavigation).click();
+      cy.common_validate_blocks_data_displayed(marketHeaders);
    });
  });
 });
@@ -1,9 +1,12 @@
 context('Network parameters page', { tags: '@smoke' }, function () {
  before('navigate to network parameter page', function () {
    cy.fixture('net_parameter_format_lookup').as('networkParameterFormat');
-    cy.visit('/network-parameters');
  });
  describe('Verify elements on page', function () {
+    beforeEach(() => {
+      cy.visit('/network-parameters');
+    });
+
    const networkParametersHeader = '[data-testid="network-param-header"]';
    const tableRows = '[data-testid="key-value-table-row"]';

@@ -13,7 +16,6 @@ context('Network parameters page', { tags: '@smoke' }, function () {
        .and('be.visible');
    });

-    // 0006-NETW-021
    it('should list each of the network parameters available', function () {
      cy.get_network_parameters().then((network_parameters) => {
        const numberOfNetworkParametersInSystem =
@@ -196,19 +198,6 @@ context('Network parameters page', { tags: '@smoke' }, function () {
      });
    });

-    // 0006-NETW-022 0006-NETW-023
-    it('governance assets should be correctly grouped', function () {
-      cy.getByTestId('governance')
-        .should('exist')
-        .parent()
-        .should('have.attr', 'href', '/network-parameters#governance');
-      cy.get('[id="governance-proposal-asset"]')
-        .parent()
-        .within(() => {
-          cy.getByTestId('key-value-table-row').should('have.length', 8);
-        });
-    });
-
    it('should be able to see network parameters - on mobile', function () {
      cy.switchToMobile();
      cy.get_network_parameters().then((network_parameters) => {
@@ -40,7 +40,7 @@ context.skip('Node switcher', { tags: '@regression' }, function () {
      const errorTypeTxt = 'Error: invalid url';
      const nodeErrorTxt = 'fakeUrl is not a valid url.';

-      cy.getByTestId('node-url-custom').click({ force: true });
+      cy.getByTestId('node-url-custom').click();

      cy.getByTestId(customNodeBtn).within(() => {
        cy.get('input').clear().type('fakeUrl');
@@ -1,68 +0,0 @@
-context('Oracle page', { tags: '@smoke' }, () => {
-  describe('Verify elements on page', () => {
-    before('create market and navigate to oracle page', () => {
-      cy.createMarket();
-      cy.visit('/oracles');
-    });
-    it('should see oracle data', () => {
-      cy.getByTestId('oracle-details').should('have.length.at.least', 2);
-      cy.getByTestId('oracle-details')
-        .should('exist')
-        .eq(0)
-        .within(() => {
-          cy.get('tr')
-            .eq(0)
-            .within(() => {
-              cy.get('th').should('have.text', 'ID');
-              cy.get('a').invoke('text').should('have.length', 64);
-              cy.get('a')
-                .should('have.attr', 'href')
-                .and('contain', '/oracles/');
-            });
-          cy.get('tr')
-            .eq(1)
-            .within(() => {
-              cy.get('th').should('have.text', 'Type');
-              cy.get('td').should('have.text', 'External data');
-            });
-          cy.get('tr')
-            .eq(2)
-            .within(() => {
-              cy.get('th').should('have.text', 'Signer');
-              cy.getByTestId('keytype').should('have.text', 'Vega');
-              cy.get('a').invoke('text').should('have.length', 64);
-              cy.get('a')
-                .should('have.attr', 'href')
-                .and('contain', '/parties/');
-            });
-          cy.get('tr')
-            .eq(3)
-            .within(() => {
-              cy.get('th').should('have.text', 'Settlement for');
-              cy.get('a').invoke('text').should('have.length', 64);
-              cy.get('a')
-                .should('have.attr', 'href')
-                .and('contain', '/markets/');
-            });
-          cy.get('tr')
-            .eq(4)
-            .within(() => {
-              cy.get('th').should('have.text', 'Matched data');
-              cy.get('td').should('have.text', '❌');
-            });
-          cy.get('details')
-            .eq(0)
-            .within(() => {
-              cy.contains('Filter').click();
-              cy.get('.language-json').should('exist');
-            });
-          cy.get('details')
-            .eq(1)
-            .within(() => {
-              cy.contains('JSON').click();
-              cy.get('.language-json').should('exist');
-            });
-        });
-    });
-  });
-});
@@ -1,93 +0,0 @@
-import { getNewAssetTxBody } from '../support/governance.functions';
-
-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;
-
-    before('Create market proposal', function () {
-      cy.visit('/');
-      cy.createMarket();
-    });
-
-    it('Able to view proposal', function () {
-      const proposalTitle = 'Add Lorem Ipsum market';
-
-      cy.navigate_to('governanceProposals');
-      cy.getByTestId(proposalHeading).should('be.visible');
-      cy.contains(proposalTitle)
-        .parent()
-        .parent()
-        .parent()
-        .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.getByTestId('vote-progress-bar-for')
-            .invoke('attr', 'style')
-            .should('eq', 'width: 100%;');
-          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');
-      cy.getByTestId('icon-cross').click();
-    });
-
-    it.skip('Proposal page displayed on mobile', function () {
-      const proposalTitle = 'Add Lorem Ipsum market';
-
-      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);
-      });
-    });
-
-    it('Able to view new asset proposal', function () {
-      const proposalTitle = 'Test new asset proposal';
-      const newAssetProposalBody = getNewAssetTxBody();
-      cy.VegaWalletSubmitProposal(newAssetProposalBody);
-
-      cy.visit('/');
-      cy.navigate_to('governanceProposals');
-      cy.contains(proposalTitle)
-        .parent()
-        .parent()
-        .parent()
-        .within(() => {
-          cy.get_element_by_col_id('title').should('have.text', proposalTitle);
-          cy.get_element_by_col_id('type').should('have.text', 'NewAsset');
-          cy.get_element_by_col_id('state').should(
-            'have.text',
-            'Waiting for Node Vote'
-          );
-          cy.getByTestId('vote-progress').should('be.visible');
-          cy.getByTestId('vote-progress-bar-against')
-            .invoke('attr', 'style')
-            .should('eq', 'width: 100%;');
-          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();
-        });
-    });
-  });
-});
@@ -40,7 +40,7 @@ context.skip('Transactions page', function () {
            .first()
            .click({ force: true });
        } else {
-          cy.log('Unable to find any transactions on page');
+          cy.slack('Unable to find any transactions on page');
          cy.screenshot();
        }
      });
@@ -78,7 +78,7 @@ context.skip('Transactions page', function () {
              }
            });
        } else {
-          cy.log('Unable to find any transactions on page');
+          cy.slack('Unable to find any transactions on page');
          cy.screenshot();
        }
      });
@@ -7,11 +7,7 @@ context('Validator page', { tags: '@smoke' }, function () {
    it('should be able to see validator tiles', function () {
      cy.getNodes().then((nodes) => {
        nodes.forEach((node) => {
-          if (node.rankingScore.performanceScore > 0) {
-            cy.get(`[validator-id="${node.id}"]`).should('be.visible');
-          } else {
-            cy.get(`[validator-id="${node.id}"]`).should('not.exist');
-          }
+          cy.get(`[validator-id="${node.id}"]`).should('be.visible');
        });
      });
    });
@@ -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="button-menu-drawer"]').click();
+  cy.get('[data-testid="open-menu"]').click();
 });

 Cypress.Commands.add('monitor_clipboard', () => {
@@ -88,49 +88,3 @@ 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);
-  }
-);
-
-Cypress.Commands.add(
-  'validate_proposal_change_type',
-  (tableRowName, changeType) => {
-    cy.contains(tableRowName).siblings().should('have.text', changeType);
-  }
-);
@@ -1,186 +0,0 @@
-import { addSeconds, millisecondsToSeconds } from 'date-fns';
-
-export function createSuccessorMarketProposal(parentMarketId) {
-  cy.VegaWalletSubmitProposal(getSuccessorTxBody(parentMarketId));
-}
-
-function getSuccessorTxBody(parentMarketId) {
-  const MIN_CLOSE_SEC = 500;
-  const MIN_ENACT_SEC = 700;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
-
-  return {
-    proposalSubmission: {
-      rationale: {
-        title: 'Test successor market proposal details',
-        description: 'E2E test for successor market',
-      },
-      terms: {
-        newMarket: {
-          changes: {
-            decimalPlaces: '5',
-            positionDecimalPlaces: '5',
-            linearSlippageFactor: '0.001',
-            quadraticSlippageFactor: '0',
-            instrument: {
-              name: 'Token test market',
-              code: 'TEST.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.01,
-              params: {
-                mu: 0,
-                r: 0.016,
-                sigma: 0.5,
-              },
-            },
-            successor: {
-              parentMarketId: parentMarketId,
-              insurancePoolFraction: '0.75',
-            },
-            liquiditySlaParameters: {
-              priceRange: '0.95',
-              commitmentMinTimeFraction: '0.5',
-              performanceHysteresisEpochs: 2,
-              slaCompetitionFactor: '0.75',
-            },
-          },
-        },
-        closingTimestamp,
-        enactmentTimestamp,
-      },
-    },
-  };
-}
-
-export function getNewAssetTxBody() {
-  const MIN_CLOSE_SEC = 500;
-  const MIN_ENACT_SEC = 700;
-  const MIN_VALID_SEC = 60;
-
-  const closingDate = addSeconds(new Date(), MIN_CLOSE_SEC);
-  const enactmentDate = addSeconds(closingDate, MIN_ENACT_SEC);
-  const validationDate = addSeconds(new Date(), MIN_VALID_SEC);
-
-  const closingTimestamp = millisecondsToSeconds(closingDate.getTime());
-  const enactmentTimestamp = millisecondsToSeconds(enactmentDate.getTime());
-  const validationTimestamp = millisecondsToSeconds(validationDate.getTime());
-
-  return {
-    proposalSubmission: {
-      rationale: {
-        title: 'Test new asset proposal',
-        description: 'E2E test for proposals',
-      },
-      terms: {
-        newAsset: {
-          changes: {
-            name: 'USDT Coin',
-            symbol: 'USDT',
-            decimals: '18',
-            quantum: '1',
-            erc20: {
-              contractAddress: '0xb404c51bbc10dcbe948077f18a4b8e553d160084',
-              withdrawThreshold: '10',
-              lifetimeLimit: '10',
-            },
-          },
-        },
-        closingTimestamp,
-        enactmentTimestamp,
-        validationTimestamp,
-      },
-    },
-  };
-}
@@ -1,12 +1,10 @@
 # App configuration variables
+NX_TENDERMINT_URL=http://localhost:26617
+NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_ENV=CUSTOM
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
 NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json

 # App flags
 NX_EXPLORER_TXS_LIST=0
-
-NX_TENDERMINT_URL=http://localhost:26617
-NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
@@ -1,4 +1,6 @@
 # App configuration variables
+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
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
@@ -8,7 +10,3 @@ NX_VEGA_URL=https://api.devnet1.vega.xyz/graphql
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
@@ -1,4 +1,6 @@
 # App configuration variables
+NX_TENDERMINT_URL=https://be.vega.community
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
 NX_SENTRY_DSN=https://b3a56b03eda842faad731f3ea9dfd1bc@o286262.ingest.sentry.io/6242427
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks/master/mainnet1/mainnet1.toml
 NX_VEGA_URL=https://api.vega.community/graphql
@@ -9,7 +11,3 @@ NX_VEGA_GOVERNANCE_URL=https://governance.vega.xyz
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/mainnet/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz/
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-NX_TENDERMINT_URL=https://be.vega.community
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.vega.community/websocket
@@ -1,15 +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_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
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-NX_TENDERMINT_URL=https://be.mainnet-mirror.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.mainnet-mirror.vega.rocks/websocket
+NX_VEGA_CONSOLE_URL=https://console.mainnet-mirror.vega.rocks
@@ -1,3 +1,2 @@
 # .env is stagnet1, so there are no overrides required
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz","STAGNET1":"https://stagnet1.explorer.vega.xyz"}'
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
@@ -1,5 +1,7 @@
 # App configuration variables
+NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/fairground/vegawallet-fairground.toml
 NX_VEGA_ENV=TESTNET
 NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
@@ -9,7 +11,3 @@ NX_VEGA_GOVERNANCE_URL=https://governance.fairground.wtf
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_CONSOLE_URL=https://console.fairground.wtf
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.testnet.vega.xyz/websocket
@@ -7,11 +7,9 @@ NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/fairground/announcements.json

+NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
 NX_BLOCK_EXPLORER=https://be.validators-testnet.vega.rocks/rest
+NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
 NX_VEGA_GOVERNANCE_URL=https://governance.validators-testnet.vega.rocks
 NX_VEGA_EXPLORER_URL=https://explorer.validators-testnet.vega.rocks/
 NX_VEGA_CONSOLE_URL=https://trading.validators-testnet.vega.rocks/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
-
-NX_TENDERMINT_URL=https://tm.be.validators-testnet.vega.rocks
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.validators-testnet.vega.xyz/websocket
@@ -5,5 +5,4 @@ NX_VEGA_ENV=CUSTOM
 NX_BLOCK_EXPLORER=
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/announcements/test/announcements.json
-NX_VEGA_EXPLORER_URL=/
-NX_ORACLE_PROOFS_URL=https://raw.githubusercontent.com/vegaprotocol/well-known/main/__generated__/oracle-proofs.json
+NX_VEGA_EXPLORER_URL=/
@@ -77,7 +77,7 @@
      "executor": "nx:run-commands",
      "options": {
        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.72.3/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"
        ]
      }
    },
@@ -4,7 +4,7 @@ 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 { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type { VegaICellRendererParams } from '@vegaprotocol/datagrid';
 import { useRef, useLayoutEffect } from 'react';
 import { BREAKPOINT_MD } from '../../config/breakpoints';
@@ -23,7 +23,7 @@ export const Footer = () => {
  );

  return (
-    <footer className="grid grid-cols-[1fr_auto] items-center text-xs md:text-md lg:flex md:col-span-2 px-4 pt-2 pb-3 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
+    <footer className="grid grid-rows-2 lg:grid-cols-[1fr_auto] text-xs md:text-md lg:flex md:col-span-2 px-4 py-2 gap-4 border-t border-vega-light-200 dark:border-vega-dark-200">
      <div className="flex justify-between gap-2 align-middle">
        {GIT_COMMIT_HASH && (
          <div className="content-center flex border-r border-neutral-700 dark:border-neutral-300 pr-4">
@@ -43,12 +43,9 @@ export const Footer = () => {
          </div>
        )}

-        <div className="content-center flex pr-4 md:border-r border-neutral-700 dark:border-neutral-300">
-          <span className="pr-2">{VEGA_URL && <NodeUrl url={VEGA_URL} />}</span>
-          <Link
-            className="ml-2 underline-offset-4"
-            onClick={() => setNodeSwitcherOpen(true)}
-          >
+        <div className="content-center flex pl-2 md:border-r border-neutral-700 dark:border-neutral-300 pr-4">
+          {VEGA_URL && <NodeUrl url={VEGA_URL} />}
+          <Link className="ml-2" onClick={() => setNodeSwitcherOpen(true)}>
            {t('Change')}
          </Link>
        </div>
@@ -62,10 +59,7 @@ export const Footer = () => {
        ) : null}
      </div>
      <div className="pl-2 align-center lg:align-right lg:flex lg:justify-end gap-2 align-middle lg:max-w-xs lg:ml-auto">
-        <RouteLink
-          to={`/${Routes.DISCLAIMER}`}
-          className="underline underline-offset-4"
-        >
+        <RouteLink to={`/${Routes.DISCLAIMER}`} className="underline">
          Disclaimer
        </RouteLink>
      </div>
@@ -95,10 +95,7 @@ export const Header = () => {
        {mainItems.map(routeToNavigationItem)}
        {groupedItems && groupedItems.length > 0 && (
          <NavigationItem>
-            <NavigationTrigger
-              isActive={Boolean(isOnOther)}
-              data-testid="other"
-            >
+            <NavigationTrigger isActive={Boolean(isOnOther)}>
              {t('Other')}
            </NavigationTrigger>
            <NavigationContent>
@@ -13,12 +13,6 @@ query ExplorerMarket($id: ID!) {
              decimals
            }
          }
-          ... on Perpetual {
-            quoteName
-            settlementAsset {
-              decimals
-            }
-          }
        }
      }
    }
@@ -8,7 +8,7 @@ export type ExplorerMarketQueryVariables = Types.Exact<{
 }>;


-export type ExplorerMarketQuery = { __typename?: 'Query', 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, settlementAsset: { __typename?: 'Asset', decimals: number } } | { __typename?: 'Perpetual', quoteName: string, settlementAsset: { __typename?: 'Asset', decimals: number } } | { __typename?: 'Spot' } } } } | null };
+export type ExplorerMarketQuery = { __typename?: 'Query', 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, settlementAsset: { __typename?: 'Asset', decimals: number } } } } } | null };


 export const ExplorerMarketDocument = gql`
@@ -27,12 +27,6 @@ export const ExplorerMarketDocument = gql`
              decimals
            }
          }
-          ... on Perpetual {
-            quoteName
-            settlementAsset {
-              decimals
-            }
-          }
        }
      }
    }
@@ -61,7 +61,6 @@ describe('Market link component', () => {
              instrument: {
                name: 'test-label',
                product: {
-                  __typename: 'Future',
                  quoteName: 'dai',
                },
              },
@@ -1,41 +1,34 @@
 import { t } from '@vegaprotocol/i18n';
 import type { MarketInfoWithData } from '@vegaprotocol/markets';
-import {
-  LiquidityPriceRangeInfoPanel,
-  LiquiditySLAParametersInfoPanel,
-  MarginScalingFactorsPanel,
-  PriceMonitoringBoundsInfoPanel,
-  SuccessionLineInfoPanel,
-  getDataSourceSpecForSettlementData,
-  getDataSourceSpecForTradingTermination,
-} from '@vegaprotocol/markets';
+import { PriceMonitoringBoundsInfoPanel } from '@vegaprotocol/markets';
 import {
  LiquidityInfoPanel,
  LiquidityMonitoringParametersInfoPanel,
  InstrumentInfoPanel,
  KeyDetailsInfoPanel,
+  LiquidityPriceRangeInfoPanel,
  MetadataInfoPanel,
  OracleInfoPanel,
  RiskFactorsInfoPanel,
  RiskModelInfoPanel,
+  RiskParametersInfoPanel,
  SettlementAssetInfoPanel,
 } from '@vegaprotocol/markets';
 import { MarketInfoTable } from '@vegaprotocol/markets';
-import type { DataSourceFragment } from '@vegaprotocol/markets';
+import type { DataSourceDefinition } from '@vegaprotocol/types';
 import isEqual from 'lodash/isEqual';

 export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
  if (!market) return null;
-  const { product } = market.tradableInstrument.instrument;
-  const settlementDataSource = getDataSourceSpecForSettlementData(product);
-  const terminationDataSource = getDataSourceSpecForTradingTermination(product);

-  const getSigners = ({ data }: DataSourceFragment) => {
+  const settlementData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForSettlementData.data as DataSourceDefinition;
+  const terminationData = market.tradableInstrument.instrument.product
+    .dataSourceSpecForTradingTermination.data as DataSourceDefinition;
+
+  const getSigners = (data: DataSourceDefinition) => {
    if (data.sourceType.__typename === 'DataSourceDefinitionExternal') {
-      const signers =
-        ('signers' in data.sourceType.sourceType &&
-          data.sourceType.sourceType.signers) ||
-        [];
+      const signers = data.sourceType.sourceType.signers || [];

      return signers.map(({ signer }, i) => {
        return (
@@ -47,13 +40,10 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
    return [];
  };

-  const showTwoOracles =
-    settlementDataSource &&
-    terminationDataSource &&
-    isEqual(
-      getSigners(settlementDataSource),
-      getSigners(terminationDataSource)
-    );
+  const showTwoOracles = isEqual(
+    getSigners(settlementData),
+    getSigners(terminationData)
+  );

  const headerClassName = 'font-alpha calt text-xl mt-4 border-b-2 pb-2';

@@ -69,8 +59,8 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
      <MetadataInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Risk model')}</h2>
      <RiskModelInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Margin scaling factors')}</h2>
-      <MarginScalingFactorsPanel market={market} />
+      <h2 className={headerClassName}>{t('Risk parameters')}</h2>
+      <RiskParametersInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Risk factors')}</h2>
      <RiskFactorsInfoPanel market={market} />
      {(market.data?.priceMonitoringBounds || []).map((trigger, i) => (
@@ -96,12 +86,10 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
      )}
      <h2 className={headerClassName}>{t('Liquidity monitoring')}</h2>
      <LiquidityMonitoringParametersInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
-      <LiquidityPriceRangeInfoPanel market={market} />
-      <h2 className={headerClassName}>{t('Liquidity SLA protocol')}</h2>
-      <LiquiditySLAParametersInfoPanel market={market} />
      <h2 className={headerClassName}>{t('Liquidity')}</h2>
      <LiquidityInfoPanel market={market} />
+      <h2 className={headerClassName}>{t('Liquidity price range')}</h2>
+      <LiquidityPriceRangeInfoPanel market={market} />
      {showTwoOracles ? (
        <>
          <h2 className={headerClassName}>{t('Settlement oracle')}</h2>
@@ -115,8 +103,6 @@ export const MarketDetails = ({ market }: { market: MarketInfoWithData }) => {
          <OracleInfoPanel market={market} type="settlementData" />
        </>
      )}
-      <h2 className={`${headerClassName} mb-4`}>{t('Succession line')}</h2>
-      <SuccessionLineInfoPanel market={market} />
    </div>
  );
 };
@@ -1,10 +1,10 @@
 import { useMemo } from 'react';
-import { getAsset, type MarketFieldsFragment } from '@vegaprotocol/markets';
+import type { MarketFieldsFragment } from '@vegaprotocol/markets';
 import { t } from '@vegaprotocol/i18n';
 import { ButtonLink } from '@vegaprotocol/ui-toolkit';
 import type { AgGridReact } from 'ag-grid-react';
 import type { ColDef } from 'ag-grid-community';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueGetterParams,
@@ -73,7 +73,8 @@ export const MarketsTable = ({ data }: MarketsTableProps) => {
          MarketFieldsFragment,
          'tradableInstrument.instrument.product.settlementAsset.symbol'
        >) => {
-          const value = data && getAsset(data);
+          const value =
+            data?.tradableInstrument.instrument.product.settlementAsset;
          return value ? (
            <ButtonLink
              onClick={(e) => {
@@ -31,9 +31,6 @@ fragment ExplorerDeterministicOrderFields on Order {
          ... on Future {
            quoteName
          }
-          ... on Perpetual {
-            quoteName
-          }
        }
      }
    }
@@ -1,25 +0,0 @@
-fragment ExplorerStopOrderFields on StopOrder {
-  id
-  status
-  createdAt
-  trigger {
-    ... on StopOrderPrice {
-      price
-    }
-    ... on StopOrderTrailingPercentOffset {
-      trailingPercentOffset
-    }
-  }
-  createdAt
-  ocoLinkId
-  triggerDirection
-  order {
-    id
-  }
-}
-
-query ExplorerStopOrder($stopOrderId: ID!) {
-  stopOrder(id: $stopOrderId) {
-    ...ExplorerStopOrderFields
-  }
-}
@@ -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, 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 } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } };
+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, 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 } | { __typename?: 'Perpetual', quoteName: string } | { __typename?: 'Spot' } } } } } };
+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 {
@@ -47,9 +47,6 @@ export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
          ... on Future {
            quoteName
          }
-          ... on Perpetual {
-            quoteName
-          }
        }
      }
    }
@@ -1,70 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerStopOrderFieldsFragment = { __typename?: 'StopOrder', id: string, status: Types.StopOrderStatus, createdAt: any, ocoLinkId?: string | null, triggerDirection: Types.StopOrderTriggerDirection, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, order?: { __typename?: 'Order', id: string } | null };
-
-export type ExplorerStopOrderQueryVariables = Types.Exact<{
-  stopOrderId: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerStopOrderQuery = { __typename?: 'Query', stopOrder?: { __typename?: 'StopOrder', id: string, status: Types.StopOrderStatus, createdAt: any, ocoLinkId?: string | null, triggerDirection: Types.StopOrderTriggerDirection, trigger: { __typename?: 'StopOrderPrice', price: string } | { __typename?: 'StopOrderTrailingPercentOffset', trailingPercentOffset: string }, order?: { __typename?: 'Order', id: string } | null } | null };
-
-export const ExplorerStopOrderFieldsFragmentDoc = gql`
-    fragment ExplorerStopOrderFields on StopOrder {
-  id
-  status
-  createdAt
-  trigger {
-    ... on StopOrderPrice {
-      price
-    }
-    ... on StopOrderTrailingPercentOffset {
-      trailingPercentOffset
-    }
-  }
-  createdAt
-  ocoLinkId
-  triggerDirection
-  order {
-    id
-  }
-}
-    `;
-export const ExplorerStopOrderDocument = gql`
-    query ExplorerStopOrder($stopOrderId: ID!) {
-  stopOrder(id: $stopOrderId) {
-    ...ExplorerStopOrderFields
-  }
-}
-    ${ExplorerStopOrderFieldsFragmentDoc}`;
-
-/**
- * __useExplorerStopOrderQuery__
- *
- * To run a query within a React component, call `useExplorerStopOrderQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerStopOrderQuery` 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 } = useExplorerStopOrderQuery({
- *   variables: {
- *      stopOrderId: // value for 'stopOrderId'
- *   },
- * });
- */
-export function useExplorerStopOrderQuery(baseOptions: Apollo.QueryHookOptions<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>(ExplorerStopOrderDocument, options);
-      }
-export function useExplorerStopOrderLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>(ExplorerStopOrderDocument, options);
-        }
-export type ExplorerStopOrderQueryHookResult = ReturnType<typeof useExplorerStopOrderQuery>;
-export type ExplorerStopOrderLazyQueryHookResult = ReturnType<typeof useExplorerStopOrderLazyQuery>;
-export type ExplorerStopOrderQueryResult = Apollo.QueryResult<ExplorerStopOrderQuery, ExplorerStopOrderQueryVariables>;
@@ -150,7 +150,6 @@ function renderExistingAmend(
              instrument: {
                name: 'test-label',
                product: {
-                  __typename: 'Future',
                  quoteName: 'dai',
                },
              },
@@ -33,7 +33,7 @@ describe('Order TX Summary component', () => {
    expect(res.queryByTestId('order-summary')).not.toBeInTheDocument();
  });

-  it('Renders "Market Price" if the order passed lacks a price', () => {
+  it('Renders nothing if the order passed lacks a price', () => {
    const o: Order = {
      marketId: '123',
      side: 'SIDE_BUY',
@@ -41,7 +41,7 @@ describe('Order TX Summary component', () => {
      size: '10',
    };
    const res = renderComponent(o);
-    expect(res.queryByText('Market Price')).toBeInTheDocument();
+    expect(res.queryByTestId('order-summary')).not.toBeInTheDocument();
  });

  it('Renders nothing if the order has an unspecified side', () => {
@@ -3,7 +3,6 @@ import type { components } from '../../../types/explorer';
 import PriceInMarket from '../price-in-market/price-in-market';
 import { sideText } from '../order-details/lib/order-labels';
 import SizeInMarket from '../size-in-market/size-in-market';
-import { t } from '@vegaprotocol/i18n';

 export type OrderSummaryProps = {
  order: components['schemas']['v1OrderSubmission'];
@@ -21,6 +20,7 @@ const OrderTxSummary = ({ order }: OrderSummaryProps) => {
  if (
    !order ||
    !order.marketId ||
+    !order.price ||
    !order.side ||
    order.side === 'SIDE_UNSPECIFIED'
  ) {
@@ -36,14 +36,10 @@ const OrderTxSummary = ({ order }: OrderSummaryProps) => {
        '-'
      )}
      &nbsp;<i className="text-xs">@</i>&nbsp;
-      {order.price ? (
-        <PriceInMarket
-          marketId={order.marketId}
-          price={order.price}
-        ></PriceInMarket>
-      ) : (
-        t('Market Price')
-      )}
+      <PriceInMarket
+        marketId={order.marketId}
+        price={order.price}
+      ></PriceInMarket>
    </div>
  );
 };
@@ -33,8 +33,6 @@ const PriceInMarket = ({
      label = addDecimalsFormatNumber(price, data.market.decimalPlaces);
    } else if (
      decimalSource === 'SETTLEMENT_ASSET' &&
-      data.market &&
-      'settlementAsset' in data.market.tradableInstrument.instrument.product &&
      data.market?.tradableInstrument.instrument.product.settlementAsset
    ) {
      label = addDecimalsFormatNumber(
@@ -2,7 +2,7 @@ import type { ProposalListFieldsFragment } from '@vegaprotocol/proposals';
 import { VoteProgress } from '@vegaprotocol/proposals';
 import type { AgGridReact } from 'ag-grid-react';
 import { ExternalLink } from '@vegaprotocol/ui-toolkit';
-import { AgGrid } from '@vegaprotocol/datagrid';
+import { AgGridLazy as AgGrid } from '@vegaprotocol/datagrid';
 import type {
  VegaICellRendererParams,
  VegaValueFormatterParams,
@@ -33,7 +33,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
  const { params } = useNetworkParams([
    NetworkParams.governance_proposal_market_requiredMajority,
  ]);
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);
  const requiredMajorityPercentage = useMemo(() => {
    const requiredMajority =
      params?.governance_proposal_market_requiredMajority ?? 1;
@@ -105,7 +105,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
              ? new BigNumber(0)
              : yesTokens.multipliedBy(100).dividedBy(totalTokensVoted);
            return (
-              <div className="flex items-center justify-center h-full pt-2 uppercase">
+              <div className="uppercase flex h-full items-center justify-center pt-2">
                <VoteProgress
                  threshold={requiredMajorityPercentage}
                  progress={yesPercentage}
@@ -137,7 +137,7 @@ export const ProposalsTable = ({ data }: ProposalsTableProps) => {
        hide: window.innerWidth <= BREAKPOINT_MD,
        headerName: t('Enactment date'),
        field: 'terms.enactmentDatetime',
-        valueFormatter: ({
+        valueFormatte: ({
          value,
        }: VegaValueFormatterParams<
          ProposalListFieldsFragment,
@@ -1,139 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { components } from '../../../../../types/explorer';
-import { formatNumberPercentage } from '@vegaprotocol/utils';
-import BigNumber from 'bignumber.js';
-import PriceInMarket from '../../../price-in-market/price-in-market';
-import StopOrderTriggerSummary from './stop-order-trigger';
-import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import fromUnixTime from 'date-fns/fromUnixTime';
-
-const wrapperClasses =
-  'flex-1 max-w-xs items-center border border-vega-light-200 dark:border-vega-dark-150 rounded-md pv-2 ph-5 mb-5';
-
-export type StopOrderType = 'RisesAbove' | 'FallsBelow' | 'OCO';
-type V1OrderSetup = components['schemas']['v1StopOrderSetup'];
-
-interface StopOrderSetupProps extends V1OrderSetup {
-  type: StopOrderType;
-  deterministicId: string;
-}
-
-export function getExpiryTypeLabel(
-  expiryStrategy: V1OrderSetup['expiryStrategy']
-): string {
-  switch (expiryStrategy) {
-    case 'EXPIRY_STRATEGY_CANCELS':
-      return t('Cancels');
-    case 'EXPIRY_STRATEGY_SUBMIT':
-      return t('Submit');
-  }
-
-  return expiryStrategy || t('Unknown');
-}
-
-export interface ExpiryTriggerProps {
-  trailingPercentOffset?: string;
-  price?: string;
-  marketId?: string;
-}
-
-export function ExpiryTrigger({
-  trailingPercentOffset,
-  price,
-  marketId,
-}: ExpiryTriggerProps) {
-  if (price && marketId) {
-    return <PriceInMarket price={price} marketId={marketId} />;
-  }
-  if (trailingPercentOffset) {
-    return (
-      <span>
-        {formatNumberPercentage(new BigNumber(trailingPercentOffset))}{' '}
-        (trailing)
-      </span>
-    );
-  }
-
-  return null;
-}
-
-export function getMovePrefix(
-  type: StopOrderType,
-  trailingPercentOffset?: string
-): string {
-  if (type === 'RisesAbove') {
-    if (trailingPercentOffset) {
-      return '+';
-    } else {
-      return '>';
-    }
-  } else {
-    if (trailingPercentOffset) {
-      return '-';
-    } else {
-      return '<';
-    }
-  }
-}
-
-export const TypeLabel = {
-  RisesAbove: t('Rises above ↗'),
-  FallsBelow: t('Falls below ↘'),
-  OCO: '',
-};
-
-/**
- */
-export const StopOrderSetup = ({
-  type,
-  price,
-  orderSubmission,
-  expiresAt,
-  expiryStrategy,
-  trailingPercentOffset,
-  deterministicId,
-}: StopOrderSetupProps) => {
-  let d = 'Unknown';
-  try {
-    d = expiresAt
-      ? fromUnixTime(parseInt(expiresAt) / 1000000000).toLocaleString()
-      : t('Unknown');
-  } catch (e) {
-    d = t('Unknown');
-  }
-
-  return (
-    <div className={wrapperClasses}>
-      <div className="mb-12 lg:mb-0">
-        <div className="bg-slate-100 text-slate-900 px-6 py-2 md:px-6 flex">
-          <div className="flex-1">
-            <strong className="font-bold mb-1">{TypeLabel[type]} </strong>
-            <p className=" font-xs mb-0">
-              {getMovePrefix(type, trailingPercentOffset)}
-              <ExpiryTrigger
-                trailingPercentOffset={trailingPercentOffset}
-                price={price}
-                marketId={orderSubmission?.marketId}
-              />
-            </p>
-          </div>
-
-          {expiresAt && expiryStrategy ? (
-            <div className="flex-1">
-              <strong className="font-bold mb-1">{t('Expiry Type')}</strong>
-              <p className=" font-xs mb-0">
-                <Tooltip description={<span>{d}</span>}>
-                  <span>{getExpiryTypeLabel(expiryStrategy)}</span>
-                </Tooltip>
-              </p>
-            </div>
-          ) : null}
-        </div>
-        <StopOrderTriggerSummary
-          id={deterministicId}
-          orderSubmission={orderSubmission}
-        />
-      </div>
-    </div>
-  );
-};
@@ -1,108 +0,0 @@
-import { StopOrderStatus } from '@vegaprotocol/types';
-import { useExplorerStopOrderQuery } from '../../../order-details/__generated__/StopOrder';
-import type { ExplorerStopOrderQuery } from '../../../order-details/__generated__/StopOrder';
-import { t } from '@vegaprotocol/i18n';
-import { Icon } from '@vegaprotocol/ui-toolkit';
-import type { IconName } from '@vegaprotocol/ui-toolkit';
-import OrderTxSummary from '../../../order-summary/order-tx-summary';
-import type { components } from '../../../../../types/explorer';
-import type { ApolloError } from '@apollo/client';
-
-export const StatusLabel: Record<StopOrderStatus, string> = {
-  [StopOrderStatus.STATUS_CANCELLED]: t('Cancelled'),
-  [StopOrderStatus.STATUS_EXPIRED]: t('Expired'),
-  [StopOrderStatus.STATUS_PENDING]: t('Pending'),
-  [StopOrderStatus.STATUS_REJECTED]: t('Rejected'),
-  [StopOrderStatus.STATUS_STOPPED]: t('Stopped'),
-  [StopOrderStatus.STATUS_TRIGGERED]: t('Triggered'),
-  [StopOrderStatus.STATUS_UNSPECIFIED]: t('Status unknown'),
-};
-
-export const StatusIcon: Record<StopOrderStatus, IconName> = {
-  [StopOrderStatus.STATUS_CANCELLED]: 'disable',
-  [StopOrderStatus.STATUS_EXPIRED]: 'outdated',
-  [StopOrderStatus.STATUS_PENDING]: 'circle',
-  [StopOrderStatus.STATUS_REJECTED]: 'cross',
-  [StopOrderStatus.STATUS_STOPPED]: 'stop',
-  [StopOrderStatus.STATUS_TRIGGERED]: 'tick',
-  [StopOrderStatus.STATUS_UNSPECIFIED]: 'help',
-};
-
-export const StatusMidColor: Record<StopOrderStatus, string> = {
-  [StopOrderStatus.STATUS_CANCELLED]: 'bg-red-100 text-red-900',
-  [StopOrderStatus.STATUS_EXPIRED]: 'bg-red-100 text-red-900',
-  [StopOrderStatus.STATUS_PENDING]: 'bg-yellow-100 text-yellow-900',
-  [StopOrderStatus.STATUS_REJECTED]: 'bg-red-100 text-red-900',
-  [StopOrderStatus.STATUS_STOPPED]: 'bg-red-100 text-red-900',
-  [StopOrderStatus.STATUS_TRIGGERED]: 'bg-green-100 text-green-900',
-  [StopOrderStatus.STATUS_UNSPECIFIED]: 'bg-yellow-100 text-yellow-900',
-};
-
-export const StatusBottomColor: Record<StopOrderStatus, string> = {
-  [StopOrderStatus.STATUS_CANCELLED]: 'bg-red-50 text-red-900 line-through',
-  [StopOrderStatus.STATUS_EXPIRED]: 'bg-red-50 text-red-900 line-through',
-  [StopOrderStatus.STATUS_PENDING]: 'bg-yellow-50 text-yellow-900',
-  [StopOrderStatus.STATUS_REJECTED]: 'bg-red-50 text-red-900 line-through',
-  [StopOrderStatus.STATUS_STOPPED]: 'bg-red-50 text-red-900 line-through',
-  [StopOrderStatus.STATUS_TRIGGERED]: 'bg-green-50 text-green-900',
-  [StopOrderStatus.STATUS_UNSPECIFIED]:
-    'bg-yellow-50 text-yellow-900 line-through',
-};
-
-export function getStopOrderTriggerStatus(
-  data?: ExplorerStopOrderQuery,
-  error?: ApolloError
-) {
-  if (data && data.stopOrder) {
-    return data.stopOrder.status;
-  }
-
-  return StopOrderStatus.STATUS_UNSPECIFIED;
-}
-
-export interface StopOrderTriggerSummaryProps {
-  id: string;
-  orderSubmission?: components['schemas']['v1OrderSubmission'];
-}
-
-/**
- */
-const StopOrderTriggerSummary = ({
-  id,
-  orderSubmission,
-}: StopOrderTriggerSummaryProps) => {
-  const { data, error } = useExplorerStopOrderQuery({
-    variables: { stopOrderId: id },
-  });
-
-  const status = getStopOrderTriggerStatus(data, error);
-
-  return (
-    <>
-      <div
-        className={`${StatusMidColor[status]} px-3 py-2 md:px-6 flex space-x-4`}
-      >
-        <p className="m-0 p-0 align-top">
-          <Icon
-            size={6}
-            name={StatusIcon[status]}
-            className="inline-block mr-2"
-          />
-          <span className="align-top">{StatusLabel[status]}</span>
-        </p>
-      </div>
-
-      <div
-        className={`${StatusBottomColor[status]} px-3 py-2 md:px-6 flex space-x-4`}
-      >
-        {orderSubmission && (
-          <p className="text-vega-grey-400 strike">
-            <OrderTxSummary order={orderSubmission} />
-          </p>
-        )}
-      </div>
-    </>
-  );
-};
-
-export default StopOrderTriggerSummary;
@@ -1,68 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { components } from '../../../../../types/explorer';
-import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import SizeInMarket from '../../../size-in-market/size-in-market';
-
-export interface TxDetailsOrderIcebergDetailsProps {
-  iceberg: components['schemas']['v1IcebergOpts'];
-  size: components['schemas']['v1OrderSubmission']['size'];
-  marketId?: string;
-}
-
-/**
-
-.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,
-  marketId,
-}: 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">
-          {marketId ? (
-            <SizeInMarket
-              size={iceberg.minimumVisibleSize}
-              marketId={marketId}
-            />
-          ) : (
-            iceberg.minimumVisibleSize
-          )}
-        </span>
-      </Tooltip>
-      <Tooltip description={t('Iceberg: Total size')}>
-        <span className="text-sm text-vega-blue-600 mx-3">
-          {marketId ? <SizeInMarket size={size} marketId={marketId} /> : size}
-        </span>
-      </Tooltip>
-      <Tooltip description={t('Iceberg: Visible peak')}>
-        <span className="align-top text-vega-yellow-600">
-          {marketId ? (
-            <SizeInMarket size={iceberg.peakSize} marketId={marketId} />
-          ) : (
-            iceberg.peakSize
-          )}
-        </span>
-      </Tooltip>
-    </div>
-  );
-};
@@ -35,7 +35,7 @@ export const BundleSigners = ({
  tx,
  id,
 }: BundleSignersProps) => {
-  const tokenLink = useLinks(DApp.Governance);
+  const tokenLink = useLinks(DApp.Token);

  const bridgeFunction: BridgeFunction =
    tx?.changes?.erc20 && 'contractAddress' in tx.changes.erc20
@@ -26,11 +26,6 @@ export const sharedHeaderProps = {
  className: 'align-top',
 };

-const Labels: Record<BlockExplorerTransactionResult['type'], string> = {
-  'Stop Orders Submission': 'Stop Order',
-  'Stop Orders Cancellation': 'Cancel Stop Order',
-};
-
 /**
 * These rows are shown for every transaction type, providing a consistent set of rows for the top
 * of a transaction details row. The order is relatively arbitrary but felt right - it might need to
@@ -49,14 +44,12 @@ export const TxDetailsShared = ({
  const time: string = blockData?.result.block.header.time || '';
  const height: string = blockData?.result.block.header.height || txData.block;

-  const type = Labels[txData.type] || txData.type;
-
  return (
    <>
      {hideTypeRow === false ? (
        <TableRow modifier="bordered">
          <TableCell {...sharedHeaderProps}>{t('Type')}</TableCell>
-          <TableCell>{type}</TableCell>
+          <TableCell>{txData.type}</TableCell>
        </TableRow>
      ) : null}
      <TableRow modifier="bordered">
@@ -31,8 +31,6 @@ const AccountType: Record<AccountTypes, string> = {
  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: 'LP Received Fees',
  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: 'Market Proposers',
  ACCOUNT_TYPE_HOLDING: 'Holding',
-  ACCOUNT_TYPE_LIQUIDITY_FEES_BONUS_DISTRIBUTION: 'Bonus Distribution',
-  ACCOUNT_TYPE_LP_LIQUIDITY_FEES: 'LP Liquidity Fees',
 };

 interface TransferParticipantsProps {
@@ -11,7 +11,6 @@ import { TxDetailsBatch } from './tx-batch';
 import { TxDetailsChainEvent } from './tx-chain-event';
 import { TxDetailsNodeVote } from './tx-node-vote';
 import { TxDetailsOrderCancel } from './tx-order-cancel';
-import { TxDetailsStopOrderCancel } from './tx-stop-order-cancel';
 import { TxDetailsOrderAmend } from './tx-order-amend';
 import { TxDetailsWithdrawSubmission } from './tx-withdraw-submission';
 import { TxDetailsDelegate } from './tx-delegation';
@@ -27,7 +26,6 @@ import { TxDetailsNodeAnnounce } from './tx-node-announce';
 import { TxDetailsStateVariable } from './tx-state-variable-proposal';
 import { TxProposal } from './tx-proposal';
 import { TxDetailsTransfer } from './tx-transfer';
-import { TxDetailsStopOrderSubmission } from './tx-stop-order-submission';

 interface TxDetailsWrapperProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -87,8 +85,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsProtocolUpgrade;
    case 'Cancel Order':
      return TxDetailsOrderCancel;
-    case 'Stop Orders Cancellation':
-      return TxDetailsStopOrderCancel;
    case 'Amend Order':
      return TxDetailsOrderAmend;
    case 'Validator Heartbeat':
@@ -117,8 +113,6 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
      return TxDetailsUndelegate;
    case 'State Variable Proposal':
      return TxDetailsStateVariable;
-    case 'Stop Orders Submission':
-      return TxDetailsStopOrderSubmission;
    case 'Transfer Funds':
      return TxDetailsTransfer;
    default:
@@ -41,7 +41,7 @@ export const TxDetailsIssueSignatures = ({
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }

-  const cmd: Command = txData.command.issueSignatures;
+  const cmd: Command = txData.command;
  const k = cmd.kind ? kind[cmd.kind] : null;

  return (
@@ -8,7 +8,6 @@ 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;
@@ -33,8 +32,6 @@ export const TxDetailsOrder = ({
  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 = '';

@@ -77,18 +74,6 @@ export const TxDetailsOrder = ({
            marketId={marketId}
          />
        ) : null}
-        {iceberg ? (
-          <TableRow modifier="bordered">
-            <TableCell>{t('Iceberg details')}</TableCell>
-            <TableCell>
-              <TxOrderIcebergDetails
-                iceberg={iceberg}
-                size={size}
-                marketId={marketId}
-              />
-            </TableCell>
-          </TableRow>
-        ) : null}
      </TableWithTbody>

      {deterministicId.length > 0 ? (
@@ -10,8 +10,6 @@ import Hash from '../../links/hash';
 import { t } from '@vegaprotocol/i18n';
 import { ProposalSignatureBundleNewAsset } from './proposal/signature-bundle-new';
 import { ProposalSignatureBundleUpdateAsset } from './proposal/signature-bundle-update';
-import { MarketLink } from '../../links';
-import { formatNumber } from '@vegaprotocol/utils';

 export type Proposal = components['schemas']['v1ProposalSubmission'];
 export type ProposalTerms = components['schemas']['vegaProposalTerms'];
@@ -55,11 +53,7 @@ export function proposalTypeLabel(terms?: ProposalTerms): string {
  } else if (has(terms, 'updateAsset')) {
    return t('Update asset proposal');
  } else if (has(terms, 'newMarket')) {
-    if (terms?.newMarket?.changes?.successor) {
-      return t('Successor market proposal');
-    } else {
-      return t('New market proposal');
-    }
+    return t('New market proposal');
  } else if (has(terms, 'updateMarket')) {
    return t('Update market proposal');
  } else if (has(terms, 'updateNetworkParameter')) {
@@ -91,13 +85,6 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
  }

  const tx = proposal.terms?.newAsset || proposal.terms?.updateAsset;
-  const isSuccessorMarketProposal =
-    proposal?.terms?.newMarket?.changes?.successor;
-  const parentMarketId =
-    isSuccessorMarketProposal &&
-    proposal?.terms.newMarket?.changes?.successor?.parentMarketId;
-  const insurancePoolFraction =
-    proposal?.terms?.newMarket?.changes?.successor?.insurancePoolFraction;

  // This component is not rendered if no bundle is required
  const SignatureBundleComponent = proposal.terms?.newAsset
@@ -124,30 +111,6 @@ export const TxProposal = ({ txData, pubKey, blockData }: TxProposalProps) => {
            <Hash text={deterministicId} />
          </TableCell>
        </TableRow>
-        {isSuccessorMarketProposal ? (
-          <>
-            {parentMarketId ? (
-              <TableRow modifier="bordered">
-                <TableCell>{t('Previous market')}</TableCell>
-                <TableCell>
-                  <MarketLink
-                    id={
-                      proposal.terms?.newMarket.changes.successor.parentMarketId
-                    }
-                  />
-                </TableCell>
-              </TableRow>
-            ) : null}
-            {insurancePoolFraction ? (
-              <TableRow modifier="bordered">
-                <TableCell>{t('Insurance pool fraction')}</TableCell>
-                <TableCell>
-                  {formatNumber(Number(insurancePoolFraction) * 100, 0)}%
-                </TableCell>
-              </TableRow>
-            ) : null}
-          </>
-        ) : null}
      </TableWithTbody>
      <ProposalSummary
        id={deterministicId}
@@ -1,60 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MarketLink } from '../../links/';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import { CancelSummary } from '../../order-summary/order-cancellation';
-import Hash from '../../links/hash';
-import type { components } from '../../../../types/explorer';
-
-export type StopOrderCancellationTransaction =
-  components['schemas']['v1StopOrdersCancellation'];
-
-interface TxDetailsStopOrderCancelProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-/**
- * Someone cancelled a stop order
- */
-export const TxDetailsStopOrderCancel = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsStopOrderCancelProps) => {
-  if (!txData || !txData.command) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const command: StopOrderCancellationTransaction =
-    txData.command.stopOrdersCancellation;
-
-  const { marketId, stopOrderId } = command;
-
-  return (
-    <TableWithTbody className="mb-8" allowWrap={true}>
-      <TxDetailsShared txData={txData} pubKey={pubKey} blockData={blockData} />
-      <TableRow modifier="bordered">
-        <TableCell>{t('Cancel stop order')}</TableCell>
-        <TableCell>
-          {stopOrderId ? (
-            <Hash text={stopOrderId} />
-          ) : (
-            <CancelSummary orderId={stopOrderId} marketId={marketId} />
-          )}
-        </TableCell>
-      </TableRow>
-      {marketId ? (
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market')}</TableCell>
-          <TableCell>
-            <MarketLink id={marketId} />
-          </TableCell>
-        </TableRow>
-      ) : null}
-    </TableWithTbody>
-  );
-};
@@ -1,148 +0,0 @@
-import { t } from '@vegaprotocol/i18n';
-import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
-import { MarketLink } from '../../links/';
-import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
-import { TxDetailsShared } from './shared/tx-details-shared';
-import { TableCell, TableRow, TableWithTbody } from '../../table';
-import {
-  getStopOrderIds,
-  stopOrdersSignatureToDeterministicId,
-} from '../lib/deterministic-ids';
-import type { components } from '../../../../types/explorer';
-import { StopOrderSetup } from './order/stop-order-setup';
-
-type StopOrderSetup = components['schemas']['v1StopOrderSetup'];
-
-interface TxDetailsOrderProps {
-  txData: BlockExplorerTransactionResult | undefined;
-  pubKey: string | undefined;
-  blockData: TendermintBlocksResponse | undefined;
-}
-
-export function getStopTypeLabel(
-  risesAbove: StopOrderSetup | undefined,
-  fallsBelow: StopOrderSetup | undefined
-): string {
-  if (risesAbove && fallsBelow) {
-    return t('OCO (One Cancels Other)');
-  } else if (fallsBelow) {
-    return t('Falls Below ↘');
-  } else if (risesAbove) {
-    return t('Rises Above ↗');
-  } else {
-    return t('Stop Order');
-  }
-}
-
-export interface StopMarketIdProps {
-  risesAbove: StopOrderSetup | undefined;
-  fallsBelow: StopOrderSetup | undefined;
-  showMarketName?: boolean;
-}
-
-export function StopMarketId({
-  risesAbove,
-  fallsBelow,
-  showMarketName = false,
-}: StopMarketIdProps) {
-  const raMarketId = risesAbove?.orderSubmission?.marketId;
-  const fbMarketId = fallsBelow?.orderSubmission?.marketId;
-
-  if (raMarketId && fbMarketId) {
-    if (raMarketId === fbMarketId) {
-      return <MarketLink id={raMarketId} showMarketName={showMarketName} />;
-    } else {
-      return (
-        <>
-          <MarketLink id={raMarketId} showMarketName={showMarketName} />,
-          <MarketLink id={fbMarketId} showMarketName={showMarketName} />
-        </>
-      );
-    }
-  } else if (raMarketId) {
-    return <MarketLink id={raMarketId} showMarketName={showMarketName} />;
-  } else if (fbMarketId) {
-    return <MarketLink id={fbMarketId} showMarketName={showMarketName} />;
-  } else {
-    return '-';
-  }
-}
-
-/**
- */
-export const TxDetailsStopOrderSubmission = ({
-  txData,
-  pubKey,
-  blockData,
-}: TxDetailsOrderProps) => {
-  if (!txData || !txData.command.stopOrdersSubmission) {
-    return <>{t('Awaiting Block Explorer transaction details')}</>;
-  }
-
-  const tx: components['schemas']['v1StopOrdersSubmission'] =
-    txData.command.stopOrdersSubmission;
-
-  const orderIds = stopOrdersSignatureToDeterministicId(
-    txData?.signature?.value
-  );
-
-  const { risesAboveId, fallsBelowId } = getStopOrderIds(
-    orderIds,
-    tx.risesAbove,
-    tx.fallsBelow
-  );
-
-  return (
-    <>
-      <TableWithTbody className="mb-8" allowWrap={true}>
-        <TxDetailsShared
-          txData={txData}
-          pubKey={pubKey}
-          blockData={blockData}
-        />
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market ID')}</TableCell>
-          <TableCell>
-            <StopMarketId
-              risesAbove={tx.risesAbove}
-              fallsBelow={tx.fallsBelow}
-            />
-          </TableCell>
-        </TableRow>
-        <TableRow modifier="bordered">
-          <TableCell>{t('Market')}</TableCell>
-          <TableCell>
-            <StopMarketId
-              risesAbove={tx.risesAbove}
-              fallsBelow={tx.fallsBelow}
-              showMarketName={true}
-            />
-          </TableCell>
-        </TableRow>
-        <TableRow modifier="bordered">
-          <TableCell>{t('Trigger')}</TableCell>
-          <TableCell>
-            {getStopTypeLabel(tx.risesAbove, tx.fallsBelow)}
-          </TableCell>
-        </TableRow>
-      </TableWithTbody>
-      <div className="flex gap-2">
-        {tx.fallsBelow && fallsBelowId && (
-          <StopOrderSetup
-            type={'FallsBelow'}
-            {...tx.fallsBelow}
-            deterministicId={fallsBelowId}
-          />
-        )}
-
-        {tx.risesAbove && risesAboveId && (
-          <StopOrderSetup
-            type={'RisesAbove'}
-            {...tx.risesAbove}
-            deterministicId={risesAboveId}
-          />
-        )}
-      </div>
-    </>
-  );
-};
@@ -1,8 +1,4 @@
-import {
-  hexToString,
-  txSignatureToDeterministicId,
-  stopOrdersSignatureToDeterministicId,
-} from './deterministic-ids';
+import { hexToString, txSignatureToDeterministicId } from './deterministic-ids';

 it('txSignatureToDeterministicId Turns a known signature in to a known deterministic ID', () => {
  const signature =
@@ -24,24 +20,3 @@ it('hexToString encodes a known good value as bytes', () => {
  const res = hexToString(hex);
  expect(res).toEqual([14, 221]);
 });
-
-describe('stopOrdersSignatureToDeterministicId', () => {
-  it('should return empty object if no signature is provided', () => {
-    const result = stopOrdersSignatureToDeterministicId();
-    expect(result.length).toEqual(0);
-  });
-
-  it('should return valid deterministic ids if a signature is provided', () => {
-    const signature = 'deadb33f';
-    const result = stopOrdersSignatureToDeterministicId(signature);
-
-    expect(result.length).toEqual(2);
-
-    expect(result[0]).toBe(
-      '4c45b67a8c08cbf1982883a75beaf309bf172461d04bd427623d6cd3d9ab0e91'
-    );
-    expect(result[1]).toBe(
-      'afe7509ff90d8f26339a0ab81e4d3e1fb6c4d44e94419aa5e13ae7659d894da1'
-    );
-  });
-});
@@ -1,6 +1,4 @@
-import type { components } from '../../../../types/explorer';
 import { sha3_256 } from 'js-sha3';
-type StopOrderSetup = components['schemas']['v1StopOrderSetup'];

 /**
 * Encodes a string as bytes
@@ -39,58 +37,3 @@ export function txSignatureToDeterministicId(signature: string): string {

  return hash.hex();
 }
-
-/**
- * Given a stop order signature string, returns the deterministic IDs of both potential
- * Stop Orders. A stop order is not an order per se, but a trigger for an order. The order
- * created by the stop order will have another ID based on the market event that hit the
- * trigger, and as such is not deterministic.
- *
- * @param signature
- * @returns string[]
- */
-export function stopOrdersSignatureToDeterministicId(
-  signature?: string
-): string[] {
-  if (!signature) {
-    return [];
-  }
-
-  const firstId = txSignatureToDeterministicId(signature);
-  return [firstId, txSignatureToDeterministicId(firstId)];
-}
-
-export type stopSignatures = {
-  risesAboveId: string | undefined;
-  fallsBelowId: string | undefined;
-};
-
-/**
- * In 0.72.10 the way stop order IDs are determined is a little tricky. It will be stabilised
- * in a future release.
- * @param deterministicIds Output of stopORdersSignatureToDeterministicId
- * @param risesAbove Stop order setup
- * @param fallsBelow Stop order setup
- * @returns Object containing the deterministic IDs of the stop orders
- */
-export function getStopOrderIds(
-  deterministicIds: string[],
-  risesAbove: StopOrderSetup | undefined,
-  fallsBelow: StopOrderSetup | undefined
-) {
-  if (risesAbove && fallsBelow) {
-    return {
-      risesAboveId: deterministicIds[0],
-      fallsBelowId: deterministicIds[1],
-    };
-  } else if (!fallsBelow && risesAbove) {
-    return {
-      risesAboveId: deterministicIds[0],
-    };
-  } else {
-    return {
-      fallsBelowId: deterministicIds[0] || undefined,
-      risesAboveId: deterministicIds[1] || undefined,
-    };
-  }
-}
@@ -10,6 +10,7 @@ import {
  DropdownMenuTrigger,
  DropdownMenuSubContent,
  Icon,
+  Button,
 } from '@vegaprotocol/ui-toolkit';
 import type { Dispatch, SetStateAction } from 'react';
 import { FilterLabel } from './tx-filter-label';
@@ -34,8 +35,6 @@ export type FilterOption =
  | 'Protocol Upgrade'
  | 'Register new Node'
  | 'State Variable Proposal'
-  | 'Stop Orders Submission'
-  | 'Stop Orders Cancellation'
  | 'Submit Oracle Data'
  | 'Submit Order'
  | 'Transfer Funds'
@@ -55,8 +54,6 @@ export const PrimaryFilterOptions: FilterOption[] = [
  'Delegate',
  'Liquidity Provision Order',
  'Proposal',
-  'Stop Orders Submission',
-  'Stop Orders Cancellation',
  'Submit Oracle Data',
  'Submit Order',
  'Transfer Funds',
@@ -103,13 +100,15 @@ export const TxsFilter = ({ filters, setFilters }: TxFilterProps) => {
    <DropdownMenu
      modal={false}
      trigger={
-        <DropdownMenuTrigger>
-          <FilterLabel filters={filters} />
+        <DropdownMenuTrigger className="ml-0">
+          <Button size="xs" data-testid="filter-trigger">
+            <FilterLabel filters={filters} />
+          </Button>
        </DropdownMenuTrigger>
      }
    >
      <DropdownMenuContent>
-        {filters.size > 1 ? null : (
+        {filters.size > 0 ? null : (
          <>
            <DropdownMenuCheckboxItem
              onCheckedChange={() => setFilters(new Set(AllFilterOptions))}
@@ -44,7 +44,7 @@ export const TxsListNavigation = ({
          </Button>
          <Button
            size="xs"
-            disabled={!hasMoreTxs}
+            disabled={!hasMoreTxs || loading}
            onClick={() => {
              nextPage();
            }}
@@ -50,25 +50,6 @@ const displayString: StringMap = {
  'Stop Orders Cancellation': 'Cancel stop',
 };

-export function getLabelForStopOrderType(
-  orderType: string,
-  command: components['schemas']['v1InputData']
-): string {
-  if (command.stopOrdersSubmission) {
-    if (
-      command.stopOrdersSubmission.risesAbove &&
-      command.stopOrdersSubmission.fallsBelow
-    ) {
-      return 'Stop ⇅';
-    } else if (command.stopOrdersSubmission.risesAbove) {
-      return 'Stop ↗';
-    } else if (command.stopOrdersSubmission.fallsBelow) {
-      return 'Stop ↘';
-    }
-  }
-  return 'Stop';
-}
-
 export function getLabelForOrderType(
  orderType: string,
  command: components['schemas']['v1InputData']
@@ -97,11 +78,7 @@ export function getLabelForProposal(
  } else if (proposal.terms?.updateAsset) {
    return t('Proposal: Update asset');
  } else if (proposal.terms?.newMarket) {
-    if (proposal.terms?.newMarket.changes?.successor) {
-      return t('Proposal: Successor market');
-    } else {
-      return t('Proposal: New market');
-    }
+    return t('Proposal: New market');
  } else if (proposal.terms?.updateMarket) {
    return t('Proposal: Update market');
  } else if (proposal.terms?.updateNetworkParameter) {
@@ -189,7 +166,6 @@ 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';
@@ -201,12 +177,6 @@ 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';
-  } else if (type === 'Stop' && command) {
-    type = getLabelForStopOrderType(orderType, command);
-    colours = 'text-white dark-text-white bg-vega-blue dark:bg-vega-blue';
  }

  if (type === 'Vote on Proposal') {
@@ -86,18 +86,14 @@ describe('Txs infinite list item', () => {
    render(
      <MockedProvider>
        <MemoryRouter>
-          <table>
-            <tbody>
-              <TxsInfiniteListItem
-                type="testType"
-                submitter="testPubKey"
-                hash="testTxHash"
-                block="1"
-                code={0}
-                command={{}}
-              />
-            </tbody>
-          </table>
+          <TxsInfiniteListItem
+            type="testType"
+            submitter="testPubKey"
+            hash="testTxHash"
+            block="1"
+            code={0}
+            command={{}}
+          />
        </MemoryRouter>
      </MockedProvider>
    );
@@ -14,9 +14,9 @@ const DEFAULT_TRUNCATE_LENGTH = 7;

 export function getIdTruncateLength(screen: Screen): number {
  if (['xxxl', 'xxl'].includes(screen)) {
-    return 32;
+    return 64;
  } else if (['xl', 'lg', 'md'].includes(screen)) {
-    return 16;
+    return 32;
  }
  return DEFAULT_TRUNCATE_LENGTH;
 }
@@ -5,17 +5,11 @@ import type { BlockExplorerTransactionResult } from '../../routes/types/block-ex
 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: generateHash(),
+    hash: '0F8B98DA0923A50786B852D9CA11E051CACC4C733E1DB93D535C7D81DBD10F6F',
    submitter:
      '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
    type: 'Submit Order',
@@ -55,7 +55,7 @@ export const TxsInfiniteList = ({
  }

  return (
-    <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">
@@ -2,7 +2,7 @@ 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 { getTxsDataUrl } from '../../hooks/get-txs-data-url';
+import { getTxsDataUrl } from '../../hooks/use-txs-data';
 import { AsyncRenderer, Loader } from '@vegaprotocol/ui-toolkit';
 import EmptyList from '../empty-list/empty-list';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
@@ -14,7 +14,7 @@ interface TxsPerBlockProps {

 export const TxsPerBlock = ({ blockHeight, txCount }: TxsPerBlockProps) => {
  const filters = `filters[block.height]=${blockHeight}`;
-  const url = getTxsDataUrl({ filters, count: txCount });
+  const url = getTxsDataUrl({ limit: txCount.toString(), filters });
  const {
    state: { data, loading, error },
  } = useFetch<BlockExplorerTransactions>(url);
@@ -5,6 +5,8 @@ const windowOrDefault = (key: string) => {
  return (process.env[key] as string) || '';
 };

+const truthy = ['1', 'true'];
+
 export const ENV = {
  // Data sources
  // Environment
@@ -18,6 +20,19 @@ 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'),
  },
@@ -0,0 +1,5 @@
+import { ENV } from './env';
+
+export default {
+  ...ENV.flags,
+};
@@ -1,59 +0,0 @@
-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;
-};
@@ -1,48 +0,0 @@
-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);
-  });
-});
@@ -1,141 +1,130 @@
-import { useSearchParams } from 'react-router-dom';
-import type { URLSearchParamsInit } from 'react-router-dom';
-import { useCallback } from 'react';
+import { useCallback, useEffect, useState } 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 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 TxsStateProps {
+  txsData: BlockExplorerTransactionResult[];
+  hasMoreTxs: boolean;
+  cursor: string;
+  previousCursors: string[];
+  hasPreviousPage: boolean;
 }

 export interface IUseTxsData {
-  count?: number;
-  before?: string;
-  after?: string;
-  party?: string;
-  filters?: Set<FilterOption>;
+  limit: number;
+  filters?: string;
 }

-export const useTxsData = ({
-  count = 25,
-  before,
-  after,
-  filters,
-  party,
-}: IUseTxsData) => {
-  const [, setSearchParams] = useSearchParams();
-  let hasMoreTxs = true;
-  let txsData: BlockExplorerTransactionResult[] = [];
+interface IGetTxsDataUrl {
+  limit: string;
+  filters?: string;
+}

-  const url = getTxsDataUrl({
-    filters: getTypeFilters(filters),
-    count,
-    before,
-    after,
-    party,
+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, cursor, previousCursors, hasPreviousPage },
+    setTxsState,
+  ] = useState<TxsStateProps>({
+    txsData: [],
+    hasMoreTxs: false,
+    previousCursors: [],
+    cursor: '',
+    hasPreviousPage: false,
  });

+  const url = getTxsDataUrl({ limit: limit.toString(), filters });
+
  const {
    state: { data, error, loading },
    refetch,
  } = useFetch<BlockExplorerTransactions>(url, {}, true);

-  if (!loading && data && isNumber(data.transactions.length)) {
-    hasMoreTxs = data.transactions.length >= count;
-    txsData = data.transactions;
-  }
+  useEffect(() => {
+    if (!loading && data && isNumber(data.transactions.length)) {
+      setTxsState((prev) => {
+        return {
+          ...prev,
+          txsData: data.transactions,
+          hasMoreTxs: data.transactions.length >= limit,
+          cursor: data?.transactions.at(-1)?.cursor || '',
+        };
+      });
+    }
+  }, [loading, setTxsState, data, limit]);

  const nextPage = useCallback(() => {
-    const after = data?.transactions.at(-1)?.cursor || '';
-    const params: URLSearchParamsInit = { after };
-    if (filters) {
-      params.filters = Array.from(filters).join(',');
-    }
-    setSearchParams(params);
-  }, [filters, data, setSearchParams]);
+    const c = data?.transactions.at(0)?.cursor;
+    const newPreviousCursors = c ? [...previousCursors, c] : previousCursors;
+
+    setTxsState((prev) => ({
+      ...prev,
+      hasPreviousPage: true,
+      previousCursors: newPreviousCursors,
+    }));
+
+    return refetch({
+      limit,
+      before: cursor,
+    });
+  }, [data, previousCursors, cursor, 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 previousCursor = [...previousCursors].pop();
+    const newPreviousCursors = previousCursors.slice(0, -1);
+    setTxsState((prev) => ({
+      ...prev,
+      hasPreviousPage: newPreviousCursors.length > 0,
+      previousCursors: newPreviousCursors,
+    }));
+    return refetch({
+      limit,
+      before: previousCursor,
+    });
+  }, [previousCursors, limit, refetch]);

  const refreshTxs = useCallback(async () => {
-    const params: URLSearchParamsInit = {};
-    if (filters && filters.size > 0 && filters.size === 1) {
-      params.filters = Array.from(filters)[0];
-    }
-    setSearchParams(params);
+    setTxsState(() => ({
+      txsData: [],
+      cursor: '',
+      previousCursors: [],
+      hasMoreTxs: false,
+      hasPreviousPage: false,
+    }));

-    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]
-  );
+    refetch({ limit });
+  }, [setTxsState, limit, refetch, filters]); // eslint-disable-line react-hooks/exhaustive-deps

  return {
-    updateFilters,
    txsData,
    loading,
    error,
    hasMoreTxs,
+    hasPreviousPage,
+    previousCursors,
+    cursor,
    refreshTxs,
    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;
-}
@@ -204,7 +204,6 @@ 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(
@@ -1,5 +1,7 @@
 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 {
@@ -12,7 +14,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 { useBlockInfo } from '@vegaprotocol/tendermint';
+import { useFetch } from '@vegaprotocol/react-helpers';
 import { NodeLink } from '../../../components/links';
 import { useDocumentTitle } from '../../../hooks/use-document-title';
 import EmptyList from '../../../components/empty-list/empty-list';
@@ -22,7 +24,10 @@ const Block = () => {
  useDocumentTitle(['Blocks', `Block #${block}`]);
  const {
    state: { data: blockData, loading, error },
-  } = useBlockInfo(Number(block));
+  } = useFetch<TendermintBlocksResponse>(
+    `${DATA_SOURCES.tendermintUrl}/block?height=${block}`,
+    { cache: 'force-cache' }
+  );

  return (
    <section>
@@ -22,11 +22,6 @@ import { Footer } from '../components/footer/footer';
 import { Header } from '../components/header';
 import { Routes } from './route-names';
 import { useExplorerNodeNamesLazyQuery } from './validators/__generated__/NodeNames';
-import {
-  ProtocolUpgradeCountdownMode,
-  ProtocolUpgradeInProgressNotification,
-  ProtocolUpgradeProposalNotification,
-} from '@vegaprotocol/proposals';

 const DialogsContainer = () => {
  const { isOpen, id, trigger, asJson, setOpen } = useAssetDetailsDialogStore();
@@ -67,10 +62,6 @@ export const Layout = () => {
            />
          )}
          <Header />
-          <ProtocolUpgradeProposalNotification
-            mode={ProtocolUpgradeCountdownMode.IN_ESTIMATED_TIME_REMAINING}
-          />
-          <ProtocolUpgradeInProgressNotification />
        </div>
        <div className={fixedWidthClasses}>
          <main className="p-4">
@@ -1,2 +1 @@
 export * from './network-parameters';
-export * from './structure-network-params';
@@ -1,105 +1,82 @@
 import { render, screen } from '@testing-library/react';
 import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { NetworkParametersTable } from './network-parameters';
-import { MemoryRouter } from 'react-router-dom';
-
-const renderComponent = (data: NetworkParamsQuery | undefined) => {
-  return render(
-    <MemoryRouter>
-      <NetworkParametersTable data={data} loading={false} />
-    </MemoryRouter>
-  );
-};
-
-const mockData = {
-  networkParametersConnection: {
-    edges: [
-      {
-        node: {
-          key: 'spam.protection.delegation.min.tokens',
-          value: '3',
-        },
-      },
-      {
-        node: {
-          key: 'spam.protection.voting.min.tokens',
-          value: '1',
-        },
-      },
-      {
-        node: {
-          key: 'reward.staking.delegation.minimumValidatorStake',
-          value: '2',
-        },
-      },
-      {
-        node: {
-          key: 'reward.asset',
-          value:
-            'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55',
-        },
-      },
-    ],
-  },
-};

 describe('NetworkParametersTable', () => {
-  it('renders headers correctly', () => {
-    renderComponent(mockData);
-
-    const allHeadings = screen.getAllByRole('heading');
-    expect(
-      allHeadings.map((h) => {
-        return {
-          text: h.textContent,
-          level: h.tagName,
-          testId: h.getAttribute('data-testid'),
-        };
-      })
-    ).toEqual([
-      {
-        text: 'Network Parameters',
-        level: 'H1',
-        testId: 'network-param-header',
+  it('renders correctly when it has network params', () => {
+    const data: NetworkParamsQuery = {
+      networkParametersConnection: {
+        edges: [
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.liquidityProvision.minLpStakeQuantumMultiple',
+              value: '1',
+            },
+          },
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.fee.factors.infrastructureFee',
+              value: '0.0005',
+            },
+          },
+        ],
      },
-      { text: 'Spam', level: 'H1', testId: 'spam' },
-      { text: 'Protection', level: 'H2', testId: 'spam-protection' },
-      { text: 'Delegation', level: 'H3', testId: 'spam-protection-delegation' },
-      { text: 'Min', level: 'H4', testId: 'spam-protection-delegation-min' },
-      { text: 'Voting', level: 'H3', testId: 'spam-protection-voting' },
-      { text: 'Min', level: 'H4', testId: 'spam-protection-voting-min' },
-      { text: 'Reward', level: 'H1', testId: 'reward' },
-      { text: 'Staking', level: 'H2', testId: 'reward-staking' },
-      { text: 'Delegation', level: 'H3', testId: 'reward-staking-delegation' },
-    ]);
+    };
+    render(<NetworkParametersTable data={data} loading={false} />);
+    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
+      'Network Parameters'
+    );
+    const rows = screen.getAllByTestId('key-value-table-row');
+    expect(rows[0].children[0]).toHaveTextContent(
+      'market.fee.factors.infrastructureFee'
+    );
+    expect(rows[1].children[0]).toHaveTextContent(
+      'market.liquidityProvision.minLpStakeQuantumMultiple'
+    );
+    expect(rows[0].children[1]).toHaveTextContent('0.0005');
+    expect(rows[1].children[1]).toHaveTextContent('1');
  });

-  it('renders network params correctly', () => {
-    renderComponent(mockData);
-
-    const delegationMinTokensRow = screen.getByTestId(
-      'spam-protection-delegation-min-tokens'
+  it('renders the rows in ascending order', () => {
+    const data: NetworkParamsQuery = {
+      networkParametersConnection: {
+        edges: [
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.fee.factors.infrastructureFee',
+              value: '0.0005',
+            },
+          },
+          {
+            node: {
+              __typename: 'NetworkParameter',
+              key: 'market.liquidityProvision.minLpStakeQuantumMultiple',
+              value: '1',
+            },
+          },
+        ],
+      },
+    };
+    render(<NetworkParametersTable data={data} loading={false} />);
+    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
+      'Network Parameters'
    );
-    expect(delegationMinTokensRow).toHaveTextContent('0.000000000000000003');
-
-    const votingMinTokensRow = screen.getByTestId(
-      'spam-protection-voting-min-tokens'
+    const rows = screen.getAllByTestId('key-value-table-row');
+    expect(rows[0].children[0]).toHaveTextContent(
+      'market.fee.factors.infrastructureFee'
    );
-    expect(votingMinTokensRow).toHaveTextContent('0.000000000000000001');
-
-    const minimumValidatorStakeRow = screen.getByTestId(
-      'reward-staking-delegation-minimumValidatorStake'
-    );
-    expect(minimumValidatorStakeRow).toHaveTextContent('2');
-
-    const assetRow = screen.getByTestId('reward-asset');
-    expect(assetRow).toHaveTextContent(
-      'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55'
+    expect(rows[1].children[0]).toHaveTextContent(
+      'market.liquidityProvision.minLpStakeQuantumMultiple'
    );
+    expect(rows[0].children[1]).toHaveTextContent('0.0005');
+    expect(rows[1].children[1]).toHaveTextContent('1');
  });

  it('does not render rows when is loading', () => {
-    renderComponent(undefined);
+    render(<NetworkParametersTable data={undefined} loading={true} />);
    expect(screen.getByTestId('network-param-header')).toHaveTextContent(
      'Network Parameters'
    );
@@ -1,8 +1,6 @@
-import startCase from 'lodash/startCase';
-import classNames from 'classnames';
-import { Link } from 'react-router-dom';
 import {
  AsyncRenderer,
+  KeyValueTable,
  KeyValueTableRow,
  SyntaxHighlighter,
 } from '@vegaprotocol/ui-toolkit';
@@ -14,12 +12,11 @@ import {
 } from '@vegaprotocol/utils';
 import { t } from '@vegaprotocol/i18n';
 import { RouteTitle } from '../../components/route-title';
+import orderBy from 'lodash/orderBy';
 import { useNetworkParamsQuery } from '@vegaprotocol/network-parameters';
+import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
 import { useScrollToLocation } from '../../hooks/scroll-to-location';
 import { useDocumentTitle } from '../../hooks/use-document-title';
-import { structureNetworkParams } from './structure-network-params';
-import type { NetworkParamsQuery } from '@vegaprotocol/network-parameters';
-import type { GroupedParams } from './structure-network-params';

 const PERCENTAGE_PARAMS = [
  'governance.proposal.asset.requiredMajority',
@@ -61,54 +58,6 @@ const BIG_NUMBER_PARAMS = [
  'governance.proposal.updateAsset.minVoterBalance',
 ];

-export const renderGroupedParams = (
-  group: GroupedParams,
-  level: number,
-  parentKeys: string[] = []
-) => {
-  const Header = `h${level}` as keyof JSX.IntrinsicElements;
-  const headerStyles = classNames('uppercase font-semibold', {
-    'pt-6 text-3xl underline': level === 1,
-    'pt-3 text-2xl': level === 2,
-    'pt-2 text-lg': level === 3,
-    'pt-2 text-default': level === 4,
-  });
-
-  return Object.entries(group).map(([key, value]) => {
-    const fullPath = [...parentKeys, key].join('.');
-    const isLeafNode = typeof value !== 'object';
-    const id = parentKeys.concat([key]).join('-');
-
-    return (
-      <div key={key}>
-        {!isLeafNode && (
-          <div id={id}>
-            <Link to={`#${id}`}>
-              <Header className={headerStyles} data-testid={id}>
-                {startCase(key)}
-              </Header>
-            </Link>
-          </div>
-        )}
-        {isLeafNode ? (
-          typeof value === 'string' ? (
-            <div data-testid={id}>
-              <NetworkParameterRow
-                key={fullPath}
-                row={{ key: fullPath, value: value }}
-              />
-            </div>
-          ) : null
-        ) : (
-          <div className="pb-1">
-            {renderGroupedParams(value, level + 1, [...parentKeys, key])}
-          </div>
-        )}
-      </div>
-    );
-  });
-};
-
 export const NetworkParameterRow = ({
  row: { key, value },
 }: {
@@ -128,9 +77,7 @@ export const NetworkParameterRow = ({
    >
      {key}
      {isSyntaxRow ? (
-        <div className="pb-2">
-          <SyntaxHighlighter data={JSON.parse(value)} />
-        </div>
+        <SyntaxHighlighter data={JSON.parse(value)} />
      ) : isNaN(Number(value)) ? (
        value
      ) : BIG_NUMBER_PARAMS.includes(key) ? (
@@ -166,12 +113,17 @@ export const NetworkParametersTable = ({
      loading={loading}
      error={error}
      render={(data) => {
-        const flatParams = removePaginationWrapper(
-          data.networkParametersConnection.edges
+        const ascParams = orderBy(
+          removePaginationWrapper(data.networkParametersConnection.edges),
+          (param) => param.key,
+          'asc'
        );
-        const groupedParams = structureNetworkParams(flatParams);
        return (
-          <div className="-mt-6">{renderGroupedParams(groupedParams, 1)}</div>
+          <KeyValueTable data-testid="parameters">
+            {(ascParams || []).map((row) => (
+              <NetworkParameterRow key={row.key} row={row} />
+            ))}
+          </KeyValueTable>
        );
      }}
    />
@@ -1,109 +0,0 @@
-import type { GroupedParams } from './structure-network-params';
-import {
-  structureParams,
-  sortGroupedParams,
-  structureNetworkParams,
-} from './structure-network-params';
-
-describe('structureParams', () => {
-  it('should correctly structure params', () => {
-    const input = [
-      { key: 'spam.protection.delegation.min.tokens', value: '10' },
-      { key: 'spam.protection.voting.min.tokens', value: '5' },
-    ];
-    const output: GroupedParams = {
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-          voting: {
-            min: {
-              tokens: '5',
-            },
-          },
-        },
-      },
-    };
-    expect(structureParams(input)).toEqual(output);
-  });
-
-  it('should handle top-level keys correctly', () => {
-    const input = [{ key: 'levelOne', value: '10' }];
-    const output = {
-      levelOne: '10',
-    };
-    expect(structureParams(input)).toEqual(output);
-  });
-});
-
-describe('sortGroupedParams', () => {
-  it('should correctly sort grouped params', () => {
-    const input: GroupedParams = {
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-        },
-      },
-      reward: '50',
-    };
-    const output: GroupedParams = {
-      reward: '50',
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-        },
-      },
-    };
-    expect(sortGroupedParams(input)).toEqual(output);
-  });
-
-  it('should handle already sorted keys', () => {
-    const input = {
-      a: '10',
-      b: {
-        c: '5',
-        d: '6',
-      },
-    };
-    expect(sortGroupedParams(input)).toEqual(input);
-  });
-});
-
-describe('structureNetworkParams', () => {
-  it('should structure and sort network params correctly', () => {
-    const input = [
-      { key: 'spam.protection.delegation.min.tokens', value: '10' },
-      { key: 'reward.asset', value: '50' },
-    ];
-    const output: GroupedParams = {
-      reward: {
-        asset: '50',
-      },
-      spam: {
-        protection: {
-          delegation: {
-            min: {
-              tokens: '10',
-            },
-          },
-        },
-      },
-    };
-    expect(structureNetworkParams(input)).toEqual(output);
-  });
-
-  it('should return an empty object if no params are provided', () => {
-    expect(structureNetworkParams([])).toEqual({});
-  });
-});
@@ -1,107 +0,0 @@
-/**
- * Categorizes and sorts an array of key-value pairs of network params into a nested object structure.
- *
- * The function takes an array of network params where keys are dot-delimited
- * strings representing nested categories (e.g., 'spam.protection.delegation.min.tokens').
- *
- * Why this is necessary:
- * A flat key-value structure wouldn't provide the hierarchical information needed.
- * Organizing network parameters like this allows the rendering of nested headers
- * and their corresponding network params.
- *
- * It also ensures that items with the minimum amount of nesting are ordered first. This
- * allows us to render these items first, before more deeply nested items are rendered with
- * subheaders. This creates a more intuitive UI.
- *
- * For example, given the input:
- * [
- *   { key: 'spam.protection.delegation.min.tokens', value: '10' },
- *   { key: 'spam.protection.voting.min.tokens', value: '5' },
- *   { key: 'reward.staking.delegation.minimumValidatorStake', value: '2' }
- *   { key: 'reward.asset', value: 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55' }
- * ]
- *
- * The output will be:
- * {
- *   spam: {
- *     protection: {
- *       delegation: {
- *         min: {
- *           tokens: '10'
- *         }
- *       },
- *       voting: {
- *         min: {
- *           tokens: '5'
- *         }
- *       }
- *     }
- *   },
- *   reward: {
- *     asset: 'fc7fd956078fb1fc9db5c19b88f0874c4299b2a7639ad05a47a28c0aef291b55',
- *     staking: {
- *       delegation: {
- *         minimumValidatorStake: '2'
- *       }
- *     }
- *   }
- * }
- *
- * @param {Array} params - An array of key-value pairs to categorize and sort.
- * @returns {GroupedParams} - A nested object that groups the key-value pairs.
- */
-
-export type GroupedParams = {
-  [key: string]: string | GroupedParams;
-};
-
-export const structureParams = (
-  params: { key: string; value: string }[]
-): GroupedParams => {
-  const grouped: GroupedParams = {};
-
-  params.forEach(({ key, value }) => {
-    const parts = key.split('.');
-    let node: GroupedParams = grouped;
-
-    parts.forEach((part, i) => {
-      if (typeof node[part] === 'undefined') {
-        node[part] = i === parts.length - 1 ? value : {};
-      }
-
-      if (typeof node[part] === 'object') {
-        node = node[part] as GroupedParams;
-      }
-    });
-  });
-
-  return grouped;
-};
-
-export const sortGroupedParams = (
-  groupedParams: GroupedParams
-): GroupedParams => {
-  const sorted: GroupedParams = {};
-
-  // Sort top-level keys first
-  Object.entries(groupedParams).forEach(([key, value]) => {
-    if (typeof value === 'string') {
-      sorted[key] = value;
-    }
-  });
-
-  Object.entries(groupedParams).forEach(([key, value]) => {
-    if (typeof value === 'object') {
-      sorted[key] = sortGroupedParams(value);
-    }
-  });
-
-  return sorted;
-};
-
-export const structureNetworkParams = (
-  params: { key: string; value: string }[]
-) => {
-  const grouped = structureParams(params);
-  return sortGroupedParams(grouped);
-};
@@ -1,5 +1,59 @@
+fragment ExplorerOracleDataSource on OracleSpec {
+  dataSourceSpec {
+    spec {
+      id
+      createdAt
+      updatedAt
+      status
+      data {
+        sourceType {
+          ... on DataSourceDefinitionInternal {
+            sourceType {
+              ... on DataSourceSpecConfigurationTime {
+                conditions {
+                  value
+                  operator
+                }
+              }
+            }
+          }
+          ... on DataSourceDefinitionExternal {
+            sourceType {
+              ... on DataSourceSpecConfiguration {
+                signers {
+                  signer {
+                    ... on ETHAddress {
+                      address
+                    }
+                    ... on PubKey {
+                      key
+                    }
+                  }
+                }
+                filters {
+                  key {
+                    name
+                    type
+                  }
+                  conditions {
+                    value
+                    operator
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
 fragment ExplorerOracleDataConnection on OracleSpec {
  dataConnection {
+    pageInfo {
+      hasNextPage
+    }
    edges {
      node {
        externalData {
@@ -27,90 +81,6 @@ fragment ExplorerOracleDataConnection on OracleSpec {
  }
 }

-fragment ExplorerOracleDataSource on OracleSpec {
-  ...ExplorerOracleDataConnection
-  dataSourceSpec {
-    spec {
-      id
-      createdAt
-      updatedAt
-      status
-      data {
-        sourceType {
-          ... on DataSourceDefinitionInternal {
-            sourceType {
-              ... on DataSourceSpecConfigurationTime {
-                conditions {
-                  value
-                  operator
-                }
-              }
-            }
-          }
-          ... on DataSourceDefinitionExternal {
-            sourceType {
-              ... on EthCallSpec {
-                abi
-                args
-                method
-                requiredConfirmations
-                address
-                normalisers {
-                  name
-                  expression
-                }
-                trigger {
-                  trigger {
-                    ... on EthTimeTrigger {
-                      initial
-                      every
-                      until
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
-              ... on DataSourceSpecConfiguration {
-                signers {
-                  signer {
-                    ... on ETHAddress {
-                      address
-                    }
-                    ... on PubKey {
-                      key
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-
 query ExplorerOracleSpecs {
  oracleSpecsConnection(pagination: { first: 50 }) {
    pageInfo {
@@ -127,5 +97,6 @@ query ExplorerOracleSpecs {
 query ExplorerOracleSpecById($id: ID!) {
  oracleSpec(oracleSpecId: $id) {
    ...ExplorerOracleDataSource
+    ...ExplorerOracleDataConnection
  }
 }
@@ -11,14 +11,6 @@ fragment ExplorerOracleForMarketsMarket on Market {
            id
          }
        }
-        ... on Perpetual {
-          dataSourceSpecForSettlementData {
-            id
-          }
-          dataSourceSpecForSettlementSchedule {
-            id
-          }
-        }
      }
    }
  }
@@ -3,25 +3,80 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } };

-export type ExplorerOracleDataSourceFragment = { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };
+export type ExplorerOracleDataConnectionFragment = { __typename?: 'OracleSpec', dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } };

 export type ExplorerOracleSpecsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } } | null> | null } | null };
+export type ExplorerOracleSpecsQuery = { __typename?: 'Query', oracleSpecsConnection?: { __typename?: 'OracleSpecsConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleSpecEdge', node: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } } } } | null> | null } | null };

 export type ExplorerOracleSpecByIdQueryVariables = Types.Exact<{
  id: Types.Scalars['ID'];
 }>;


-export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } | { __typename?: 'EthCallSpec', abi?: Array<string> | null, args?: Array<string> | null, method: string, requiredConfirmations: number, address: string, normalisers?: Array<{ __typename?: 'Normaliser', name: string, expression: string }> | null, trigger: { __typename?: 'EthCallTrigger', trigger: { __typename?: 'EthTimeTrigger', initial?: any | null, every?: number | null, until?: any | null } }, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } | { __typename?: 'DataSourceSpecConfigurationTimeTrigger' } } } } }, dataConnection: { __typename?: 'OracleDataConnection', edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };
+export type ExplorerOracleSpecByIdQuery = { __typename?: 'Query', oracleSpec?: { __typename?: 'OracleSpec', dataSourceSpec: { __typename?: 'ExternalDataSourceSpec', spec: { __typename?: 'DataSourceSpec', id: string, createdAt: any, updatedAt?: any | null, status: Types.DataSourceSpecStatus, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType }, conditions?: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator }> | null }> | null } } | { __typename?: 'DataSourceDefinitionInternal', sourceType: { __typename?: 'DataSourceSpecConfigurationTime', conditions: Array<{ __typename?: 'Condition', value?: string | null, operator: Types.ConditionOperator } | null> } } } } }, dataConnection: { __typename?: 'OracleDataConnection', pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean }, edges?: Array<{ __typename?: 'OracleDataEdge', node: { __typename?: 'OracleData', externalData: { __typename?: 'ExternalData', data: { __typename?: 'Data', matchedSpecIds?: Array<string> | null, broadcastAt: any, signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, data?: Array<{ __typename?: 'Property', name: string, value: string }> | null } } } } | null> | null } } | null };

+export const ExplorerOracleDataSourceFragmentDoc = gql`
+    fragment ExplorerOracleDataSource on OracleSpec {
+  dataSourceSpec {
+    spec {
+      id
+      createdAt
+      updatedAt
+      status
+      data {
+        sourceType {
+          ... on DataSourceDefinitionInternal {
+            sourceType {
+              ... on DataSourceSpecConfigurationTime {
+                conditions {
+                  value
+                  operator
+                }
+              }
+            }
+          }
+          ... on DataSourceDefinitionExternal {
+            sourceType {
+              ... on DataSourceSpecConfiguration {
+                signers {
+                  signer {
+                    ... on ETHAddress {
+                      address
+                    }
+                    ... on PubKey {
+                      key
+                    }
+                  }
+                }
+                filters {
+                  key {
+                    name
+                    type
+                  }
+                  conditions {
+                    value
+                    operator
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
+    `;
 export const ExplorerOracleDataConnectionFragmentDoc = gql`
    fragment ExplorerOracleDataConnection on OracleSpec {
  dataConnection {
+    pageInfo {
+      hasNextPage
+    }
    edges {
      node {
        externalData {
@@ -49,91 +104,6 @@ export const ExplorerOracleDataConnectionFragmentDoc = gql`
  }
 }
    `;
-export const ExplorerOracleDataSourceFragmentDoc = gql`
-    fragment ExplorerOracleDataSource on OracleSpec {
-  ...ExplorerOracleDataConnection
-  dataSourceSpec {
-    spec {
-      id
-      createdAt
-      updatedAt
-      status
-      data {
-        sourceType {
-          ... on DataSourceDefinitionInternal {
-            sourceType {
-              ... on DataSourceSpecConfigurationTime {
-                conditions {
-                  value
-                  operator
-                }
-              }
-            }
-          }
-          ... on DataSourceDefinitionExternal {
-            sourceType {
-              ... on EthCallSpec {
-                abi
-                args
-                method
-                requiredConfirmations
-                address
-                normalisers {
-                  name
-                  expression
-                }
-                trigger {
-                  trigger {
-                    ... on EthTimeTrigger {
-                      initial
-                      every
-                      until
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
-              ... on DataSourceSpecConfiguration {
-                signers {
-                  signer {
-                    ... on ETHAddress {
-                      address
-                    }
-                    ... on PubKey {
-                      key
-                    }
-                  }
-                }
-                filters {
-                  key {
-                    name
-                    type
-                    numberDecimalPlaces
-                  }
-                  conditions {
-                    value
-                    operator
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
-    ${ExplorerOracleDataConnectionFragmentDoc}`;
 export const ExplorerOracleSpecsDocument = gql`
    query ExplorerOracleSpecs {
  oracleSpecsConnection(pagination: {first: 50}) {
@@ -179,9 +149,11 @@ export const ExplorerOracleSpecByIdDocument = gql`
    query ExplorerOracleSpecById($id: ID!) {
  oracleSpec(oracleSpecId: $id) {
    ...ExplorerOracleDataSource
+    ...ExplorerOracleDataConnection
  }
 }
-    ${ExplorerOracleDataSourceFragmentDoc}`;
+    ${ExplorerOracleDataSourceFragmentDoc}
+${ExplorerOracleDataConnectionFragmentDoc}`;

 /**
 * __useExplorerOracleSpecByIdQuery__
@@ -3,12 +3,12 @@ import * as Types from '@vegaprotocol/types';
 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
 const defaultOptions = {} as const;
-export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } };
+export type ExplorerOracleForMarketsMarketFragment = { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } } } };

 export type ExplorerOracleFormMarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Perpetual', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForSettlementSchedule: { __typename?: 'DataSourceSpec', id: string } } | { __typename?: 'Spot' } } } } }> } | null };
+export type ExplorerOracleFormMarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string } } } } } }> } | null };

 export const ExplorerOracleForMarketsMarketFragmentDoc = gql`
    fragment ExplorerOracleForMarketsMarket on Market {
@@ -24,14 +24,6 @@ export const ExplorerOracleForMarketsMarketFragmentDoc = gql`
            id
          }
        }
-        ... on Perpetual {
-          dataSourceSpecForSettlementData {
-            id
-          }
-          dataSourceSpecForSettlementSchedule {
-            id
-          }
-        }
      }
    }
  }
@@ -1,23 +1,23 @@
 import { render } from '@testing-library/react';
 import { OracleData } from './oracle-data';
-import { type ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';
+import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';

-type DataConnection = ExplorerOracleDataConnectionFragment['dataConnection'];
-
-function renderComponent(
-  data: ExplorerOracleDataConnectionFragment['dataConnection']
-) {
+function renderComponent(data: ExplorerOracleDataConnectionFragment) {
  return <OracleData data={data} />;
 }

 describe('Oracle Data view', () => {
  it('Renders nothing when data is null', () => {
-    const res = render(renderComponent(null as unknown as DataConnection));
+    const res = render(
+      renderComponent(null as unknown as ExplorerOracleDataConnectionFragment)
+    );
    expect(res.container).toBeEmptyDOMElement();
  });

  it('Renders nothing when dataConnection is empty', () => {
-    const res = render(renderComponent({} as DataConnection));
+    const res = render(
+      renderComponent({} as ExplorerOracleDataConnectionFragment)
+    );
    expect(res.container).toBeEmptyDOMElement();
  });
  it('Renders nothing when dataConnection has no edges', () => {
@@ -26,7 +26,7 @@ describe('Oracle Data view', () => {
        dataConnection: {
          edges: null,
        },
-      } as DataConnection)
+      } as ExplorerOracleDataConnectionFragment)
    );
    expect(res.container).toBeEmptyDOMElement();
  });
@@ -37,7 +37,7 @@ describe('Oracle Data view', () => {
        dataConnection: {
          edges: [],
        },
-      } as unknown as DataConnection)
+      } as unknown as ExplorerOracleDataConnectionFragment)
    );
    expect(res.container).toBeEmptyDOMElement();
  });
@@ -47,18 +47,20 @@ describe('Oracle Data view', () => {
  it('Renders details component when there is data', () => {
    const res = render(
      renderComponent({
-        edges: [
-          {
-            node: {
-              externalData: {
-                data: {
-                  broadcastAt: '2022-01-01',
+        dataConnection: {
+          edges: [
+            {
+              node: {
+                externalData: {
+                  data: {
+                    broadcastAt: '2022-01-01',
+                  },
                },
              },
            },
-          },
-        ],
-      } as DataConnection)
+          ],
+        },
+      } as ExplorerOracleDataConnectionFragment)
    );
    expect(res.getByText('Broadcast data')).toBeInTheDocument();
  });
@@ -4,7 +4,7 @@ import filter from 'recursive-key-filter';
 import type { ExplorerOracleDataConnectionFragment } from '../__generated__/Oracles';

 interface OracleDataTypeProps {
-  data: ExplorerOracleDataConnectionFragment['dataConnection'];
+  data: ExplorerOracleDataConnectionFragment;
 }

 /**
@@ -14,7 +14,12 @@ interface OracleDataTypeProps {
 * that Does The Job, rather than because it's good.
 */
 export function OracleData({ data }: OracleDataTypeProps) {
-  if (!data || !data.edges?.length || data.edges.length > 1) {
+  if (
+    !data ||
+    !data.dataConnection ||
+    !data.dataConnection.edges?.length ||
+    data.dataConnection.edges.length > 1
+  ) {
    return null;
  }

@@ -22,7 +27,7 @@ export function OracleData({ data }: OracleDataTypeProps) {
    <details data-testid="oracle-data">
      <summary>{t('Broadcast data')}</summary>
      <ul>
-        {data.edges.map((d) => {
+        {data.dataConnection.edges.map((d) => {
          if (!d) {
            return null;
          }
@@ -10,7 +10,7 @@ interface OracleMarketsProps {
 }

 /**
- * Slightly misleading names, OracleMarkets lists the market (almost always singular)
+ * Slightly misleadlingly names, OracleMarkets lists the market (almost always singular)
 * to which an oracle is attached. It also checks what it triggers, by checking on the
 * market whether it is attached to the dataSourceSpecForSettlementData or ..TradingTermination
 */
@@ -27,10 +27,8 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    const m = markets.find((m) => {
      const p = m.tradableInstrument.instrument.product;
      if (
-        ((p.__typename === 'Future' || p.__typename === 'Perpetual') &&
-          p.dataSourceSpecForSettlementData.id === id) ||
-        ('dataSourceSpecForTradingTermination' in p &&
-          p.dataSourceSpecForTradingTermination.id === id)
+        p.dataSourceSpecForSettlementData.id === id ||
+        p.dataSourceSpecForTradingTermination.id === id
      ) {
        return true;
      }
@@ -38,9 +36,15 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    });

    if (m && m.id) {
+      const type =
+        id ===
+        m.tradableInstrument.instrument.product.dataSourceSpecForSettlementData
+          .id
+          ? 'Settlement for'
+          : 'Termination for';
      return (
        <TableRow modifier="bordered">
-          <TableHeader scope="row">{getLabel(id, m)}</TableHeader>
+          <TableHeader scope="row">{type}</TableHeader>
          <TableCell modifier="bordered" data-testid={`m-${m.id}`}>
            <MarketLink id={m.id} />
          </TableCell>
@@ -57,38 +61,3 @@ export function OracleMarkets({ id }: OracleMarketsProps) {
    </TableRow>
  );
 }
-
-export function getLabel(
-  id: string,
-  m: ExplorerOracleForMarketsMarketFragment | null
-): string {
-  const settlementId =
-    ((m?.tradableInstrument?.instrument?.product?.__typename === 'Future' ||
-      m?.tradableInstrument?.instrument?.product?.__typename === 'Perpetual') &&
-      m?.tradableInstrument?.instrument?.product
-        ?.dataSourceSpecForSettlementData?.id) ||
-    null;
-
-  const terminationId =
-    (m?.tradableInstrument?.instrument?.product?.__typename === 'Future' &&
-      m?.tradableInstrument?.instrument?.product
-        ?.dataSourceSpecForTradingTermination?.id) ||
-    null;
-
-  const settlementScheduleId =
-    (m?.tradableInstrument?.instrument?.product?.__typename === 'Perpetual' &&
-      m?.tradableInstrument?.instrument?.product
-        ?.dataSourceSpecForSettlementSchedule?.id) ||
-    null;
-
-  switch (id) {
-    case settlementId:
-      return 'Settlement for';
-    case terminationId:
-      return 'Termination for';
-    case settlementScheduleId:
-      return 'Settlement schedule for';
-    default:
-      return 'Unknown';
-  }
-}
@@ -67,9 +67,6 @@ export function OracleSigners({ sourceType }: OracleDetailsSignersProps) {
  if (sourceType.__typename !== 'DataSourceDefinitionExternal') {
    return null;
  }
-  if (!('signers' in sourceType.sourceType)) {
-    return null;
-  }
  const signers = sourceType.sourceType.signers;

  if (!signers || signers.length === 0) {
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mikołaj Młodzikowski	b54f7d1240	feat(ci): remove extra files	2023-09-05 12:12:41 +02:00
Mikołaj Młodzikowski	149053f9e2	feat(ci): disable linting / building	2023-09-05 11:53:46 +02:00
Mikołaj Młodzikowski	6e6a4ff346	feat(ci): disable hooks	2023-09-05 11:53:02 +02:00
Mikołaj Młodzikowski	41bd7d7e53	feat(ci): deploy preview	2023-09-05 11:44:27 +02:00
@@ -1 +1 @@
 .20.2
 .15.1