chore: update tranches

Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
fix: market info data provider and oracle spec data - API changes (#1634 )
2022-10-18 12:05:35 +00:00 · 2022-10-18 12:56:19 +01:00 · 2022-10-18 11:40:26 +01:00 · 2022-10-18 09:58:44 +02:00 · 2022-10-18 06:26:49 +00:00 · 2022-10-18 00:13:32 +00:00
744 changed files with 24112 additions and 14308 deletions
@@ -0,0 +1,31 @@
+inputs:
+  all:
+    description: 'Install all binaries'
+    default: false
+  version:
+    description: 'Vega version'
+  gobin:
+    description: 'GOBIN path'
+    default: '/home/runner/go/bin'
+runs:
+  using: 'composite'
+  steps:
+    - name: Install Vega binaries
+      if: ${{ inputs.all }}
+      shell: bash
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip' -q
+        unzip vega-linux-amd64.zip -d ${{ inputs.gobin }}
+
+    - name: Install date-node binaries
+      if: ${{ inputs.all  }}
+      shell: bash
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip' -q
+        unzip data-node-linux-amd64.zip -d ${{ inputs.gobin }}
+
+    - name: Install Vega wallet binaries
+      shell: bash
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip' -q
+        unzip vegawallet-linux-amd64.zip -d ${{ inputs.gobin }}
@@ -0,0 +1,30 @@
+inputs:
+  github-token:
+    description: 'github token'
+runs:
+  using: 'composite'
+  steps:
+    - name: Checkout capsule
+      uses: actions/checkout@v2
+      with:
+        repository: vegaprotocol/vegacapsule
+        ref: main
+        token: ${{ inputs.github-token }}
+        path: './capsule'
+
+    - name: Build capsule
+      run: go install
+      shell: bash
+      working-directory: capsule
+
+    - name: Login to docker
+      shell: bash
+      run: echo -n ${{ inputs.github-token }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
+
+    - name: Start nomad
+      shell: bash
+      run: vegacapsule nomad &
+
+    - name: Bootstrap network
+      shell: bash
+      run: vegacapsule network bootstrap --config-path=./frontend-monorepo/vegacapsule/config.hcl --force
@@ -0,0 +1,45 @@
+inputs:
+  recovery:
+    description: 'Recovery phrase'
+  passphrase:
+    description: 'Wallet password'
+  capsule:
+    description: 'Is Capsule network used'
+    default: false
+runs:
+  using: 'composite'
+  steps:
+    - name: Create passphrase
+      shell: bash
+      run: echo "${{ inputs.passphrase }}" > ./passphrase
+
+    - name: Create recovery
+      shell: bash
+      run: echo "${{ inputs.recovery }}" > ./recovery
+
+    - name: Initialize wallet
+      shell: bash
+      run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
+
+    - name: Import wallet
+      shell: bash
+      run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+
+    - name: Create public key 2
+      shell: bash
+      run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+
+    - name: Import fairground network
+      shell: bash
+      if: ${{ inputs.capsule==false }}
+      run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks-internal/master/stagnet3/stagnet3.toml" --force --home ~/.vegacapsule/testnet/wallet
+
+    - name: Start service using fairground network
+      shell: bash
+      if: ${{ inputs.capsule==false }}
+      run: vegawallet service run --network stagnet3 --automatic-consent --no-version-check --home ~/.vegacapsule/testnet/wallet &
+
+    - name: Start service using capsule network
+      shell: bash
+      if: ${{ inputs.capsule==true }}
+      run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
@@ -1,4 +1,4 @@
-name: Capsule tests -- manual trigger
+name: Cypress tests -- manual trigger

 # This workflow runs the frontend tests against chosen branch

@@ -15,20 +15,43 @@ on:
          - stats-e2e
          - token-e2e
          - trading-e2e
-      runAlltests:
+      smokeOnly:
        description: 'Run only smoke tests?'
        required: true
        type: boolean
        default: false
+      skip-nx-cache:
+        description: 'Add --skip-nx-cache to cypress test'
+        required: false
+        type: boolean
+        default: false

 jobs:
  manual:
-    name: Run capsule tests -- manual trigger
+    name: Run Cypress tests -- manual trigger
    runs-on: self-hosted
    env:
      GO111MODULE: 'on'
-      VEGA_VERSION: 'v0.57.0'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.58.0'
    steps:
+      #######
+      ## Setup flags
+      #######
+
+      - name: Set smoke tag
+        if: ${{ github.event.inputs.smokeOnly == 'true' }}
+        run: echo TAGS="--env.grepTags @smoke" >> $GITHUB_ENV
+
+      - name: Set --skip-nx-cache flag
+        if: ${{ github.event.inputs.skip-nx-cache == 'true' }}
+        run: echo SKIP_NX_CACHE="--skip-nx-cache" >> $GITHUB_ENV
+
+      # See if we capsule is needed for this project
+      - name: Set capsule flag
+        if: ${{  github.event.inputs.project == 'explorer-e2e' || github.event.inputs.project == 'token-e2e' }}
+        run: echo RUN_CAPSULE=true >> $GITHUB_ENV
+
      #######
      ## Setup langs
      #######
@@ -37,6 +60,7 @@ jobs:
        id: go
        with:
          go-version: 1.19
+
      - name: Set up Node 16
        uses: actions/setup-node@v2
        id: npm
@@ -57,25 +81,9 @@ jobs:
      - name: Checkout frontend mono repo
        uses: actions/checkout@v2
        with:
-          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

-      # See if we capsule is needed for this project
-      - name: See if capsule is necessary
-        if: ${{  github.event.inputs.project == 'explorer-e2e' || github.event.inputs.project == 'token-e2e' }}
-        run: echo RUN_CAPSULE=true >> $GITHUB_ENV
-
-      # Checkout capsule to build local network
-      - name: Checkout capsule
-        if: ${{ env.RUN_CAPSULE }}
-        uses: actions/checkout@v2
-        with:
-          repository: vegaprotocol/vegacapsule
-          ref: main
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-          path: './capsule'
-
      # Restore node_modules from cache if possible
      - name: Restore node_modules from cache
        uses: actions/cache@v3
@@ -91,75 +99,32 @@ jobs:
        working-directory: frontend-monorepo

      #######
-      ## Build binaries
+      ## Build and run Vegacapsule network
      #######
-      - name: Build capsule
-        if: ${{ env.RUN_CAPSULE }}
-        run: go install
-        working-directory: capsule
-
-      - name: Set GOBIN
-        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV

      - name: Install Vega binaries
-        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip'
-          unzip vega-linux-amd64.zip -d ${{ env.GOBIN }}
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}

-      - name: Install date-node binaries
+      - name: Build and run Vegacapsule network
        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip'
-          unzip data-node-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      - name: Install Vega wallet binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip'
-          unzip vegawallet-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      ######
-      ## Start capsule
-      ######
-      - name: Login to docker
-        if: ${{ env.RUN_CAPSULE }}
-        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
-
-      - name: Start nomad
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule nomad &
-
-      - name: Bootstrap network
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl --force
-        working-directory: capsule
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######
-      - name: Create passphrase
-        run: echo "${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}" > ./passphrase
-      - name: Create recovery
-        run: echo "${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}" > ./recovery

-      - name: Initialize wallet
-        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
-      - name: Import wallet
-        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Create public key 2
-        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-      - name: Import fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks/master/fairground/fairground.toml" --force --home ~/.vegacapsule/testnet/wallet
-
-      - name: Start service using fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet service run --network fairground --automatic-consent --home ~/.vegacapsule/testnet/wallet &
-
-      - name: Start service using capsule network
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}

      ######
      ## Run some tests
@@ -170,24 +135,13 @@ jobs:
        run: yarn cypress install
        working-directory: frontend-monorepo

-      - name: Run smoke Cypress tests
-        if: ${{ github.event.inputs.runAlltests == 'true' }}
-        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke' --browser chrome
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
-
      - name: Run Cypress tests
-        if: ${{ github.event.inputs.runAlltests == 'false' }}
-        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
+        run: yarn nx run ${{ github.event.inputs.project }}:e2e ${{ env.SKIP_NX_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ env.TAGS }}
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

      ######
@@ -1,18 +1,22 @@
-name: Capsule tests -- night run
+name: Cypress tests -- night run

 # This workflow runs the frontend tests against latest develop of the core to preempt breaking changes

 on:
  schedule:
    - cron: '0 4 * * *'
+  workflow_dispatch:

 jobs:
  nightly:
-    name: Run capsule tests -- nightly
+    name: Run Cypress tests -- nightly
    runs-on: self-hosted
+    timeout-minutes: 60
    env:
      GO111MODULE: 'on'
-      VEGA_VERSION: 'v0.57.0'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.58.0'
+      RUN_CAPSULE: true
    steps:
      #######
      ## Setup langs
@@ -42,19 +46,9 @@ jobs:
      - name: Checkout frontend mono repo
        uses: actions/checkout@v2
        with:
-          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

-      # Checkout capsule to build local network
-      - name: Checkout capsule
-        uses: actions/checkout@v2
-        with:
-          repository: vegaprotocol/vegacapsule
-          ref: main
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-          path: './capsule'
-
      # Restore node_modules from cache if possible
      - name: Restore node_modules from cache
        uses: actions/cache@v3
@@ -70,59 +64,32 @@ jobs:
        working-directory: frontend-monorepo

      #######
-      ## Build binaries
+      ## Build and run Vegacapsule network
      #######
-      - name: Build capsule
-        run: go install
-        working-directory: capsule
-
-      - name: Set GOBIN
-        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV

      - name: Install Vega binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip'
-          unzip vega-linux-amd64.zip -d ${{ env.GOBIN }}
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}

-      - name: Install date-node binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip'
-          unzip data-node-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      - name: Install Vega wallet binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip'
-          unzip vegawallet-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      ######
-      ## Start capsule
-      ######
-      - name: Login to docker
-        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
-
-      - name: Start nomad
-        run: vegacapsule nomad &
-
-      - name: Bootstrap network
-        run: vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl --force
-        working-directory: capsule
+      - name: Build and run Vegacapsule network
+        if: ${{ env.RUN_CAPSULE }}
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######
-      - name: Create passphrase
-        run: echo "${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}" > ./passphrase
-      - name: Create recovery
-        run: echo "${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}" > ./recovery

-      - name: Initialize wallet
-        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
-      - name: Import wallet
-        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Create public key 2
-        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Start service
-        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}

      ######
      ## Run some tests
@@ -134,12 +101,12 @@ jobs:
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: yarn nx run-many --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
+        run: yarn nx run-many --skip-nx-cache --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_NIGHTLY_RUN: true
          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true

@@ -1,4 +1,4 @@
-name: Capsule tests
+name: Cypress tests

 on:
  push:
@@ -14,11 +14,13 @@ on:

 jobs:
  pr:
-    name: Run capsule tests - PR
+    name: Run Cypress tests - PR
    runs-on: self-hosted
+    timeout-minutes: 30
    env:
      GO111MODULE: 'on'
-      VEGA_VERSION: 'v0.57.0'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.58.0'
    steps:
      #######
      ## Setup langs
@@ -28,6 +30,7 @@ jobs:
        id: go
        with:
          go-version: 1.19
+
      - name: Set up Node 16
        uses: actions/setup-node@v2
        id: npm
@@ -48,7 +51,6 @@ jobs:
      - name: Checkout frontend mono repo
        uses: actions/checkout@v2
        with:
-          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

@@ -66,106 +68,55 @@ jobs:
        run: yarn install --frozen-lockfile
        working-directory: frontend-monorepo

-      # See affected apps to see if building all binaries is necessary
+      # Check SHAs
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
+        with:
+          working-directory: frontend-monorepo
+          main-branch-name: ${{ github.base_ref || github.ref_name }}
+          set-environment-variables-for-job: true
+
+      # See if we capsule is needed for this project
      - name: See affected apps
-        run: echo AFFECTED=$(yarn nx print-affected --base=origin/${{github.base_ref}} --head=${{github.head_ref}} --select=projects) >> $GITHUB_ENV
+        run: echo AFFECTED=$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects) >> $GITHUB_ENV
        working-directory: frontend-monorepo

      - name: See if capsule is necessary
        if: ${{ contains(env.AFFECTED, 'token') || contains(env.AFFECTED, 'token-e2e') || contains(env.AFFECTED, 'explorer') || contains(env.AFFECTED, 'explorer-e2e') }}
        run: echo RUN_CAPSULE=true >> $GITHUB_ENV

-      # Checkout capsule to build local network
-      - name: Checkout capsule
-        if: ${{ env.RUN_CAPSULE }}
-        uses: actions/checkout@v2
-        with:
-          repository: vegaprotocol/vegacapsule
-          ref: main
-          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-          path: './capsule'
-
      #######
-      ## Build binaries
+      ## Build and run Vegacapsule network
      #######
-      - name: Build capsule
-        if: ${{ env.RUN_CAPSULE }}
-        run: go install
-        working-directory: capsule
-
-      - name: Set GOBIN
-        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV

      - name: Install Vega binaries
-        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip'
-          unzip vega-linux-amd64.zip -d ${{ env.GOBIN }}
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}

-      - name: Install date-node binaries
+      - name: Build and run Vegacapsule network
        if: ${{ env.RUN_CAPSULE }}
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip'
-          unzip data-node-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      - name: Install Vega wallet binaries
-        run: |
-          wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip'
-          unzip vegawallet-linux-amd64.zip -d ${{ env.GOBIN }}
-
-      ######
-      ## Start capsule
-      ######
-      - name: Login to docker
-        if: ${{ env.RUN_CAPSULE }}
-        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
-
-      - name: Start nomad
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule nomad &
-
-      - name: Bootstrap network
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl --force
-        working-directory: capsule
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######
-      - name: Create passphrase
-        run: echo "${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}" > ./passphrase
-      - name: Create recovery
-        run: echo "${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}" > ./recovery

-      - name: Initialize wallet
-        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
-      - name: Import wallet
-        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-      - name: Create public key 2
-        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-      - name: Import fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks/master/fairground/fairground.toml" --force --home ~/.vegacapsule/testnet/wallet
-
-      - name: Start service using fairground network
-        if: ${{ env.RUN_CAPSULE==false }}
-        run: vegawallet service run --network fairground --automatic-consent --home ~/.vegacapsule/testnet/wallet &
-
-      - name: Start service using capsule network
-        if: ${{ env.RUN_CAPSULE }}
-        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}

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

-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          working-directory: frontend-monorepo
-          main-branch-name: ${{github.base_ref}}
-
      # To make sure that all Cypress binaries are installed properly
      - name: Install cypress bins
        run: yarn cypress install
@@ -177,8 +128,8 @@ jobs:
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: false

      ######
      ## Upload logs
@@ -3,7 +3,7 @@ name: Generate queries
 on:
  push:
    branches:
-      - master
+      - develop

 jobs:
  master:
@@ -30,6 +30,10 @@ An application for the status of the Vega network. Showing block height and othe

 Hosting for static content being shared across apps, for example fonts.

+### [Multisig-signer](./apps/multisig-signer)
+
+The utility dApp for validators wishing to add or remove themselves as a signer of the multisig contract.
+
 # 🧱 Libraries in this repo

 ### [UI toolkit](./libs/ui-toolkit)
@@ -1,26 +1,8 @@
-# React Environment Variables
-
-# https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#expanding-environment-variables-in-env
-
-# Netlify Environment Variables
-
-# https://www.netlify.com/docs/continuous-deployment/#environment-variables
-
-NX_VERSION=$npm_package_version
-NX_REPOSITORY_URL=$REPOSITORY_URL
-NX_BRANCH=$BRANCH
-NX_PULL_REQUEST=$PULL_REQUEST
-NX_HEAD=$HEAD
-NX_COMMIT_REF=$COMMIT_REF
-NX_CONTEXT=$CONTEXT
-NX_REVIEW_ID=$REVIEW_ID
-NX_INCOMING_HOOK_TITLE=$INCOMING_HOOK_TITLE
-NX_INCOMING_HOOK_URL=$INCOMING_HOOK_URL
-NX_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY
-NX_URL=$URL
-NX_DEPLOY_URL=$DEPLOY_URL
-NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
-
-NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
-NX_VEGA_ENV=TESTNET
-NX_VEGA_WALLET_URL=http://localhost:1789/api/v1
+# App configuration variables
+NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
+NX_VEGA_ENV=STAGNET3
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
+NX_VEGA_WALLET_URL=http://localhost:1789
@@ -25,7 +25,7 @@ module.exports = defineConfig({
  env: {
    TRADING_TEST_VEGA_WALLET_NAME: 'UI_Trading_Test',
    ETHEREUM_PROVIDER_URL:
-      'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
+      'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
    VEGA_PUBLIC_KEY:
      '47836c253520d2661bf5bed6339c0de08fd02cf5d4db0efee3b4373f20c7d278',
    VEGA_PUBLIC_KEY2:
@@ -33,7 +33,7 @@ module.exports = defineConfig({
    TRUNCATED_VEGA_PUBLIC_KEY: '47836c…c7d278',
    TRUNCATED_VEGA_PUBLIC_KEY2: '1a18cd…0cf2e4',
    ETHEREUM_WALLET_ADDRESS: '0x265Cc6d39a1B53d0d92068443009eE7410807158',
-    ETHERSCAN_URL: 'https://ropsten.etherscan.io',
+    ETHERSCAN_URL: 'https://sepolia.etherscan.io',
    tsConfig: 'tsconfig.json',
    TAGS: 'not @todo and not @ignore and not @manual',
    TRADING_TEST_VEGA_WALLET_PASSPHRASE: '123',
@@ -1,5 +1,17 @@
+import { aliasQuery } from '@vegaprotocol/cypress';
+import {
+  generateSimpleMarkets,
+  generateMarketsCandles,
+} from '../support/mocks/generate-markets';
+
 describe('simple trading app', { tags: '@smoke' }, () => {
-  beforeEach(() => cy.visit('/'));
+  beforeEach(() => {
+    cy.mockGQL((req) => {
+      aliasQuery(req, 'Markets', generateSimpleMarkets());
+      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
+    });
+    cy.visit('/');
+  });

  it('render', () => {
    cy.get('#root').should('exist');
@@ -1,9 +1,8 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
-import type { Markets } from '@vegaprotocol/market-list';
+import type { MarketsQuery } from '@vegaprotocol/market-list';
 import {
  generateLongListMarkets,
  generateSimpleMarkets,
-  generateMarketsData,
  generateMarketsCandles,
 } from '../support/mocks/generate-markets';

@@ -12,8 +11,7 @@ describe('market list', { tags: '@smoke' }, () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
-        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
      });
      cy.visit('/markets');
    });
@@ -68,8 +66,7 @@ describe('market list', { tags: '@smoke' }, () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
-        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
      });
    });

@@ -81,10 +78,10 @@ describe('market list', { tags: '@smoke' }, () => {
    it('last asset (if exists)', () => {
      cy.visit('/markets');
      cy.wait('@Markets').then((filters) => {
-        const data: Markets | undefined = filters?.response?.body?.data;
-        if (data.marketsConnection.edges.length) {
+        const data: MarketsQuery | undefined = filters?.response?.body?.data;
+        if (data?.marketsConnection?.edges.length) {
          const asset =
-            data.marketsConnection.edges[0].node.tradableInstrument.instrument
+            data?.marketsConnection?.edges[0].node.tradableInstrument.instrument
              .product.settlementAsset.symbol;
          cy.visit(`/markets/Suspended/Future/${asset}`);
          cy.getByTestId('market-assets-menu')
@@ -107,8 +104,7 @@ describe('market list', { tags: '@smoke' }, () => {
      cy.viewport(1440, 900);
      cy.mockGQL((req) => {
        aliasQuery(req, 'Markets', generateLongListMarkets(1000));
-        aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
-        aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
+        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
      });
      performance.mark('start-1k');
      cy.visit('/markets');
@@ -14,15 +14,15 @@ import { generatePartyMarketData } from '../support/mocks/generate-party-market-
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketNames } from '../support/mocks/generate-market-names';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
-import type { Market, Markets } from '@vegaprotocol/market-list';
+import type { Market, MarketsQuery } from '@vegaprotocol/market-list';

 describe('market selector', { tags: '@smoke' }, () => {
  let markets: Market[];
  beforeEach(() => {
    cy.mockGQL((req) => {
      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
-      aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
+      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
+      aliasQuery(req, 'MarketsData', generateMarketsData());
      aliasQuery(req, 'DealTicket', generateDealTicket());
      aliasQuery(req, 'MarketTags', generateMarketTags());
      aliasQuery(req, 'MarketPositions', generateMarketPositions());
@@ -36,9 +36,9 @@ describe('market selector', { tags: '@smoke' }, () => {

    cy.visit('/markets');
    cy.wait('@Markets').then((response) => {
-      const data: Markets | undefined = response?.response?.body?.data;
-      if (data.marketsConnection.edges.length) {
-        markets = data.marketsConnection.edges.map((edge) => edge.node);
+      const data: MarketsQuery | undefined = response?.response?.body?.data;
+      if (data?.marketsConnection?.edges.length) {
+        markets = data?.marketsConnection?.edges.map((edge) => edge.node);
      }
    });
  });
@@ -3,6 +3,7 @@ import {
  generateSimpleMarkets,
  generateMarketsCandles,
  generateMarketsData,
+  generateMarket,
 } from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
@@ -13,15 +14,15 @@ import { generatePartyMarketData } from '../support/mocks/generate-party-market-
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
 import { connectVegaWallet } from '../support/connect-wallet';
-import type { Markets, Market } from '@vegaprotocol/market-list';
+import type { MarketsQuery, Market } from '@vegaprotocol/market-list';

 describe('Market trade', { tags: '@smoke' }, () => {
  let markets: Market[];
  beforeEach(() => {
    cy.mockGQL((req) => {
      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandlesQuery', generateMarketsCandles());
-      aliasQuery(req, 'MarketsDataQuery', generateMarketsData());
+      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
+      aliasQuery(req, 'MarketsData', generateMarketsData());
      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
      aliasQuery(req, 'DealTicket', generateDealTicket());
      aliasQuery(req, 'MarketTags', generateMarketTags());
@@ -31,12 +32,13 @@ describe('Market trade', { tags: '@smoke' }, () => {
      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
      aliasQuery(req, 'MarketDepth', generateMarketDepth());
+      aliasQuery(req, 'Market', generateMarket());
    });
    cy.visit('/markets');
    cy.wait('@Markets').then((response) => {
-      const data: Markets | undefined = response?.response?.body?.data;
-      if (data.marketsConnection.edges.length) {
-        markets = data.marketsConnection.edges.map((edge) => edge.node);
+      const data: MarketsQuery | undefined = response?.response?.body?.data;
+      if (data?.marketsConnection?.edges.length) {
+        markets = data?.marketsConnection?.edges.map((edge) => edge.node);
      }
    });
  });
@@ -296,11 +298,7 @@ describe('Market trade', { tags: '@smoke' }, () => {

      cy.get('#step-3-panel').find('dd').eq(4).should('have.text', ' - ');

-      cy.getByTestId('place-order').click();
-      cy.getByTestId('dialog-title').should(
-        'have.text',
-        'Confirm transaction in wallet'
-      );
+      cy.getByTestId('place-order').should('be.enabled').click();
    }
  });

@@ -6,11 +6,17 @@ import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generatePositions,
  emptyPositions,
+  generateMargins,
 } from '../support/mocks/generate-positions';
 import { generateAccounts } from '../support/mocks/generate-accounts';
+import { generateAssets } from '../support/mocks/generate-assets';
 import { generateOrders } from '../support/mocks/generate-orders';
 import { generateFills } from '../support/mocks/generate-fills';
-import { generateFillsMarkets } from '../support/mocks/generate-markets';
+import {
+  generateFillsMarkets,
+  generateMarketsData,
+  generatePositionsMarkets,
+} from '../support/mocks/generate-markets';

 describe('Portfolio page', { tags: '@smoke' }, () => {
  afterEach(() => {
@@ -49,14 +55,18 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
        aliasQuery(req, 'Positions', generatePositions());
+        aliasQuery(req, 'Margins', generateMargins());
+        aliasQuery(req, 'Markets', generatePositionsMarkets());
+        aliasQuery(req, 'MarketsData', generateMarketsData());
        aliasQuery(req, 'Accounts', generateAccounts());
+        aliasQuery(req, 'Assets', generateAssets());
      });
      cy.visit('/portfolio/assets');
      connectVegaWallet();
    });

    it('data should be properly rendered', () => {
-      cy.get('.ag-center-cols-container .ag-row').should('have.length', 5);
+      cy.get('.ag-center-cols-container .ag-row').should('have.length', 3);
      cy.get(
        '.ag-center-cols-container [row-id="ACCOUNT_TYPE_GENERAL-asset-id-null"]'
      )
@@ -75,6 +85,10 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
      cy.mockGQL((req) => {
        aliasQuery(req, 'Positions', generatePositions());
        aliasQuery(req, 'Accounts', generateAccounts());
+        aliasQuery(req, 'Margins', generateMargins());
+        aliasQuery(req, 'Markets', generatePositionsMarkets());
+        aliasQuery(req, 'MarketsData', generateMarketsData());
+        aliasQuery(req, 'Assets', generateAssets());
      });
      cy.visit('/portfolio/positions');
      connectVegaWallet();
@@ -126,6 +140,9 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
        aliasQuery(req, 'Markets', {
          marketsConnection: { edges: [], __typename: 'MarketConnection' },
        });
+        aliasQuery(req, 'Assets', {
+          assetsConnection: { edges: null, __typename: 'AssetsConnection' },
+        });
      });
      cy.visit('/portfolio');
      connectVegaWallet();
@@ -133,22 +150,26 @@ describe('Portfolio page', { tags: '@smoke' }, () => {

    it('"No data to display" should be always displayed', () => {
      cy.getByTestId('assets').click();
-      cy.get('div.flex.items-center.justify-center').contains(
+      cy.get('div.flex.items-center.justify-center').should(
+        'contain.text',
        'No data to display'
      );

      cy.getByTestId('positions').click();
-      cy.get('div.flex.items-center.justify-center').contains(
+      cy.get('div.flex.items-center.justify-center').should(
+        'contain.text',
        'No data to display'
      );

      cy.getByTestId('orders').click();
-      cy.get('div.flex.items-center.justify-center').contains(
+      cy.get('div.flex.items-center.justify-center').should(
+        'contain.text',
        'No data to display'
      );

      cy.getByTestId('fills').click();
-      cy.get('div.flex.items-center.justify-center').contains(
+      cy.get('div.flex.items-center.justify-center').should(
+        'contain.text',
        'No data to display'
      );
    });
@@ -4,7 +4,9 @@ export const connectVegaWallet = () => {
  const walletPassphrase = Cypress.env('TRADING_TEST_VEGA_WALLET_PASSPHRASE');

  cy.getByTestId('connect-vega-wallet').click();
-  cy.getByTestId('connectors-list').find('button').click();
+  cy.getByTestId('connectors-list')
+    .find('[data-testid="connector-gui"]')
+    .click();
  cy.getByTestId(form).find('#wallet').click().type(walletName);
  cy.getByTestId(form).find('#passphrase').click().type(walletPassphrase);
  cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
@@ -18,4 +18,17 @@ import 'cypress-real-events/support';
 // Import commands.js using ES2015 syntax:
 import './commands';
 import registerCypressGrep from 'cypress-grep';
+import { aliasQuery } from '@vegaprotocol/cypress';
 registerCypressGrep();
+
+before(() => {
+  // Mock chainId fetch which happens on every page for wallet connection
+  cy.mockGQL((req) => {
+    aliasQuery(req, 'ChainId', {
+      statistics: {
+        __typename: 'Statistics',
+        chainId: 'vega-fairground-202210041151',
+      },
+    });
+  });
+});
@@ -1,5 +1,6 @@
 import type { Market } from '@vegaprotocol/market-list';
 import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
+import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';

 export const protoCandles = [
  { open: '9556163', close: '9587028', __typename: 'Candle' },
@@ -77,7 +78,7 @@ export const protoCandles = [
 ];

 export const protoMarket: Market = {
-  id: 'first-btcusd-id',
+  id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
  tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
  state: MarketState.STATE_ACTIVE,
  decimalPlaces: 5,
@@ -123,3 +124,24 @@ export const protoMarket: Market = {
  },
  __typename: 'Market',
 };
+
+export const singleMarket: SingleMarketFieldsFragment = {
+  ...protoMarket,
+  tradableInstrument: {
+    ...protoMarket.tradableInstrument,
+    instrument: {
+      ...protoMarket.tradableInstrument.instrument,
+      product: {
+        ...protoMarket.tradableInstrument.instrument.product,
+        settlementAsset: {
+          ...protoMarket.tradableInstrument.instrument.product.settlementAsset,
+          id: 'dai-id',
+          name: 'DAI Name',
+        },
+        oracleSpecForTradingTermination: {
+          id: 'oid',
+        },
+      },
+    },
+  },
+};
@@ -19,8 +19,6 @@ export const generateAccounts = (
          asset: {
            __typename: 'Asset',
            id: 'asset-id',
-            symbol: 'tEURO',
-            decimals: 5,
          },
        },
        {
@@ -29,20 +27,11 @@ export const generateAccounts = (
          balance: '100000000',
          market: {
            id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-            tradableInstrument: {
-              __typename: 'TradableInstrument',
-              instrument: {
-                __typename: 'Instrument',
-                name: 'AAVEDAI Monthly (30 Jun 2022)',
-              },
-            },
            __typename: 'Market',
          },
          asset: {
            __typename: 'Asset',
            id: 'asset-id-2',
-            symbol: 'tDAI',
-            decimals: 5,
          },
        },
        {
@@ -51,20 +40,11 @@ export const generateAccounts = (
          balance: '1000',
          market: {
            __typename: 'Market',
-            tradableInstrument: {
-              __typename: 'TradableInstrument',
-              instrument: {
-                __typename: 'Instrument',
-                name: '',
-              },
-            },
            id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
          },
          asset: {
            __typename: 'Asset',
            id: 'asset-id',
-            symbol: 'tEURO',
-            decimals: 5,
          },
        },
        {
@@ -73,20 +53,11 @@ export const generateAccounts = (
          balance: '1000',
          market: {
            __typename: 'Market',
-            tradableInstrument: {
-              __typename: 'TradableInstrument',
-              instrument: {
-                __typename: 'Instrument',
-                name: '',
-              },
-            },
            id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
          },
          asset: {
            __typename: 'Asset',
            id: 'asset-id-2',
-            symbol: 'tDAI',
-            decimals: 5,
          },
        },
        {
@@ -97,8 +68,6 @@ export const generateAccounts = (
          asset: {
            __typename: 'Asset',
            id: 'asset-0',
-            symbol: 'AST0',
-            decimals: 5,
          },
        },
      ],
@@ -0,0 +1,120 @@
+import merge from 'lodash/merge';
+import type { AssetsQuery } from '@vegaprotocol/assets';
+import { Schema as Types } from '@vegaprotocol/types';
+import type { PartialDeep } from 'type-fest';
+
+export const generateAssets = (override?: PartialDeep<AssetsQuery>) => {
+  const defaultAssets: AssetsQuery = {
+    assetsConnection: {
+      edges: [
+        {
+          node: {
+            id: 'asset-id',
+            symbol: 'tEURO',
+            decimals: 5,
+            name: 'Euro',
+            source: {
+              __typename: 'ERC20',
+              contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4',
+              lifetimeLimit: '1',
+              withdrawThreshold: '2',
+            },
+            quantum: '',
+            status: Types.AssetStatus.STATUS_ENABLED,
+            infrastructureFeeAccount: {
+              balance: '1',
+              __typename: 'Account',
+            },
+            globalRewardPoolAccount: {
+              balance: '2',
+              __typename: 'Account',
+            },
+            takerFeeRewardAccount: {
+              balance: '3',
+              __typename: 'Account',
+            },
+            makerFeeRewardAccount: {
+              balance: '4',
+              __typename: 'Account',
+            },
+            lpFeeRewardAccount: {
+              balance: '5',
+              __typename: 'Account',
+            },
+            marketProposerRewardAccount: {
+              balance: '6',
+              __typename: 'Account',
+            },
+            __typename: 'Asset',
+          },
+        },
+        {
+          node: {
+            id: 'asset-id-2',
+            symbol: 'tDAI',
+            decimals: 5,
+            name: 'DAI',
+            source: {
+              __typename: 'ERC20',
+              contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4',
+              lifetimeLimit: '1',
+              withdrawThreshold: '2',
+            },
+            quantum: '',
+            status: Types.AssetStatus.STATUS_ENABLED,
+            infrastructureFeeAccount: {
+              balance: '1',
+              __typename: 'Account',
+            },
+            globalRewardPoolAccount: {
+              balance: '2',
+              __typename: 'Account',
+            },
+            takerFeeRewardAccount: {
+              balance: '3',
+              __typename: 'Account',
+            },
+            makerFeeRewardAccount: {
+              balance: '4',
+              __typename: 'Account',
+            },
+            lpFeeRewardAccount: {
+              balance: '5',
+              __typename: 'Account',
+            },
+            marketProposerRewardAccount: {
+              balance: '6',
+              __typename: 'Account',
+            },
+            __typename: 'Asset',
+          },
+        },
+        {
+          node: {
+            id: 'asset-0',
+            symbol: 'AST0',
+            decimals: 5,
+            name: 'Asto',
+            source: {
+              __typename: 'BuiltinAsset',
+              maxFaucetAmountMint: '3',
+            },
+            quantum: '',
+            status: Types.AssetStatus.STATUS_ENABLED,
+            infrastructureFeeAccount: {
+              balance: '0',
+              __typename: 'Account',
+            },
+            globalRewardPoolAccount: null,
+            takerFeeRewardAccount: null,
+            makerFeeRewardAccount: null,
+            lpFeeRewardAccount: null,
+            marketProposerRewardAccount: null,
+            __typename: 'Asset',
+          },
+        },
+      ],
+    },
+  };
+  return merge(defaultAssets, override);
+};
@@ -1,7 +1,7 @@
 export const generateDealTicket = () => {
  return {
    market: {
-      id: 'first-btcusd-id',
+      id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
      decimalPlaces: 5,
      positionDecimalPlaces: 0,
      state: 'STATE_ACTIVE',
@@ -21,7 +21,7 @@ export const generateMarketPositions = () => {
          },
          balance: '265329',
          market: {
-            id: 'first-btcusd-id',
+            id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
            __typename: 'Market',
          },
        },
@@ -43,7 +43,7 @@ export const generateMarketPositions = () => {
            node: {
              openVolume: '12',
              market: {
-                id: 'first-btcusd-id',
+                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
                __typename: 'Market',
              },
              __typename: 'Position',
@@ -31,6 +31,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -50,6 +52,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -69,6 +73,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -88,6 +94,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      updatedAt: null,
      expiresAt: null,
      rejectionReason: null,
+      liquidityProvision: null,
+      peggedOrder: null,
    },
    {
      __typename: 'Order',
@@ -106,6 +114,8 @@ export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
      createdAt: new Date(2020, 1, 27).toISOString(),
      updatedAt: null,
      expiresAt: null,
+      liquidityProvision: null,
+      peggedOrder: null,
      rejectionReason: null,
    },
  ];
@@ -1,15 +1,15 @@
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 import type {
-  Positions,
-  Positions_party_positionsConnection_edges_node,
+  PositionsQuery,
+  PositionFieldsFragment,
+  MarginsQuery,
 } from '@vegaprotocol/positions';
-import { MarketTradingMode } from '@vegaprotocol/types';

 export const generatePositions = (
-  override?: PartialDeep<Positions>
-): Positions => {
-  const nodes: Positions_party_positionsConnection_edges_node[] = [
+  override?: PartialDeep<PositionsQuery>
+): PositionsQuery => {
+  const nodes: PositionFieldsFragment[] = [
    {
      __typename: 'Position',
      realisedPNL: '0',
@@ -17,49 +17,8 @@ export const generatePositions = (
      unrealisedPNL: '895000',
      averageEntryPrice: '1129935',
      updatedAt: '2022-07-28T15:09:34.441143Z',
-      marginsConnection: {
-        __typename: 'MarginConnection',
-        edges: [
-          {
-            __typename: 'MarginEdge',
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-              },
-              asset: {
-                __typename: 'Asset',
-                symbol: 'tDAI',
-              },
-            },
-          },
-        ],
-      },
      market: {
        id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-        tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-        data: {
-          markPrice: '17588787',
-          __typename: 'MarketData',
-          market: {
-            __typename: 'Market',
-            id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-          },
-        },
-        decimalPlaces: 5,
-        positionDecimalPlaces: 0,
-        tradableInstrument: {
-          instrument: {
-            name: 'UNIDAI Monthly (30 Jun 2022)',
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
        __typename: 'Market',
      },
    },
@@ -70,49 +29,8 @@ export const generatePositions = (
      unrealisedPNL: '895000',
      averageEntryPrice: '8509338',
      updatedAt: '2022-07-28T15:09:34.441143Z',
-      marginsConnection: {
-        __typename: 'MarginConnection',
-        edges: [
-          {
-            __typename: 'MarginEdge',
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-              },
-              asset: {
-                __typename: 'Asset',
-                symbol: 'tDAI',
-              },
-            },
-          },
-        ],
-      },
      market: {
        id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-        tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-        data: {
-          markPrice: '8649338',
-          __typename: 'MarketData',
-          market: {
-            __typename: 'Market',
-            id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-          },
-        },
-        decimalPlaces: 5,
-        positionDecimalPlaces: 0,
-        tradableInstrument: {
-          instrument: {
-            name: 'AAVEDAI Monthly (30 Jun 2022)',
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
        __typename: 'Market',
      },
    },
@@ -122,56 +40,15 @@ export const generatePositions = (
      unrealisedPNL: '-22519',
      averageEntryPrice: '84400088',
      updatedAt: '2022-07-28T14:53:54.725477Z',
-      marginsConnection: {
-        __typename: 'MarginConnection',
-        edges: [
-          {
-            __typename: 'MarginEdge',
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-              },
-              asset: {
-                __typename: 'Asset',
-                symbol: 'tEURO',
-              },
-            },
-          },
-        ],
-      },
      market: {
        id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-        tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-        data: {
-          markPrice: '84377569',
-          __typename: 'MarketData',
-          market: {
-            __typename: 'Market',
-            id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-          },
-        },
-        decimalPlaces: 5,
-        positionDecimalPlaces: 0,
-        tradableInstrument: {
-          instrument: {
-            name: 'Tesla Quarterly (30 Jun 2022)',
-            __typename: 'Instrument',
-          },
-          __typename: 'TradableInstrument',
-        },
        __typename: 'Market',
      },
      __typename: 'Position',
    },
  ];

-  const defaultResult: Positions = {
+  const defaultResult: PositionsQuery = {
    party: {
      __typename: 'Party',
      id: Cypress.env('VEGA_PUBLIC_KEY'),
@@ -190,7 +67,7 @@ export const generatePositions = (
  return merge(defaultResult, override);
 };

-export const emptyPositions = () => {
+export const emptyPositions = (): PositionsQuery => {
  return {
    party: {
      id: Cypress.env('VEGA_PUBLIC_KEY'),
@@ -199,3 +76,70 @@ export const emptyPositions = () => {
    },
  };
 };
+
+export const generateMargins = (): MarginsQuery => {
+  return {
+    party: {
+      id: Cypress.env('VEGA_PUBLIC_KEY'),
+      marginsConnection: {
+        edges: [
+          {
+            node: {
+              __typename: 'MarginLevels',
+              maintenanceLevel: '0',
+              searchLevel: '0',
+              initialLevel: '0',
+              collateralReleaseLevel: '0',
+              market: {
+                __typename: 'Market',
+                id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
+              },
+              asset: {
+                __typename: 'Asset',
+                id: 'tDAI-id',
+              },
+            },
+          },
+          {
+            node: {
+              __typename: 'MarginLevels',
+              maintenanceLevel: '0',
+              searchLevel: '0',
+              initialLevel: '0',
+              collateralReleaseLevel: '0',
+              market: {
+                __typename: 'Market',
+                id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
+              },
+              asset: {
+                __typename: 'Asset',
+                id: 'tDAI-id',
+              },
+            },
+            __typename: 'MarginEdge',
+          },
+          {
+            node: {
+              __typename: 'MarginLevels',
+              maintenanceLevel: '0',
+              searchLevel: '0',
+              initialLevel: '0',
+              collateralReleaseLevel: '0',
+              market: {
+                __typename: 'Market',
+                id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
+              },
+              asset: {
+                __typename: 'Asset',
+                id: 'tEURO-id',
+              },
+            },
+            __typename: 'MarginEdge',
+          },
+        ],
+        __typename: 'MarginConnection',
+      },
+      __typename: 'Party',
+    },
+  };
+};
@@ -1,6 +1,7 @@
 {
  "extends": "../../tsconfig.base.json",
  "compilerOptions": {
+    "strict": true,
    "jsx": "react-jsx",
    "sourceMap": false,
    "allowSyntheticDefaultImports": true,
@@ -20,8 +20,8 @@ NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
 NX_VEGA_CONFIG_URL="https://static.vega.xyz/assets/testnet-network.json"
 NX_VEGA_ENV = 'TESTNET'
 NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
-NX_VEGA_WALLET_URL=http://localhost:1789/api/v1
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
+NX_VEGA_WALLET_URL=http://localhost:1789
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_NETWORKS={"MAINNET":"https://alpha.console.vega.xyz"}
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -3,6 +3,6 @@ NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\"}
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
@@ -2,6 +2,6 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
-NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
@@ -3,6 +3,6 @@ NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_URL=https://api.n12.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
 NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
-NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://ropsten.etherscan.io
+NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -40,11 +40,7 @@ function App() {
                <div className="max-h-full min-h-full dark:bg-lite-black dark:text-neutral-200 bg-white text-neutral-800 grid grid-rows-[min-content,1fr]">
                  <Header />
                  <Main />
-                  <VegaConnectDialog
-                    connectors={Connectors}
-                    dialogOpen={vegaWalletDialog.connect}
-                    setDialogOpen={vegaWalletDialog.setConnect}
-                  />
+                  <VegaConnectDialog connectors={Connectors} />
                  <VegaManageDialog
                    dialogOpen={vegaWalletDialog.manage}
                    setDialogOpen={vegaWalletDialog.setManage}
@@ -105,9 +105,7 @@ const ConsoleLiteGrid = <T extends { id?: string }>(
  );
 };

-const ConsoleLiteGridForwarder = forwardRef(ConsoleLiteGrid) as <
-  T extends { id?: string }
->(
+const ConsoleLiteGridForwarder = forwardRef(ConsoleLiteGrid) as <T>(
  p: Props<T> & { ref?: React.Ref<AgGridReact> }
 ) => React.ReactElement;

@@ -37,13 +37,13 @@ const PARTY_BALANCE_QUERY = gql`

 export const DealTicketContainer = () => {
  const { marketId } = useParams<{ marketId: string }>();
-  const { keypair } = useVegaWallet();
+  const { pubKey } = useVegaWallet();

  const { data: partyData, loading } = useQuery<PartyBalanceQuery>(
    PARTY_BALANCE_QUERY,
    {
-      variables: { partyId: keypair?.pub },
-      skip: !keypair?.pub,
+      variables: { partyId: pubKey },
+      skip: !pubKey,
    }
  );

@@ -63,7 +63,7 @@ export const DealTicketContainer = () => {
              data.market.tradableInstrument.instrument.product?.settlementAsset
            }
            accounts={partyData?.party?.accounts || []}
-            isWalletConnected={!!keypair?.pub}
+            isWalletConnected={!!pubKey}
          />
        );

@@ -82,7 +82,7 @@ export const DealTicketContainer = () => {
  return (
    <section className="flex p-4 md:p-6">
      <section className="w-full md:w-1/2 md:min-w-[500px]">
-        {keypair ? container : <ConnectWallet />}
+        {pubKey ? container : <ConnectWallet />}
      </section>
      <Baubles />
    </section>
@@ -1,12 +1,17 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useForm, Controller } from 'react-hook-form';
 import { Stepper } from '../stepper';
 import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
+import {
+  getDefaultOrder,
+  useOrderValidation,
+  validateSize,
+} from '@vegaprotocol/deal-ticket';
 import { InputError } from '@vegaprotocol/ui-toolkit';
 import { BigNumber } from 'bignumber.js';
 import { MarketSelector } from '@vegaprotocol/deal-ticket';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { useVegaWallet, VegaTxStatus } from '@vegaprotocol/wallet';
 import {
  t,
@@ -15,14 +20,11 @@ import {
  removeDecimal,
 } from '@vegaprotocol/react-helpers';
 import {
-  getDefaultOrder,
-  useOrderValidation,
  useOrderSubmit,
  getOrderDialogTitle,
  getOrderDialogIntent,
  getOrderDialogIcon,
  OrderFeedback,
-  validateSize,
 } from '@vegaprotocol/orders';
 import { DealTicketSize } from './deal-ticket-size';
 import MarketNameRenderer from '../simple-market-list/simple-market-renderer';
@@ -59,7 +61,7 @@ export const DealTicketSteps = ({
    watch,
    setValue,
    formState: { errors },
-  } = useForm<Order>({
+  } = useForm<OrderSubmissionBody['orderSubmission']>({
    mode: 'onChange',
    defaultValues: getDefaultOrder(market),
  });
@@ -78,15 +80,15 @@ export const DealTicketSteps = ({
    fieldErrors: errors,
  });
  const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();
-  const { keypair } = useVegaWallet();
+  const { pubKey } = useVegaWallet();
  const estMargin = useOrderMargin({
    order,
    market,
-    partyId: keypair?.pub || '',
+    partyId: pubKey || '',
  });

  const maxTrade = useMaximumPositionSize({
-    partyId: keypair?.pub || '',
+    partyId: pubKey || '',
    accounts: partyData?.party?.accounts || [],
    marketId: market.id,
    settlementAssetId:
@@ -203,7 +205,7 @@ export const DealTicketSteps = ({
  );

  const onSubmit = useCallback(
-    (order: Order) => {
+    (order: OrderSubmissionBody['orderSubmission']) => {
      if (transactionStatus !== 'pending') {
        submit({
          ...order,
@@ -7,9 +7,8 @@ import {
 import * as React from 'react';
 import classNames from 'classnames';
 import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { SIDE_NAMES } from './side-selector';
-import SimpleMarketExpires from '../simple-market-list/simple-market-expires';
 import { gql, useQuery } from '@apollo/client';
 import type {
  MarketTags,
@@ -17,6 +16,7 @@ import type {
 } from './__generated__/MarketTags';
 import { DealTicketEstimates } from './deal-ticket-estimates';
 import { Side } from '@vegaprotocol/types';
+import { MarketExpires } from '@vegaprotocol/market-info';

 export const MARKET_TAGS_QUERY = gql`
  query MarketTags($marketId: ID!) {
@@ -36,7 +36,7 @@ interface Props {
  market: DealTicketMarketFragment;
  isDisabled: boolean;
  transactionStatus?: string;
-  order: Order;
+  order: OrderSubmissionBody['orderSubmission'];
  estCloseOut: string;
  estMargin: string;
  quoteName: string;
@@ -86,7 +86,7 @@ export default ({
            <div>
              {tagsData?.market?.tradableInstrument.instrument.metadata
                .tags && (
-                <SimpleMarketExpires
+                <MarketExpires
                  tags={
                    tagsData?.market.tradableInstrument.instrument.metadata.tags
                  }
@@ -1,53 +1,32 @@
-import { gql, useQuery } from '@apollo/client';
+import { useMemo } from 'react';
 import { DepositManager } from '@vegaprotocol/deposits';
-import { getEnabledAssets, t } from '@vegaprotocol/react-helpers';
+import { t } from '@vegaprotocol/react-helpers';
+import { enabledAssetsProvider } from '@vegaprotocol/assets';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { Web3Container } from '@vegaprotocol/web3';
-import type { DepositAssets } from './__generated__/DepositAssets';
-
-const DEPOSITS_QUERY = gql`
-  query DepositAssets {
-    assetsConnection {
-      edges {
-        node {
-          id
-          name
-          symbol
-          decimals
-          status
-          source {
-            ... on ERC20 {
-              contractAddress
-            }
-          }
-        }
-      }
-    }
-  }
-`;

 /**
 *  Fetches data required for the Deposit page
 */
 export const DepositContainer = () => {
  const { VEGA_ENV } = useEnvironment();
-  const { keypair } = useVegaWallet();
-
-  const { data, loading, error } = useQuery<DepositAssets>(DEPOSITS_QUERY, {
-    variables: { partyId: keypair?.pub },
-    skip: !keypair?.pub,
+  const { pubKey } = useVegaWallet();
+  const variables = useMemo(() => ({ partyId: pubKey }), [pubKey]);
+  const { data, loading, error } = useDataProvider({
+    dataProvider: enabledAssetsProvider,
+    variables,
+    skip: !pubKey,
  });

-  const assets = getEnabledAssets(data);
-
  return (
-    <AsyncRenderer<DepositAssets> data={data} loading={loading} error={error}>
-      {assets.length ? (
+    <AsyncRenderer data={data} loading={loading} error={error}>
+      {data && data.length ? (
        <Web3Container>
          <DepositManager
-            assets={assets}
+            assets={data}
            isFaucetable={VEGA_ENV !== Networks.MAINNET}
          />
        </Web3Container>
@@ -1,12 +1,16 @@
 import React, { useContext } from 'react';
 import { ThemeSwitcher } from '@vegaprotocol/ui-toolkit';
+import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import Logo from './logo';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
 import LocalContext from '../../context/local-context';

 const Header = () => {
+  const { updateVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+    updateVegaWalletDialog: store.updateVegaWalletDialog,
+  }));
  const {
-    vegaWalletDialog: { setConnect, setManage },
+    vegaWalletDialog: { setManage },
    theme,
    toggleTheme,
  } = useContext(LocalContext);
@@ -18,7 +22,7 @@ const Header = () => {
      <Logo />
      <div className="flex items-center gap-2 ml-auto relative z-10">
        <VegaWalletConnectButton
-          setConnectDialog={setConnect}
+          setConnectDialog={updateVegaWalletDialog}
          setManageDialog={setManage}
        />
        <ThemeSwitcher theme={theme} onToggle={toggleTheme} className="-my-4" />
@@ -1,16 +1,10 @@
-import { useMemo, useRef } from 'react';
+import { useMemo, useRef, useCallback } from 'react';
 import { useOutletContext } from 'react-router-dom';
 import type { AgGridReact } from 'ag-grid-react';
 import { PriceCell, useDataProvider } from '@vegaprotocol/react-helpers';
-import type {
-  AccountFieldsFragment,
-  AccountEventsSubscription,
-} from '@vegaprotocol/accounts';
-import {
-  accountsDataProvider,
-  accountsManagerUpdate,
-  getId,
-} from '@vegaprotocol/accounts';
+import type { AccountFields } from '@vegaprotocol/accounts';
+import { aggregatedAccountsDataProvider, getId } from '@vegaprotocol/accounts';
+import type { IGetRowsParams } from 'ag-grid-community';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import {
  AssetDetailsDialog,
@@ -20,20 +14,39 @@ import { NO_DATA_MESSAGE } from '../../../constants';
 import { ConsoleLiteGrid } from '../../console-lite-grid';
 import { useAccountColumnDefinitions } from '.';

-interface AccountObj extends AccountFieldsFragment {
-  id: string;
-}
-
 const AccountsManager = () => {
  const { partyId = '' } = useOutletContext<{ partyId: string }>();
  const { isOpen, symbol, setOpen } = useAssetDetailsDialogStore();
  const gridRef = useRef<AgGridReact | null>(null);
+  const dataRef = useRef<AccountFields[] | null>(null);
  const variables = useMemo(() => ({ partyId }), [partyId]);
-  const update = useMemo(() => accountsManagerUpdate(gridRef), []);
-  const { data, error, loading } = useDataProvider<
-    AccountFieldsFragment[],
-    AccountEventsSubscription['accounts']
-  >({ dataProvider: accountsDataProvider, update, variables });
+  const update = useCallback(
+    ({ data }: { data: AccountFields[] | null }) => {
+      dataRef.current = data;
+      gridRef.current?.api.refreshInfiniteCache();
+      return true;
+    },
+    [gridRef]
+  );
+  const { data, error, loading } = useDataProvider<AccountFields[], never>({
+    dataProvider: aggregatedAccountsDataProvider,
+    update,
+    variables,
+  });
+  if (!dataRef.current && data) {
+    dataRef.current = data;
+  }
+  const getRows = async ({
+    successCallback,
+    startRow,
+    endRow,
+  }: IGetRowsParams) => {
+    const rowsThisBlock = dataRef.current
+      ? dataRef.current.slice(startRow, endRow)
+      : [];
+    const lastRow = dataRef.current?.length ?? -1;
+    successCallback(rowsThisBlock, lastRow);
+  };
  const { columnDefs, defaultColDef } = useAccountColumnDefinitions();
  return (
    <>
@@ -43,8 +56,11 @@ const AccountsManager = () => {
        data={data}
        noDataMessage={NO_DATA_MESSAGE}
      >
-        <ConsoleLiteGrid<AccountObj>
-          rowData={data as AccountObj[]}
+        <ConsoleLiteGrid<AccountFields>
+          rowData={data?.length ? undefined : []}
+          rowModelType={data?.length ? 'infinite' : 'clientSide'}
+          ref={gridRef}
+          datasource={{ getRows }}
          columnDefs={columnDefs}
          defaultColDef={defaultColDef}
          components={{ PriceCell }}
@@ -1,45 +1,9 @@
 import React, { useMemo } from 'react';
 import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
-import type { SummaryRow } from '@vegaprotocol/react-helpers';
-import type { AccountFieldsFragment } from '@vegaprotocol/accounts';
+import type { AccountFields } from '@vegaprotocol/accounts';
 import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import type {
-  ColDef,
-  GroupCellRendererParams,
-  ValueFormatterParams,
-} from 'ag-grid-community';
-import type { AccountType } from '@vegaprotocol/types';
-import { AccountTypeMapping } from '@vegaprotocol/types';
-
-interface AccountsTableValueFormatterParams extends ValueFormatterParams {
-  data: AccountFieldsFragment;
-}
-
-const comparator = (
-  valueA: string,
-  valueB: string,
-  nodeA: { data: AccountFieldsFragment & SummaryRow },
-  nodeB: { data: AccountFieldsFragment & SummaryRow },
-  isInverted: boolean
-) => {
-  if (valueA < valueB) {
-    return -1;
-  }
-
-  if (valueA > valueB) {
-    return 1;
-  }
-
-  if (nodeA.data.__summaryRow) {
-    return isInverted ? -1 : 1;
-  }
-
-  if (nodeB.data.__summaryRow) {
-    return isInverted ? 1 : -1;
-  }
-
-  return 0;
-};
+import type { ColDef, GroupCellRendererParams } from 'ag-grid-community';
+import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';

 const useAccountColumnDefinitions = () => {
  const { open } = useAssetDetailsDialogStore();
@@ -49,7 +13,6 @@ const useAccountColumnDefinitions = () => {
        colId: 'account-asset',
        headerName: t('Asset'),
        field: 'asset.symbol',
-        comparator,
        headerClass: 'uppercase justify-start',
        cellClass: 'uppercase flex h-full items-center md:pl-4',
        cellRenderer: ({ value }: GroupCellRendererParams) =>
@@ -71,28 +34,34 @@ const useAccountColumnDefinitions = () => {
          ),
      },
      {
-        colId: 'type',
-        headerName: t('Type'),
-        field: 'type',
-        cellClass: 'uppercase !flex h-full items-center',
-        valueFormatter: ({ value }: ValueFormatterParams) =>
-          value ? AccountTypeMapping[value as AccountType] : '-',
-      },
-      {
-        colId: 'market',
-        headerName: t('Market'),
-        cellClass: 'uppercase !flex h-full items-center',
-        field: 'market.tradableInstrument.instrument.name',
-        valueFormatter: "value || '—'",
-      },
-      {
-        colId: 'balance',
-        headerName: t('Balance'),
-        field: 'balance',
-        cellClass: 'uppercase !flex h-full items-center',
+        colId: 'deposited',
+        headerName: t('Deposited'),
+        field: 'deposited',
        cellRenderer: 'PriceCell',
-        valueFormatter: ({ value, data }: AccountsTableValueFormatterParams) =>
-          addDecimalsFormatNumber(value, data.asset.decimals),
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<AccountFields, 'deposited'>) => {
+          if (value && data) {
+            return addDecimalsFormatNumber(value, data.asset.decimals);
+          }
+          return '-';
+        },
+      },
+      {
+        colId: 'used',
+        headerName: t('Used'),
+        field: 'used',
+        cellRenderer: 'PriceCell',
+        valueFormatter: ({
+          value,
+          data,
+        }: VegaValueFormatterParams<AccountFields, 'used'>) => {
+          if (value && data) {
+            return addDecimalsFormatNumber(value, data.asset.decimals);
+          }
+          return '-';
+        },
      },
    ];
  }, [open]);
@@ -1,7 +1,7 @@
 import { useRef } from 'react';
 import { useOutletContext } from 'react-router-dom';
 import type { AgGridReact } from 'ag-grid-react';
-import type { TradeWithMarket } from '@vegaprotocol/fills';
+import type { Trade } from '@vegaprotocol/fills';
 import { useFillsList } from '@vegaprotocol/fills';
 import type { BodyScrollEndEvent, BodyScrollEvent } from 'ag-grid-community';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
@@ -37,7 +37,7 @@ const FillsManager = () => {
      data={data?.length ? data : null}
      noDataMessage={NO_DATA_MESSAGE}
    >
-      <ConsoleLiteGrid<TradeWithMarket>
+      <ConsoleLiteGrid<Trade>
        ref={gridRef}
        rowModelType="infinite"
        datasource={{ getRows }}
@@ -1,6 +1,6 @@
 import { useMemo } from 'react';
 import type { ColDef, ValueFormatterParams } from 'ag-grid-community';
-import type { TradeWithMarket } from '@vegaprotocol/fills';
+import type { Trade } from '@vegaprotocol/fills';
 import classNames from 'classnames';
 import {
  addDecimal,
@@ -34,7 +34,7 @@ const useColumnDefinitions = ({ partyId }: Props) => {
        headerClass: 'uppercase',
        field: 'size',
        width: 100,
-        cellClass: ({ data }: { data: TradeWithMarket }) => {
+        cellClass: ({ data }: { data: Trade }) => {
          return classNames('!flex h-full items-center justify-center', {
            [positiveClassNames]: data?.buyer.id === partyId,
            [negativeClassNames]: data?.seller.id,
@@ -2,7 +2,7 @@ import { useRef, useState } from 'react';
 import type { AgGridReact } from 'ag-grid-react';
 import type { BodyScrollEndEvent, BodyScrollEvent } from 'ag-grid-community';
 import { useOutletContext } from 'react-router-dom';
-import type { OrderWithMarket } from '@vegaprotocol/orders';
+import type { Order } from '@vegaprotocol/orders';
 import {
  useOrderCancel,
  useOrderListData,
@@ -20,7 +20,7 @@ import useColumnDefinitions from './use-column-definitions';

 const OrdersManager = () => {
  const { partyId } = useOutletContext<{ partyId: string }>();
-  const [editOrder, setEditOrder] = useState<OrderWithMarket | null>(null);
+  const [editOrder, setEditOrder] = useState<Order | null>(null);
  const orderCancel = useOrderCancel();
  const orderEdit = useOrderEdit(editOrder);
  const { columnDefs, defaultColDef } = useColumnDefinitions({
@@ -54,7 +54,7 @@ const OrdersManager = () => {
      data={data?.length ? data : null}
      noDataMessage={NO_DATA_MESSAGE}
    >
-      <ConsoleLiteGrid<OrderWithMarket>
+      <ConsoleLiteGrid<Order>
        ref={gridRef}
        rowModelType={data?.length ? 'infinite' : 'clientSide'}
        rowData={data?.length ? undefined : []}
@@ -13,7 +13,7 @@ import {
 } from '@vegaprotocol/react-helpers';
 import type {
  Orders_party_ordersConnection_edges_node,
-  OrderWithMarket,
+  Order,
  CancelOrderArgs,
 } from '@vegaprotocol/orders';
 import { isOrderActive } from '@vegaprotocol/orders';
@@ -35,7 +35,7 @@ type StatusKey = keyof typeof OrderStatusMapping;
 type RejectReasonKey = keyof typeof OrderRejectionReasonMapping;
 type OrderTimeKey = keyof typeof OrderTimeInForceMapping;
 interface Props {
-  setEditOrder: (order: OrderWithMarket) => void;
+  setEditOrder: (order: Order) => void;
  orderCancel: {
    cancel: (args: CancelOrderArgs) => void;
    [key: string]: unknown;
@@ -6,11 +6,11 @@ import { HorizontalMenu } from '../horizontal-menu';
 import * as constants from './constants';

 export const Portfolio = () => {
-  const { keypair } = useVegaWallet();
+  const { pubKey } = useVegaWallet();
  const { pathname } = useLocation();
  const module = pathname.split('/portfolio/')?.[1] ?? '';
-  const outlet = useOutlet({ partyId: keypair?.pub || '' });
-  if (!keypair) {
+  const outlet = useOutlet({ partyId: pubKey || '' });
+  if (!pubKey) {
    return (
      <section className="xl:w-1/2">
        <ConnectWallet />
@@ -11,7 +11,7 @@ import type {
  PositionsTableValueFormatterParams,
  Position,
 } from '@vegaprotocol/positions';
-import { AmountCell, ProgressBarCell } from '@vegaprotocol/positions';
+import { AmountCell } from '@vegaprotocol/positions';
 import type {
  CellRendererSelectorResult,
  ICellRendererParams,
@@ -20,7 +20,7 @@ import type {
  ColDef,
 } from 'ag-grid-community';
 import { MarketTradingMode } from '@vegaprotocol/types';
-import { Intent } from '@vegaprotocol/ui-toolkit';
+import { Intent, ProgressBarCell } from '@vegaprotocol/ui-toolkit';

 const EmptyCell = () => '';

@@ -1,34 +0,0 @@
-import React from 'react';
-import { format, isValid, parseISO } from 'date-fns';
-import { EXPIRE_DATE_FORMAT } from '../../constants';
-
-const SimpleMarketExpires = ({
-  tags,
-}: {
-  tags: ReadonlyArray<string> | null;
-}) => {
-  if (tags) {
-    const dateFound = tags.reduce<Date | null>((agg, tag) => {
-      const parsed = parseISO(
-        (tag.match(/^settlement.*:/) &&
-          tag
-            .split(':')
-            .filter((item, i) => i)
-            .join(':')) as string
-      );
-      if (isValid(parsed)) {
-        agg = parsed;
-      }
-      return agg;
-    }, null);
-    return dateFound ? (
-      <div className="p-2 text-ui-small border border-pink text-pink inline-block">{`${format(
-        dateFound as Date,
-        EXPIRE_DATE_FORMAT
-      )}`}</div>
-    ) : null;
-  }
-  return null;
-};
-
-export default SimpleMarketExpires;
@@ -58,21 +58,17 @@ let marketsMock = [
  },
 ] as unknown as Market[];

-const LIB = '@vegaprotocol/market-list';
-const useMarketList = () => {
+const LIB = '@vegaprotocol/react-helpers';
+const useDataProvider = () => {
  return {
-    data: {
-      markets: marketsMock,
-      marketsData: [],
-      marketsCandles: [],
-    },
+    data: marketsMock,
    loading: false,
    error: false,
  };
 };
 jest.mock(LIB, () => ({
  ...jest.requireActual(LIB),
-  useMarketList: jest.fn(() => useMarketList()),
+  useDataProvider: jest.fn(() => useDataProvider()),
 }));

 const mockIsTradable = jest.fn((_arg) => true);
@@ -1,7 +1,11 @@
-import React, { useCallback, useEffect, useRef } from 'react';
+import { useCallback, useEffect, useRef, useMemo } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 import type { AgGridReact } from 'ag-grid-react';
-import { useScreenDimensions } from '@vegaprotocol/react-helpers';
+import {
+  useScreenDimensions,
+  useDataProvider,
+  useYesterday,
+} from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
 import type { MarketState } from '@vegaprotocol/types';
 import useMarketsFilterData from './use-markets-filter-data';
@@ -9,8 +13,9 @@ import useColumnDefinitions from './use-column-definitions';
 import SimpleMarketToolbar from './simple-market-toolbar';
 import { IS_MARKET_TRADABLE } from '../../constants';
 import { ConsoleLiteGrid } from '../console-lite-grid';
-import type { Market, MarketsListData } from '@vegaprotocol/market-list';
-import { useMarketList } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/market-list';
+import { Interval } from '@vegaprotocol/types';
+import { marketsWithCandlesProvider } from '@vegaprotocol/market-list';

 export type MarketWithPercentChange = Market & {
  percentChange?: number | '-';
@@ -29,8 +34,19 @@ const SimpleMarketList = () => {
  const statusesRef = useRef<Record<string, MarketState | ''>>({});
  const gridRef = useRef<AgGridReact | null>(null);

-  const { data, error, loading } = useMarketList();
-  const localData = useMarketsFilterData(data as MarketsListData, params);
+  const yesterday = useYesterday();
+  const variables = useMemo(() => {
+    return {
+      since: new Date(yesterday).toISOString(),
+      interval: Interval.INTERVAL_I1H,
+    };
+  }, [yesterday]);
+  const { data, error, loading } = useDataProvider({
+    dataProvider: marketsWithCandlesProvider,
+    variables,
+    noUpdate: true,
+  });
+  const localData = useMarketsFilterData(data, params);

  const handleOnGridReady = useCallback(() => {
    gridRef.current?.api?.sizeColumnsToFit();
@@ -38,7 +54,7 @@ const SimpleMarketList = () => {

  useEffect(() => {
    const statuses: Record<string, MarketState | ''> = {};
-    data?.markets?.forEach((market) => {
+    data?.forEach((market) => {
      statuses[market.id] = market.state || '';
    });
    statusesRef.current = statuses;
@@ -62,7 +78,7 @@ const SimpleMarketList = () => {

  return (
    <div className="h-full p-4 md:p-6 grid grid-rows-[min-content,1fr]">
-      <SimpleMarketToolbar data={data?.markets || []} />
+      <SimpleMarketToolbar data={data || []} />
      <AsyncRenderer loading={loading} error={error} data={localData}>
        <ConsoleLiteGrid<MarketWithPercentChange>
          classNamesParam="mb-32 min-h-[300px]"
@@ -70,6 +86,7 @@ const SimpleMarketList = () => {
          rowData={localData}
          defaultColDef={defaultColDef}
          handleRowClicked={handleRowClicked}
+          getRowId={({ data }) => data.id}
        />
      </AsyncRenderer>
    </div>
@@ -1,7 +1,7 @@
 import { useEffect, useState } from 'react';
 import classNames from 'classnames';
 import { InView } from 'react-intersection-observer';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { useDataProvider, useYesterday } from '@vegaprotocol/react-helpers';
 import type { Candle } from '@vegaprotocol/market-list';
 import { marketCandlesProvider } from '@vegaprotocol/market-list';
 import { Interval } from '@vegaprotocol/types';
@@ -68,13 +68,13 @@ const SimpleMarketPercentChangeWrapper = (props: Props) => {
 };

 const SimpleMarketPercentChange = ({ candles, marketId, setValue }: Props) => {
-  const yesterday = Math.round(new Date().getTime() / 1000) - 24 * 3600;
+  const yesterday = useYesterday();
  const { data } = useDataProvider({
    dataProvider: marketCandlesProvider,
    variables: {
      marketId,
      interval: Interval.INTERVAL_I1D,
-      since: new Date(yesterday * 1000).toISOString(),
+      since: new Date(yesterday).toISOString(),
    },
  });

@@ -1,6 +1,6 @@
 import classNames from 'classnames';
-import SimpleMarketExpires from './simple-market-expires';
 import type { Market } from '@vegaprotocol/market-list';
+import { MarketExpires } from '@vegaprotocol/market-info';

 interface Props {
  market: Market;
@@ -19,7 +19,7 @@ const MarketNameRenderer = ({ market, isMobile }: Props) => {
        {isMobile
          ? market.tradableInstrument.instrument.code
          : market.tradableInstrument.instrument.name}{' '}
-        <SimpleMarketExpires
+        <MarketExpires
          tags={market.tradableInstrument.instrument.metadata.tags}
        />
      </div>
@@ -15,13 +15,13 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { MarketState } from '@vegaprotocol/types';
 import useMarketFiltersData from '../../hooks/use-markets-filter';
-import type { Markets_marketsConnection_edges_node } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/market-list';
 import { HorizontalMenu } from '../horizontal-menu';
 import type { HorizontalMenuItem } from '../horizontal-menu';
 import * as constants from './constants';

 interface Props {
-  data: Markets_marketsConnection_edges_node[];
+  data: Market[];
 }

 const SimpleMarketToolbar = ({ data }: Props) => {
@@ -7,7 +7,7 @@ import { Icon } from '@vegaprotocol/ui-toolkit';
 import type { ValueSetterParams } from 'ag-grid-community';
 import { IconNames } from '@blueprintjs/icons';
 import { IS_MARKET_TRADABLE, MARKET_STATES_MAP } from '../../constants';
-import type { Candle, Market } from '@vegaprotocol/market-list';
+import type { MarketWithCandles as Market } from '@vegaprotocol/market-list';

 interface Props {
  isMobile: boolean;
@@ -69,15 +69,16 @@ const useColumnDefinitions = ({ isMobile }: Props) => {
          data,
          setValue,
        }: {
-          data: { id: string; candles: Candle[] };
+          data: Market;
          setValue: (arg: unknown) => void;
-        }) => (
-          <SimpleMarketPercentChange
-            candles={data.candles}
-            marketId={data.id}
-            setValue={setValue}
-          />
-        ),
+        }) =>
+          data.candles && (
+            <SimpleMarketPercentChange
+              candles={data.candles}
+              marketId={data.id}
+              setValue={setValue}
+            />
+          ),
        comparator: (valueA: number | '-', valueB: number | '-') => {
          if (valueA === valueB) return 0;
          if (valueA === '-') {
@@ -1,12 +1,15 @@
 import { useMemo } from 'react';
 import { MarketState } from '@vegaprotocol/types';
-import type { MarketsListData } from '@vegaprotocol/market-list';
+import type { MarketWithCandles } from '@vegaprotocol/market-list';
 import type { RouterParams } from './simple-market-list';

-const useMarketsFilterData = (data: MarketsListData, params: RouterParams) => {
+const useMarketsFilterData = (
+  data: MarketWithCandles[] | null,
+  params: RouterParams
+) => {
  return useMemo(() => {
-    const markets =
-      data?.markets?.filter((item) => {
+    return (
+      data?.filter((item) => {
        if (
          params.product &&
          params.product !==
@@ -32,21 +35,9 @@ const useMarketsFilterData = (data: MarketsListData, params: RouterParams) => {
          return false;
        }
        return true;
-      }) || [];
-
-    return markets.map((market) => ({
-      ...market,
-      candles: (data?.marketsCandles || [])
-        .filter((c) => c.marketId === market.id)
-        .map((c) => c.candles),
-    }));
-  }, [
-    data?.marketsCandles,
-    data?.markets,
-    params.product,
-    params.asset,
-    params.state,
-  ]);
+      }) || []
+    );
+  }, [data, params.product, params.asset, params.state]);
 };

 export default useMarketsFilterData;
@@ -10,8 +10,8 @@ export const VegaWalletConnectButton = ({
  setConnectDialog,
  setManageDialog,
 }: VegaWalletConnectButtonProps) => {
-  const { keypair } = useVegaWallet();
-  const isConnected = keypair !== null;
+  const { pubKey } = useVegaWallet();
+  const isConnected = pubKey !== null;

  const handleClick = () => {
    if (isConnected) {
@@ -31,7 +31,7 @@ export const VegaWalletConnectButton = ({
        onClick={handleClick}
        className="ml-auto inline-block text-ui-small font-mono hover:underline"
      >
-        {isConnected ? truncateByChars(keypair.pub) : 'Connect Vega wallet'}
+        {isConnected ? truncateByChars(pubKey) : 'Connect Vega wallet'}
      </button>
    </span>
  );
@@ -1,13 +1,12 @@
+import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { t } from '@vegaprotocol/react-helpers';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import * as React from 'react';
-import { useContext } from 'react';
-import LocalContext from '../../context/local-context';

 const ConnectWallet = () => {
-  const {
-    vegaWalletDialog: { setConnect },
-  } = useContext(LocalContext);
+  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
+    openVegaWalletDialog: store.openVegaWalletDialog,
+  }));
  return (
    <section
      className="p-8 bg-white-normal dark:bg-offBlack"
@@ -17,7 +16,7 @@ const ConnectWallet = () => {
        {t('Please connect your Vega wallet to make a trade')}
      </h3>
      <div className="mb-4">
-        <Button variant="primary" onClick={() => setConnect(true)} size="lg">
+        <Button variant="primary" onClick={openVegaWalletDialog} size="lg">
          {t('Connect Vega wallet')}
        </Button>
      </div>
@@ -3,7 +3,6 @@ import { t } from '@vegaprotocol/react-helpers';
 import type { Market } from '@vegaprotocol/market-list';

 export const DATE_FORMAT = 'dd MMMM yyyy HH:mm';
-export const EXPIRE_DATE_FORMAT = 'MMM dd';

 export const TRADABLE_STATES = {
  [MarketState.STATE_ACTIVE]: true,
@@ -1,9 +1,7 @@
 import { createContext } from 'react';

 export interface VegaWalletDialogState {
-  connect: boolean;
  manage: boolean;
-  setConnect: (isOpen: boolean) => void;
  setManage: (isOpen: boolean) => void;
 }

@@ -1,7 +1,7 @@
 import { MockedProvider } from '@apollo/client/testing';
 import { renderHook } from '@testing-library/react';
 import { Side } from '@vegaprotocol/types';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import useCalculateSlippage from './use-calculate-slippage';

 const mockData = {
@@ -84,7 +84,10 @@ describe('useCalculateSlippage Hook', () => {
        () =>
          useCalculateSlippage({
            marketId: 'marketId',
-            order: { size: '10', side: Side.SIDE_BUY } as Order,
+            order: {
+              size: '10',
+              side: Side.SIDE_BUY,
+            } as OrderSubmissionBody['orderSubmission'],
          }),
        {
          wrapper: MockedProvider,
@@ -98,7 +101,10 @@ describe('useCalculateSlippage Hook', () => {
        () =>
          useCalculateSlippage({
            marketId: 'marketId',
-            order: { size: '10', side: Side.SIDE_SELL } as Order,
+            order: {
+              size: '10',
+              side: Side.SIDE_SELL,
+            } as OrderSubmissionBody['orderSubmission'],
          }),
        {
          wrapper: MockedProvider,
@@ -121,7 +127,10 @@ describe('useCalculateSlippage Hook', () => {
        () =>
          useCalculateSlippage({
            marketId: 'marketId',
-            order: { size: '10', side: Side.SIDE_SELL } as Order,
+            order: {
+              size: '10',
+              side: Side.SIDE_SELL,
+            } as OrderSubmissionBody['orderSubmission'],
          }),
        {
          wrapper: MockedProvider,
@@ -2,8 +2,8 @@ import { useMemo } from 'react';
 import { Side } from '@vegaprotocol/types';
 import { useOrderBookData } from '@vegaprotocol/market-depth';
 import { marketProvider } from '@vegaprotocol/market-list';
-import type { Market } from '@vegaprotocol/market-list';
-import type { Order } from '@vegaprotocol/orders';
+import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { BigNumber } from 'bignumber.js';
 import {
  formatNumber,
@@ -13,7 +13,7 @@ import {

 interface Props {
  marketId: string;
-  order: Order;
+  order: OrderSubmissionBody['orderSubmission'];
 }

 const useCalculateSlippage = ({ marketId, order }: Props) => {
@@ -22,7 +22,7 @@ const useCalculateSlippage = ({ marketId, order }: Props) => {
    variables,
    throttleMilliseconds: 5000,
  });
-  const { data: market } = useDataProvider<Market, never>({
+  const { data: market } = useDataProvider<SingleMarketFieldsFragment, never>({
    dataProvider: marketProvider,
    noUpdate: true,
    variables,
@@ -7,12 +7,9 @@ describe('local values hook', () => {
    const { result } = renderHook(() => useLocalValues('light', setTheme));
    expect(result.current.vegaWalletDialog).toBeDefined();
    expect(result.current.vegaWalletDialog.manage).toBe(false);
-    expect(result.current.vegaWalletDialog.connect).toBe(false);
    act(() => {
-      result.current.vegaWalletDialog.setConnect(true);
      result.current.vegaWalletDialog.setManage(true);
    });
    expect(result.current.vegaWalletDialog.manage).toBe(true);
-    expect(result.current.vegaWalletDialog.connect).toBe(true);
  });
 });
@@ -2,17 +2,16 @@ import { useMemo, useState } from 'react';
 import type { LocalValues } from '../context/local-context';

 const useLocalValues = (theme: 'light' | 'dark', toggleTheme: () => void) => {
-  const [connect, setConnect] = useState<boolean>(false);
  const [manage, setManage] = useState<boolean>(false);
  const [menuOpen, setMenuOpen] = useState(false);
  return useMemo<LocalValues>(
    () => ({
-      vegaWalletDialog: { connect, manage, setConnect, setManage },
+      vegaWalletDialog: { manage, setManage },
      menu: { menuOpen, setMenuOpen, onToggle: () => setMenuOpen(!menuOpen) },
      theme,
      toggleTheme,
    }),
-    [connect, manage, theme, toggleTheme, menuOpen]
+    [manage, theme, toggleTheme, menuOpen]
  );
 };

@@ -14,6 +14,9 @@ const useMarketFilters = (data: Market[]) => {
      const product = item.tradableInstrument.instrument.product.__typename;
      const asset =
        item.tradableInstrument.instrument.product.settlementAsset.symbol;
+      if (!product) {
+        return;
+      }
      if (!(product in localAssetPerProduct)) {
        localAssetPerProduct[product] = new Set<string>();
      }
@@ -1,5 +1,5 @@
 import useMarketPositions from './use-market-positions';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import type { PartyBalanceQuery_party_accounts } from '../components/deal-ticket/__generated__/PartyBalanceQuery';
 import { useSettlementAccount } from './use-settlement-account';
 import { AccountType, Side } from '@vegaprotocol/types';
@@ -11,7 +11,7 @@ interface Props {
  marketId: string;
  price?: string;
  settlementAssetId: string;
-  order: Order;
+  order: OrderSubmissionBody['orderSubmission'];
 }

 const getSize = (balance: string, price: string) =>
@@ -2,7 +2,7 @@ import * as React from 'react';
 import { renderHook } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
 import useOrderCloseOut from './use-order-closeout';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
 import type { PartyBalanceQuery } from '../components/deal-ticket/__generated__/PartyBalanceQuery';

@@ -48,7 +48,7 @@ describe('useOrderCloseOut Hook', () => {
    const { result } = renderHook(
      () =>
        useOrderCloseOut({
-          order: order as Order,
+          order: order as OrderSubmissionBody['orderSubmission'],
          market: market as DealTicketMarketFragment,
          partyData: partyData as PartyBalanceQuery,
        }),
@@ -65,7 +65,10 @@ describe('useOrderCloseOut Hook', () => {
    const { result } = renderHook(
      () =>
        useOrderCloseOut({
-          order: { ...order, side: 'SIDE_SELL' } as Order,
+          order: {
+            ...order,
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
          market: market as DealTicketMarketFragment,
          partyData: partyData as PartyBalanceQuery,
        }),
@@ -82,7 +85,10 @@ describe('useOrderCloseOut Hook', () => {
    const { result } = renderHook(
      () =>
        useOrderCloseOut({
-          order: { ...order, side: 'SIDE_SELL' } as Order,
+          order: {
+            ...order,
+            side: 'SIDE_SELL',
+          } as OrderSubmissionBody['orderSubmission'],
          market: market as DealTicketMarketFragment,
        }),
      {
@@ -1,5 +1,5 @@
 import { BigNumber } from 'bignumber.js';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
 import type { PartyBalanceQuery } from '../components/deal-ticket/__generated__/PartyBalanceQuery';
 import { useSettlementAccount } from './use-settlement-account';
@@ -46,13 +46,13 @@ const CLOSEOUT_PRICE_QUERY = gql`
 `;

 interface Props {
-  order: Order;
+  order: OrderSubmissionBody['orderSubmission'];
  market: DealTicketMarketFragment;
  partyData?: PartyBalanceQuery;
 }

 const useOrderCloseOut = ({ order, market, partyData }: Props): string => {
-  const { keypair } = useVegaWallet();
+  const { pubKey } = useVegaWallet();
  const account = useSettlementAccount(
    market.tradableInstrument.instrument.product.settlementAsset.id,
    partyData?.party?.accounts || []
@@ -61,15 +61,15 @@ const useOrderCloseOut = ({ order, market, partyData }: Props): string => {
    CLOSEOUT_PRICE_QUERY,
    {
      pollInterval: 5000,
-      variables: { partyId: keypair?.pub || '' },
-      skip: !keypair?.pub,
+      variables: { partyId: pubKey || '' },
+      skip: !pubKey,
    }
  );

  const markPriceData = useMarketData(market.id);
  const marketPositions = useMarketPositions({
    marketId: market.id,
-    partyId: keypair?.pub || '',
+    partyId: pubKey || '',
  });

  const marginMaintenanceLevel = new BigNumber(
@@ -1,7 +1,7 @@
 import { renderHook } from '@testing-library/react';
 import { useQuery } from '@apollo/client';
 import { BigNumber } from 'bignumber.js';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
 import type { PositionMargin } from './use-market-positions';
 import useOrderMargin from './use-order-margin';
@@ -53,7 +53,7 @@ describe('useOrderMargin Hook', () => {
  it('margin should be properly calculated', () => {
    const { result } = renderHook(() =>
      useOrderMargin({
-        order: order as Order,
+        order: order as OrderSubmissionBody['orderSubmission'],
        market: market as DealTicketMarketFragment,
        partyId,
      })
@@ -71,7 +71,7 @@ describe('useOrderMargin Hook', () => {
  it('fees should be properly calculated', () => {
    const { result } = renderHook(() =>
      useOrderMargin({
-        order: order as Order,
+        order: order as OrderSubmissionBody['orderSubmission'],
        market: market as DealTicketMarketFragment,
        partyId,
      })
@@ -83,7 +83,7 @@ describe('useOrderMargin Hook', () => {
    mockMarketPositions = null;
    const { result } = renderHook(() =>
      useOrderMargin({
-        order: order as Order,
+        order: order as OrderSubmissionBody['orderSubmission'],
        market: market as DealTicketMarketFragment,
        partyId,
      })
@@ -110,7 +110,7 @@ describe('useOrderMargin Hook', () => {
    };
    const { result } = renderHook(() =>
      useOrderMargin({
-        order: order as Order,
+        order: order as OrderSubmissionBody['orderSubmission'],
        market: market as DealTicketMarketFragment,
        partyId,
      })
@@ -1,5 +1,5 @@
 import { BigNumber } from 'bignumber.js';
-import type { Order } from '@vegaprotocol/orders';
+import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { gql, useQuery } from '@apollo/client';
 import type {
  EstimateOrder,
@@ -46,7 +46,7 @@ export const ESTIMATE_ORDER_QUERY = gql`
 `;

 interface Props {
-  order: Order;
+  order: OrderSubmissionBody['orderSubmission'];
  market: DealTicketMarketFragment;
  partyId: string;
 }
@@ -10,7 +10,7 @@ module.exports = defineConfig({
    },
    baseUrl: 'http://localhost:3000',
    fileServerFolder: '.',
-    fixturesFolder: false,
+    fixturesFolder: './src/fixtures',
    specPattern: '**/*.cy.{js,jsx,ts,tsx}',
    modifyObstructiveCode: false,
    supportFile: './src/support/index.js',
@@ -25,11 +25,16 @@ module.exports = defineConfig({
  env: {
    environment: 'CUSTOM',
    networkQueryUrl: 'http://localhost:3028/query',
-    ethUrl: 'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
+    ethUrl: 'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
    commitHash: 'dev',
+    CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true,
    tsConfig: 'tsconfig.json',
    grepTags: '@regression @smoke @slow',
    grepFilterSpecs: true,
    grepOmitFiltered: true,
+    vegaWalletName: 'capsule_wallet',
+    vegaWalletLocation: '~/.vegacapsule/testnet/wallet',
+    vegaWalletPublicKey:
+      '02eceaba4df2bef76ea10caf728d8a099a2aa846cced25737cccaa9812342f65',
  },
 });
@@ -1,4 +0,0 @@
-{
-  "name": "Using fixtures to represent data",
-  "email": "hello@cypress.io"
-}
@@ -0,0 +1,121 @@
+{
+  "eighteenDecimal": [
+    "governance.proposal.asset.minProposerBalance",
+    "governance.proposal.asset.minVoterBalance",
+    "governance.proposal.freeform.minProposerBalance",
+    "governance.proposal.freeform.minVoterBalance",
+    "governance.proposal.market.minProposerBalance",
+    "governance.proposal.market.minVoterBalance",
+    "governance.proposal.updateMarket.minProposerBalance",
+    "governance.proposal.updateMarket.minVoterBalance",
+    "governance.proposal.updateNetParam.minProposerBalance",
+    "governance.proposal.updateNetParam.minVoterBalance",
+    "reward.staking.delegation.maxPayoutPerEpoch",
+    "reward.staking.delegation.maxPayoutPerParticipant",
+    "reward.staking.delegation.minimumValidatorStake",
+    "spam.protection.delegation.min.tokens",
+    "spam.protection.proposal.min.tokens",
+    "spam.protection.voting.min.tokens",
+    "validators.delegation.minAmount"
+  ],
+  "fiveDecimal": [
+    "governance.proposal.updateAsset.minProposerBalance",
+    "governance.proposal.updateAsset.minVoterBalance",
+    "governance.proposal.updateAsset.requiredParticipation",
+    "governance.proposal.updateMarket.minProposerEquityLikeShare",
+    "market.fee.factors.infrastructureFee",
+    "market.fee.factors.makerFee",
+    "market.liquidity.bondPenaltyParameter",
+    "market.liquidity.maximumLiquidityFeeFactorLevel",
+    "market.liquidity.minimum.probabilityOfTrading.lpOrders",
+    "market.liquidity.probabilityOfTrading.tau.scaling",
+    "market.liquidity.stakeToCcySiskas",
+    "market.liquidity.targetstake.triggering.ratio",
+    "market.liquidityProvision.minLpStakeQuantumMultiple",
+    "market.liquidityProvision.shapes.maxSize",
+    "market.stake.target.scalingFactor",
+    "network.validators.ersatz.multipleOfTendermintValidators",
+    "network.validators.ersatz.rewardFactor",
+    "network.validators.incumbentBonus",
+    "network.validators.minimumEthereumEventsForNewValidator",
+    "network.validators.multisig.numberOfSigners",
+    "network.validators.tendermint.number",
+    "reward.staking.delegation.competitionLevel",
+    "reward.staking.delegation.delegatorShare",
+    "reward.staking.delegation.minValidators",
+    "reward.staking.delegation.optimalStakeMultiplier",
+    "reward.staking.delegation.payoutFraction",
+    "rewards.marketCreationQuantumMultiple",
+    "spam.pow.difficulty",
+    "spam.pow.increaseDifficulty",
+    "spam.pow.numberOfPastBlocks",
+    "spam.pow.numberOfTxPerBlock",
+    "spam.protection.max.batchSize",
+    "spam.protection.max.delegations",
+    "spam.protection.max.proposals",
+    "spam.protection.max.votes",
+    "spam.protection.maxUserTransfersPerEpoch",
+    "transfer.fee.factor",
+    "transfer.minTransferQuantumMultiple",
+    "snapshot.interval.length"
+  ],
+  "json": [
+    "blockchains.ethereumConfig",
+    "market.margin.scalingFactors",
+    "market.monitor.price.defaultParameters"
+  ],
+  "percentage": [
+    "governance.proposal.asset.requiredMajority",
+    "governance.proposal.asset.requiredParticipation",
+    "governance.proposal.freeform.requiredMajority",
+    "governance.proposal.freeform.requiredParticipation",
+    "governance.proposal.market.requiredMajority",
+    "governance.proposal.market.requiredParticipation",
+    "governance.proposal.updateMarket.requiredMajority",
+    "governance.proposal.updateMarket.requiredMajorityLP",
+    "governance.proposal.updateMarket.requiredParticipation",
+    "governance.proposal.updateMarket.requiredParticipationLP",
+    "governance.proposal.updateNetParam.requiredMajority",
+    "governance.proposal.updateNetParam.requiredParticipation",
+    "validators.vote.required"
+  ],
+  "duration": [
+    "governance.proposal.asset.maxClose",
+    "governance.proposal.asset.maxEnact",
+    "governance.proposal.asset.minClose",
+    "governance.proposal.asset.minEnact",
+    "governance.proposal.freeform.maxClose",
+    "governance.proposal.freeform.minClose",
+    "governance.proposal.market.maxClose",
+    "governance.proposal.market.maxEnact",
+    "governance.proposal.market.minClose",
+    "governance.proposal.market.minEnact",
+    "governance.proposal.updateAsset.maxClose",
+    "governance.proposal.updateAsset.maxEnact",
+    "governance.proposal.updateAsset.minClose",
+    "governance.proposal.updateAsset.minEnact",
+    "governance.proposal.updateMarket.maxClose",
+    "governance.proposal.updateMarket.maxEnact",
+    "governance.proposal.updateMarket.minClose",
+    "governance.proposal.updateMarket.minEnact",
+    "governance.proposal.updateNetParam.maxClose",
+    "governance.proposal.updateNetParam.maxEnact",
+    "governance.proposal.updateNetParam.minClose",
+    "governance.proposal.updateNetParam.minEnact",
+    "market.auction.maximumDuration",
+    "market.auction.minimumDuration",
+    "market.liquidity.providers.fee.distributionTimeStep",
+    "market.stake.target.timeWindow",
+    "market.value.windowLength",
+    "network.checkpoint.timeElapsedBetweenCheckpoints",
+    "network.floatingPointUpdates.delay",
+    "reward.staking.delegation.payoutDelay",
+    "spam.pow.hashFunction",
+    "validators.epoch.length"
+  ],
+  "date": [
+    "limits.assets.proposeEnabledFrom",
+    "limits.markets.proposeEnabledFrom"
+  ],
+  "id": ["reward.asset"]
+}
@@ -0,0 +1 @@
+123
@@ -0,0 +1 @@
+ozone access unlock valid olympic save include omit supply green clown session
@@ -1,20 +1,148 @@
-import '../support/common.functions';
-
 context('Asset page', { tags: '@regression' }, function () {
+  before('gather system asset information', function () {
+    cy.get_asset_information().as('assetsInfo');
+  });
+
  describe('Verify elements on page', function () {
    const assetsNavigation = 'a[href="/assets"]';
    const assetHeader = '[data-testid="asset-header"]';
+    const jsonSection = '.language-json';

-    it('Assets page is displayed', function () {
+    before('Navigate to assets page', function () {
      cy.visit('/');
      cy.get(assetsNavigation).click();
-      cy.common_validate_blocks_data_displayed(assetHeader);
+
+      // Check we have enough enough assets
+      const assetNames = Object.keys(this.assetsInfo);
+      assert.isAtLeast(
+        assetNames.length,
+        5,
+        'Ensuring we have at least 5 assets to test'
+      );
    });

-    it('Assets page displayed in mobile', function () {
+    it('should be able to see assets page sections', function () {
+      const assetNames = Object.keys(this.assetsInfo);
+      assetNames.forEach((assetName) => {
+        cy.get(assetHeader)
+          .contains(assetName)
+          .should('be.visible')
+          .next()
+          .within(() => {
+            cy.get(jsonSection).should('not.be.empty');
+          });
+      });
+    });
+
+    it('should be able to see all asset details displayed in JSON', function () {
+      const assetNames = Object.keys(this.assetsInfo);
+      assetNames.forEach((assetName) => {
+        cy.get(assetHeader)
+          .contains(assetName)
+          .next()
+          .within(() => {
+            cy.get(jsonSection)
+              .invoke('text')
+              .convert_string_json_to_js_object()
+              .then((assetsListedInJson) => {
+                const assetInfo = this.assetsInfo[assetName];
+
+                assert.equal(assetsListedInJson.name, assetInfo.name);
+                assert.equal(assetsListedInJson.id, assetInfo.id);
+                assert.equal(assetsListedInJson.decimals, assetInfo.decimals);
+                assert.equal(assetsListedInJson.symbol, assetInfo.symbol);
+                assert.equal(
+                  assetsListedInJson.source.__typename,
+                  assetInfo.source.__typename
+                );
+
+                if (assetInfo.source.__typename == 'ERC20') {
+                  assert.equal(
+                    assetsListedInJson.source.contractAddress,
+                    assetInfo.source.contractAddress
+                  );
+                }
+
+                if (assetInfo.source.__typename == 'BuiltinAsset') {
+                  assert.equal(
+                    assetsListedInJson.source.maxFaucetAmountMint,
+                    assetInfo.source.maxFaucetAmountMint
+                  );
+                }
+
+                let knownAssetTypes = ['BuiltinAsset', 'ERC20'];
+                assert.include(
+                  knownAssetTypes,
+                  assetInfo.source.__typename,
+                  `Checking that current asset type of ${assetInfo.source.__typename} /
+                  is one of: ${knownAssetTypes}: /
+                  If fail then we need to add extra tests for un-encountered asset types`
+                );
+              });
+          });
+      });
+    });
+
+    it('should be able to switch assets between light and dark mode', function () {
+      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
+      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
+      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
+      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
+      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
+      const themeSwitcher = '[data-testid="theme-switcher"]';
+      const jsonFields = '.hljs';
+      const sideMenuBackground = '.absolute';
+
+      // Engage dark mode if not allready set
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .then((background_color) => {
+          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
+            cy.get(themeSwitcher).click();
+        });
+
+      // Engage white mode
+      cy.get(themeSwitcher).click();
+
+      // White Mode
+      cy.get(assetsNavigation)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSideMenuBackgroundColor);
+
+      // Dark Mode
+      cy.get(themeSwitcher).click();
+      cy.get(assetsNavigation)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSideMenuBackgroundColor);
+    });
+
+    it('should be able to see assets page displayed in mobile', function () {
      cy.common_switch_to_mobile_and_click_toggle();
      cy.get(assetsNavigation).click();
-      cy.common_validate_blocks_data_displayed(assetHeader);
+
+      const assetNames = Object.keys(this.assetsInfo);
+      assetNames.forEach((assetName) => {
+        cy.get(assetHeader)
+          .contains(assetName)
+          .should('be.visible')
+          .next()
+          .within(() => {
+            cy.get(jsonSection).should('not.be.empty');
+          });
+      });
    });
  });
 });
@@ -1,5 +1,3 @@
-import '../support/common.functions';
-
 context('Blocks page', { tags: '@regression' }, function () {
  before('visit token home page', function () {
    cy.visit('/');
@@ -1,5 +1,3 @@
-import '../support/common.functions';
-
 //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 () {
@@ -1,35 +1,267 @@
-import '../support/common.functions';
-
 context('Network parameters page', { tags: '@smoke' }, function () {
-  before('visit token home page', function () {
-    cy.visit('/');
+  before('navigate to network parameter page', function () {
+    cy.fixture('net_parameter_format_lookup').as('networkParameterFormat');
  });

  describe('Verify elements on page', function () {
    const networkParametersNavigation = 'a[href="/network-parameters"]';
+    const networkParametersHeader = '[data-testid="network-param-header"]';
+    const tableRows = '[data-testid="key-value-table-row"]';

-    beforeEach('Navigate to network parameter page', function () {
+    before('navigate to network parameter page', function () {
+      cy.visit('/');
      cy.get(networkParametersNavigation).click();
    });

-    it('Network paremeter page is displayed', function () {
-      verifyNetworkParametersPageDisplayed();
+    it('should show network parameter heading at top of page', function () {
+      cy.get(networkParametersHeader)
+        .should('have.text', 'Network Parameters')
+        .and('be.visible');
    });

-    it('Network parameter page displayed on mobile', function () {
+    it('should list each of the network parameters available', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        const numberOfNetworkParametersInSystem =
+          Object.keys(network_parameters).length;
+        cy.get(tableRows).should(
+          'have.length',
+          numberOfNetworkParametersInSystem
+        );
+      });
+    });
+
+    it('should list each network parameter displayed with json - in the correct format', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          const parameterValue = network_parameter[1];
+          if (this.networkParameterFormat.json.includes(parameterName)) {
+            cy.get(tableRows)
+              .contains(parameterName)
+              .should('be.visible')
+              .next()
+              .invoke('text')
+              .convert_string_json_to_js_object()
+              .then((jsonOnPage) => {
+                cy.wrap(parameterValue, { log: false })
+                  .convert_string_json_to_js_object()
+                  .then((jsonInSystem) =>
+                    assert.deepEqual(
+                      jsonOnPage,
+                      jsonInSystem,
+                      `Checking ${parameterName} has the correct value of ${jsonInSystem}`
+                    )
+                  );
+              });
+          }
+        });
+      });
+    });
+
+    it('should list each network parameter displayed as a percentage - in the correct format', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          const parameterValue = network_parameter[1];
+          if (this.networkParameterFormat.percentage.includes(parameterName)) {
+            const formattedPercentageParameter =
+              (parseFloat(parameterValue) * 100).toFixed(0) + '%';
+            cy.get(tableRows)
+              .contains(parameterName)
+              .should('be.visible')
+              .next()
+              .invoke('text')
+              .then((parameterValueOnPage) => {
+                assert.equal(
+                  parameterValueOnPage,
+                  formattedPercentageParameter,
+                  `Checking ${parameterName} has the correct value of ${formattedPercentageParameter}`
+                );
+                cy.contains(parameterValueOnPage).should('be.visible');
+              });
+          }
+        });
+      });
+    });
+
+    it('should list each network parameter displayed as an id - in the correct format', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          const parameterValue = network_parameter[1];
+          if (this.networkParameterFormat.id.includes(parameterName)) {
+            cy.get(tableRows)
+              .contains(parameterName)
+              .should('be.visible')
+              .next()
+              .should('contain', parameterValue)
+              .and('be.visible')
+              .invoke('text');
+          }
+        });
+      });
+    });
+
+    it('should list each network parameter displayed as a date - in the correct format', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          const parameterValue = network_parameter[1];
+          if (this.networkParameterFormat.date.includes(parameterName)) {
+            cy.get(tableRows)
+              .contains(parameterName)
+              .should('be.visible')
+              .next()
+              .should('contain', parameterValue)
+              .and('be.visible');
+          }
+        });
+      });
+    });
+
+    it('should list each network parameter displayed as a duration - in the correct format', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          const parameterValue = network_parameter[1];
+          if (this.networkParameterFormat.duration.includes(parameterName)) {
+            cy.get(tableRows)
+              .contains(parameterName)
+              .should('be.visible')
+              .next()
+              .should('contain', parameterValue)
+              .and('be.visible');
+          }
+        });
+      });
+    });
+
+    it('should list each network parameter displayed as a currency value with four decimals - in the correct format', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          const parameterValue = network_parameter[1];
+          if (this.networkParameterFormat.fiveDecimal.includes(parameterName)) {
+            cy.convert_number_to_four_decimal(parameterValue)
+              .add_commas_to_number_if_large_enough()
+              .then((parameterValueFormatted) => {
+                cy.get(tableRows)
+                  .contains(parameterName)
+                  .should('be.visible')
+                  .next()
+                  .invoke('text')
+                  .then((parameterValueOnPage) => {
+                    assert.equal(
+                      parameterValueOnPage,
+                      parameterValueFormatted,
+                      `Checking ${parameterName} has the correct value of ${parameterValueFormatted}`
+                    );
+                    cy.contains(parameterValueOnPage).should('be.visible');
+                  });
+              });
+          }
+        });
+      });
+    });
+
+    it('should list each network parameter displayed as a currency value with eighteen decimals - in the correct format', function () {
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          const parameterValue = network_parameter[1];
+          if (
+            this.networkParameterFormat.eighteenDecimal.includes(parameterName)
+          ) {
+            cy.convert_number_to_eighteen_decimal(parameterValue)
+              .add_commas_to_number_if_large_enough()
+              .then((parameterValueFormatted) => {
+                cy.get(tableRows)
+                  .contains(parameterName)
+                  .should('be.visible')
+                  .next()
+                  .invoke('text')
+                  .then((parameterValueOnPage) => {
+                    assert.equal(
+                      parameterValueOnPage,
+                      parameterValueFormatted,
+                      `Checking ${parameterName} has the correct value of ${parameterValueFormatted}`
+                    );
+                    cy.contains(parameterValueOnPage).should('be.visible');
+                  });
+              });
+          }
+        });
+      });
+    });
+
+    it('should be able to switch network parameter page - between light and dark mode', function () {
+      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
+      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
+      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
+      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
+      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
+      const themeSwitcher = '[data-testid="theme-switcher"]';
+      const jsonFields = '.hljs';
+      const sideMenuBackground = '.absolute';
+
+      // Engage dark mode if not allready set
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .then((background_color) => {
+          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
+            cy.get(themeSwitcher).click();
+        });
+
+      // Engage white mode
+      cy.get(themeSwitcher).click();
+
+      // White Mode
+      cy.get(networkParametersNavigation)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSideMenuBackgroundColor);
+
+      // Dark Mode
+      cy.get(themeSwitcher).click();
+      cy.get(networkParametersNavigation)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSideMenuBackgroundColor);
+    });
+
+    it('should be able to see network parameters - on mobile', function () {
      cy.common_switch_to_mobile_and_click_toggle();
      cy.get(networkParametersNavigation).click();
-      verifyNetworkParametersPageDisplayed();
+      cy.get_network_parameters().then((network_parameters) => {
+        network_parameters = Object.entries(network_parameters);
+        network_parameters.forEach((network_parameter) => {
+          const parameterName = network_parameter[0];
+          cy.get(tableRows)
+            .contains(parameterName)
+            .should('be.visible')
+            .next()
+            .should('not.be.empty')
+            .and('be.visible');
+        });
+      });
    });
  });
-
-  function verifyNetworkParametersPageDisplayed() {
-    cy.get('[data-testid="network-param-header"]').should(
-      'have.text',
-      'Network Parameters'
-    );
-    cy.common_verify_json_parameters(18);
-    cy.common_verify_json_string_values(6);
-    cy.common_verify_json_int_values(7);
-  }
 });
@@ -0,0 +1,250 @@
+const vegaWalletPublicKey = Cypress.env('vegaWalletPublicKey');
+const partiesMenuHeader = 'a[href="/parties"]';
+const partiesSearchBox = '[data-testid="party-input"]';
+const partiesSearchAction = '[data-testid="go-submit"]';
+const partiesJsonSection = '[data-testid="parties-json"]';
+const txTimeout = Cypress.env('txTimeout');
+
+let assetData = {
+  fUSDC: { id: 'fUSDC', name: 'USDC (fake)', amount: '10' },
+  fBTC: { id: 'fBTC', name: 'BTC (fake)', amount: '6' },
+  fEURO: { id: 'fEURO', name: 'EURO (fake)', amount: '8' },
+  fDAI: { id: 'fDAI', name: 'DAI (fake)', amount: '2' },
+};
+
+const assetsInTest = Object.keys(assetData);
+
+context('Parties page', { tags: '@regression' }, function () {
+  before('send-faucet assets to connected vega wallet', function () {
+    cy.vega_wallet_import();
+    assetsInTest.forEach((asset) => {
+      cy.vega_wallet_receive_fauceted_asset(
+        assetData[asset].name,
+        assetData[asset].amount,
+        vegaWalletPublicKey
+      );
+    });
+    cy.visit('/');
+  });
+
+  describe('Verify parties page content', function () {
+    before('navigate to parties page and search for party', function () {
+      cy.get(partiesMenuHeader).click();
+      // Deliberate slow entry of party id/key - enabling transactions to sync
+      cy.get(partiesSearchBox).type(vegaWalletPublicKey, { delay: 120 });
+      cy.get(partiesSearchAction).click();
+      cy.get_connected_parties_accounts().as('party_accounts');
+
+      // Ensure balance of each party asset is correct
+      cy.get('@party_accounts').then((accounts) => {
+        assetsInTest.forEach((asset) => {
+          cy.get_asset_decimals(assetData[asset].id).then((assetDecimals) => {
+            assert.equal(
+              accounts[assetData[asset].id].balance,
+              assetData[asset].amount + assetDecimals,
+              `Checking ${assetData[asset].id} faucet was successfull`
+            );
+          });
+        });
+      });
+    });
+
+    it('should see party address id - having searched', function () {
+      cy.contains('Address')
+        .siblings()
+        .contains(vegaWalletPublicKey)
+        .should('be.visible');
+    });
+
+    it('should see each asset and balance - within asset data section', function () {
+      assetsInTest.forEach((asset) => {
+        cy.contains(assetData[asset].name, txTimeout).should('be.visible');
+        cy.contains(assetData[asset].name)
+          .siblings()
+          .contains(assetData[asset].id)
+          .should('be.visible');
+        cy.contains(assetData[asset].name, txTimeout)
+          .parent()
+          .siblings()
+          .within(() => {
+            cy.get_asset_decimals(asset).then((assetDecimals) => {
+              cy.contains_exactly(
+                assetData[asset].amount + '.' + assetDecimals
+              ).should('be.visible');
+            });
+          });
+      });
+    });
+
+    it('should be able to copy the party address id', function () {
+      cy.monitor_clipboard().as('clipboard');
+      cy.contains('Address').siblings().last().click();
+      cy.get('@clipboard')
+        .get_copied_text_from_clipboard()
+        .should('equal', vegaWalletPublicKey);
+    });
+
+    it('should be able to copy an asset id', function () {
+      cy.monitor_clipboard().as('clipboard');
+
+      cy.contains(assetData.fDAI.name, txTimeout).should('be.visible');
+      cy.contains(assetData.fDAI.name)
+        .siblings()
+        .within(() => {
+          cy.get('[data-state="closed"]').last().click({ force: true });
+        });
+
+      cy.get('@clipboard')
+        .get_copied_text_from_clipboard()
+        .should('equal', assetData.fDAI.id);
+    });
+
+    it('should be able to see JSON of each asset containing correct balance and decimals', function () {
+      cy.get(partiesJsonSection).should('be.visible');
+
+      assetsInTest.forEach((assetInTest) => {
+        cy.get(partiesJsonSection)
+          .invoke('text')
+          .convert_string_json_to_js_object()
+          .get_party_accounts_data_from_js_object()
+          .then((accountsListedInJson) => {
+            cy.get_asset_information().then((assetsInfo) => {
+              const assetInfo =
+                assetsInfo[accountsListedInJson[assetInTest].asset.name];
+
+              assert.equal(
+                accountsListedInJson[assetInTest].asset.name,
+                assetInfo.name
+              );
+              assert.equal(
+                accountsListedInJson[assetInTest].asset.id,
+                assetInfo.id
+              );
+              assert.equal(
+                accountsListedInJson[assetInTest].asset.decimals,
+                assetInfo.decimals
+              );
+              assert.equal(
+                accountsListedInJson[assetInTest].asset.symbol,
+                assetInfo.symbol
+              );
+              assert.equal(
+                accountsListedInJson[assetInTest].asset.source.__typename,
+                assetInfo.source.__typename
+              );
+              cy.get_asset_decimals(assetInTest).then((assetDecimals) => {
+                assert.equal(
+                  accountsListedInJson[assetInTest].balance,
+                  assetData[assetInTest].amount + assetDecimals
+                );
+              });
+            });
+          });
+      });
+    });
+
+    it('should be able to switch parties page between light and dark mode', function () {
+      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
+      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
+      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
+      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
+      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
+      const themeSwitcher = '[data-testid="theme-switcher"]';
+      const jsonFields = '.hljs';
+      const sideMenuBackground = '.absolute';
+
+      // Engage dark mode if not allready set
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .then((background_color) => {
+          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
+            cy.get(themeSwitcher).click();
+        });
+
+      // Engage white mode
+      cy.get(themeSwitcher).click();
+
+      // White Mode
+      cy.get(partiesMenuHeader)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSideMenuBackgroundColor);
+
+      // Dark Mode
+      cy.get(themeSwitcher).click();
+      cy.get(partiesMenuHeader)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSideMenuBackgroundColor);
+    });
+
+    after(
+      'teardown environment to prevent test data bleeding into other tests',
+      function () {
+        if (Cypress.env('CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS')) {
+          cy.restart_vegacapsule_network();
+        }
+      }
+    );
+
+    Cypress.Commands.add('get_asset_decimals', (assetID) => {
+      cy.get_asset_information().then((assetsInfo) => {
+        const assetDecimals = assetsInfo[assetData[assetID].name].decimals;
+        let decimals = '';
+        for (let i = 0; i < assetDecimals; i++) decimals += '0';
+        return decimals;
+      });
+    });
+
+    Cypress.Commands.add('get_connected_parties_accounts', () => {
+      const mutation =
+        '{partiesConnection {edges{node{accountsConnection{edges{node{\
+          balance type asset {id symbol decimals}}}}}}}}';
+      cy.request({
+        method: 'POST',
+        url: `http://localhost:3028/query`,
+        body: {
+          query: mutation,
+        },
+        headers: { 'content-type': 'application/json' },
+      })
+        .its(
+          `body.data.partiesConnection.edges.1.node.accountsConnection.edges`
+        )
+        .then(function (response) {
+          let accounts = {};
+          response.forEach((account) => {
+            accounts[account.node.asset.id] = account.node;
+          });
+          return accounts;
+        });
+    });
+
+    Cypress.Commands.add(
+      'get_party_accounts_data_from_js_object',
+      { prevSubject: true },
+      (jsObject) => {
+        const accounts = jsObject.party.accounts.reduce(function (
+          account,
+          entry
+        ) {
+          account[entry.asset.id] = entry;
+          return account;
+        },
+        {});
+        return accounts;
+      }
+    );
+  });
+});
@@ -1,27 +1,300 @@
-import '../support/common.functions';
-
 context('Validator page', { tags: '@smoke' }, function () {
+  const validatorMenuHeading = 'a[href="/validators"]';
+  const tendermintDataHeader = '[data-testid="tendermint-header"]';
+  const vegaDataHeader = '[data-testid="vega-header"]';
+  const jsonSection = '.language-json';
+
+  before('Visit validators page and obtain data', function () {
+    cy.visit('/');
+    cy.get(validatorMenuHeading).click();
+    cy.get_validators().as('validators');
+    cy.get_nodes().as('nodes');
+  });
+
  describe('Verify elements on page', function () {
-    const validatorNavigation = 'a[href="/validators"]';
-
-    it('Validator page is displayed', function () {
-      cy.visit('/');
-      cy.get(validatorNavigation).click();
-      validateValidatorsDisplayed();
-    });
-
-    it('Validator page is displayed on mobile', function () {
-      cy.common_switch_to_mobile_and_click_toggle();
-      cy.get(validatorNavigation).click();
-      validateValidatorsDisplayed();
-    });
-
-    function validateValidatorsDisplayed() {
-      cy.get('[data-testid="tendermint-header"]').should(
-        'have.text',
-        'Tendermint data'
+    before('Ensure at least two validators are present', function () {
+      assert.isAtLeast(
+        this.validators.length,
+        2,
+        'Ensuring at least two validators exist'
      );
-      cy.get('[data-testid="tendermint-data"]').should('not.be.empty');
-    }
+    });
+
+    it('should be able to see validator page sections', function () {
+      cy.get(vegaDataHeader)
+        .contains('Vega data')
+        .and('is.visible')
+        .next()
+        .within(() => {
+          cy.get(jsonSection).should('not.be.empty');
+        });
+
+      cy.get(tendermintDataHeader)
+        .contains('Tendermint data')
+        .and('is.visible')
+        .next()
+        .within(() => {
+          cy.get(jsonSection).should('not.be.empty');
+        });
+    });
+
+    it('should be able to see relevant validator information in tendermint section', function () {
+      cy.get(tendermintDataHeader)
+        .contains('Tendermint data')
+        .next()
+        .within(() => {
+          cy.get(jsonSection)
+            .invoke('text')
+            .convert_string_json_to_js_object()
+            .then((validatorsInJson) => {
+              this.validators.forEach((validator, index) => {
+                const validatorInJson =
+                  validatorsInJson.result.validators[index];
+
+                assert.equal(
+                  validatorInJson.address,
+                  validator.address,
+                  `Checking that validator address shown in json matches system data`
+                );
+                cy.contains(validator.address).should('be.visible');
+
+                assert.equal(
+                  validatorInJson.pub_key.type,
+                  validator.pub_key.type,
+                  `Checking that validator public key type shown in json matches system data`
+                );
+                cy.contains(validator.pub_key.type).should('be.visible');
+
+                assert.equal(
+                  validatorInJson.pub_key.value,
+                  validator.pub_key.value,
+                  `Checking that validator public key value shown in json matches system data`
+                );
+                cy.contains(validator.pub_key.value).should('be.visible');
+
+                assert.equal(
+                  validatorInJson.voting_power,
+                  validator.voting_power,
+                  `Checking that validator voting power in json matches system data`
+                );
+                cy.contains(validator.voting_power).should('be.visible');
+
+                // Proposer priority can change frequently mid test
+                // Therefore only checking the field name is present.
+                cy.contains('proposer_priority').should('be.visible');
+              });
+            });
+        });
+    });
+
+    it('should be able to see relevant node information in vega data section', function () {
+      cy.get(vegaDataHeader)
+        .contains('Vega data')
+        .next()
+        .within(() => {
+          cy.get(jsonSection)
+            .invoke('text')
+            .convert_string_json_to_js_object()
+            .then((nodesInJson) => {
+              this.nodes.forEach((node, index) => {
+                const nodeInJson = nodesInJson.nodes[index];
+
+                // Vegacapsule shows no info or null for following fields:
+                // name, infoURL, avatarUrl, location, epoch data
+                // Therefore, these values remain unchecked.
+
+                assert.equal(
+                  nodeInJson.__typename,
+                  node.__typename,
+                  `Checking that node __typename shown in json matches system data`
+                );
+                cy.contains(node.__typename).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.id,
+                  node.id,
+                  `Checking that node id shown in json matches system data`
+                );
+                cy.contains(node.id).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.pubkey,
+                  node.pubkey,
+                  `Checking that node pubkey shown in json matches system data`
+                );
+                cy.contains(node.pubkey).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.tmPubkey,
+                  node.tmPubkey,
+                  `Checking that node tmPubkey shown in json matches system data`
+                );
+                cy.contains(node.tmPubkey).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.ethereumAddress,
+                  node.ethereumAddress,
+                  `Checking that node ethereumAddress shown in json matches system data`
+                );
+                cy.contains(node.ethereumAddress).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.stakedByOperator,
+                  node.stakedByOperator,
+                  `Checking that node stakedByOperator value shown in json matches system data`
+                );
+                cy.contains(node.stakedByOperator).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.stakedByDelegates,
+                  node.stakedByDelegates,
+                  `Checking that node stakedByDelegates value shown in json matches system data`
+                );
+                cy.contains(node.stakedByDelegates).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.stakedTotal,
+                  node.stakedTotal,
+                  `Checking that node stakedTotal shown in json matches system data`
+                );
+                cy.contains(node.stakedTotal).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.pendingStake,
+                  node.pendingStake,
+                  `Checking that node pendingStake shown in json matches system data`
+                );
+                cy.contains(node.pendingStake).should('be.visible');
+
+                assert.equal(
+                  nodeInJson.status,
+                  node.status,
+                  `Checking that node status shown in json matches system data`
+                );
+                cy.contains(node.status).should('be.visible');
+              });
+            });
+        });
+    });
+
+    it('should be able to see validator page displayed on mobile', function () {
+      cy.common_switch_to_mobile_and_click_toggle();
+      cy.get(validatorMenuHeading).click();
+      cy.get(vegaDataHeader)
+        .contains('Vega data')
+        .and('is.visible')
+        .next()
+        .within(() => {
+          cy.get(jsonSection).should('not.be.empty');
+        });
+
+      cy.get(tendermintDataHeader)
+        .contains('Tendermint data')
+        .and('is.visible')
+        .next()
+        .within(() => {
+          cy.get(jsonSection).should('not.be.empty');
+        });
+
+      cy.get(tendermintDataHeader)
+        .contains('Tendermint data')
+        .next()
+        .within(() => {
+          this.validators.forEach((validator) => {
+            cy.contains(validator.address).should('be.visible');
+            cy.contains(validator.pub_key.type).should('be.visible');
+            cy.contains(validator.pub_key.value).should('be.visible');
+            cy.contains(validator.voting_power).should('be.visible');
+            // Proposer priority can change frequently mid test
+            // Therefore only checking the field name is present.
+            cy.contains('proposer_priority').should('be.visible');
+          });
+        });
+    });
+
+    it('should be able to switch validator page between light and dark mode', function () {
+      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
+      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
+      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
+      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
+      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
+      const themeSwitcher = '[data-testid="theme-switcher"]';
+      const jsonFields = '.hljs';
+      const sideMenuBackground = '.absolute';
+
+      // Engage dark mode if not allready set
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .then((background_color) => {
+          if (background_color.includes(whiteThemeSideMenuBackgroundColor))
+            cy.get(themeSwitcher).click();
+        });
+
+      // Engage white mode
+      cy.get(themeSwitcher).click();
+
+      // White Mode
+      cy.get(validatorMenuHeading)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', whiteThemeSideMenuBackgroundColor);
+
+      // Dark Mode
+      cy.get(themeSwitcher).click();
+      cy.get(validatorMenuHeading)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSelectedMenuOptionColor);
+      cy.get(jsonFields)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeJsonFieldBackColor);
+      cy.get(sideMenuBackground)
+        .should('have.css', 'background-color')
+        .and('include', darkThemeSideMenuBackgroundColor);
+    });
+
+    Cypress.Commands.add('get_validators', () => {
+      cy.request({
+        method: 'GET',
+        url: `http://localhost:26617/validators`,
+        headers: { 'content-type': 'application/json' },
+      })
+        .its(`body.result.validators`)
+        .then(function (response) {
+          let validators = [];
+          response.forEach((account, index) => {
+            validators[index] = account;
+          });
+          return validators;
+        });
+    });
+
+    Cypress.Commands.add('get_nodes', () => {
+      const mutation =
+        '{nodes { id name infoUrl avatarUrl pubkey tmPubkey ethereumAddress \
+          location stakedByOperator stakedByDelegates stakedTotal pendingStake \
+          epochData { total offline online __typename } status name __typename}}';
+      cy.request({
+        method: 'POST',
+        url: `http://localhost:3028/query`,
+        body: {
+          query: mutation,
+        },
+        headers: { 'content-type': 'application/json' },
+      })
+        .its(`body.data.nodes`)
+        .then(function (response) {
+          let nodes = [];
+          response.forEach((node) => {
+            nodes.push(node);
+          });
+          return nodes;
+        });
+    });
  });
 });
@@ -1,3 +1,5 @@
+import { BigNumber } from 'bignumber.js';
+
 Cypress.Commands.add(
  'common_validate_blocks_data_displayed',
  function (headerTestId) {
@@ -25,29 +27,53 @@ Cypress.Commands.add('common_switch_to_mobile_and_click_toggle', function () {
  cy.get('[data-testid="open-menu"]').click();
 });

-Cypress.Commands.add('common_verify_json_parameters', function (expectedNum) {
-  cy.get('.hljs-attr')
-    .should('have.length.at.least', expectedNum)
-    .each(($paramName) => {
-      cy.wrap($paramName).should('not.be.empty');
-    });
+Cypress.Commands.add('monitor_clipboard', () => {
+  cy.window().then((win) => {
+    return cy.stub(win, 'prompt').returns(win.prompt);
+  });
 });

 Cypress.Commands.add(
-  'common_verify_json_string_values',
-  function (expectedNum) {
-    cy.get('.hljs-string')
-      .should('have.length.at.least', expectedNum)
-      .each(($paramValue) => {
-        cy.wrap($paramValue).should('not.be.empty');
-      });
+  'get_copied_text_from_clipboard',
+  { prevSubject: true },
+  (clipboard) => {
+    // Must first setup with cy.monitor_clipboard().as('clipboard')
+    // This function then chained off a cy.get('@clipboard')
+    return clipboard.args[0][1];
  }
 );

-Cypress.Commands.add('common_verify_json_int_values', function (expectedNum) {
-  cy.get('.hljs-number')
-    .should('have.length.at.least', expectedNum)
-    .each(($paramValue) => {
-      cy.wrap($paramValue).should('not.be.empty');
-    });
+Cypress.Commands.add(
+  'convert_string_json_to_js_object',
+  { prevSubject: true },
+  (jsonBlobString) => {
+    // Note: this is a chaining function
+    return JSON.parse(jsonBlobString);
+  }
+);
+
+Cypress.Commands.add(
+  'add_commas_to_number_if_large_enough',
+  { prevSubject: true },
+  (number) => {
+    // This will turn 10000000.0000 into 10,000,000.000
+    // Note: this is a chaining function
+    const beforeDecimal = number.split('.')[0];
+    const afterDecimal = number.split('.')[1];
+    const beforeDecimalWithCommas = beforeDecimal
+      .toString()
+      .replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+    const formattedValue = beforeDecimalWithCommas + '.' + afterDecimal;
+    return formattedValue;
+  }
+);
+
+Cypress.Commands.add('convert_number_to_eighteen_decimal', (number) => {
+  // this will take a number like this   : 700000000000000000000
+  // and convert it to a number like this: 700.000000000000000000
+  return BigNumber((number / 1000000000000000000).toString()).toFixed(18);
+});
+
+Cypress.Commands.add('convert_number_to_four_decimal', (number) => {
+  return parseFloat(number).toFixed(4);
 });
@@ -14,5 +14,6 @@
 // ***********************************************************

 import '@vegaprotocol/cypress';
+import './common.functions.js';
 import registerCypressGrep from 'cypress-grep';
 registerCypressGrep();
@@ -5,6 +5,8 @@ NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_BLOCK_EXPLORER=

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -7,3 +7,4 @@ NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=DEVNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_BLOCK_EXPLORER=
@@ -7,3 +7,4 @@ NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=MAINNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_BLOCK_EXPLORER=
@@ -7,3 +7,4 @@ NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_BLOCK_EXPLORER=
@@ -1,9 +1,11 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz
+NX_BLOCK_EXPLORER=https://n13.testnet.vega.xyz/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n07.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_NETWORKS='{"TESTNET":"https://explorer.fairground.wtf","MAINNET":"https://explorer.vega.xyz"}'
 NX_VEGA_ENV=TESTNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
+NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
@@ -5,3 +5,4 @@ NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_URL=http://localhost:3003/query
 NX_VEGA_ENV=CUSTOM
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
+NX_BLOCK_EXPLORER=
@@ -14,7 +14,12 @@ jest.mock('../search', () => ({

 const renderComponent = () => (
  <MemoryRouter>
-    <Header />
+    <Header
+      theme="dark"
+      toggleTheme={jest.fn()}
+      menuOpen={false}
+      setMenuOpen={jest.fn()}
+    />
  </MemoryRouter>
 );

@@ -0,0 +1,189 @@
+import {
+  detectTypeByFetching,
+  detectTypeFromQuery,
+  getSearchType,
+  isBlock,
+  isHexadecimal,
+  isNetworkParty,
+  isNonHex,
+  SearchTypes,
+  toHex,
+  toNonHex,
+} from './detect-search';
+import { DATA_SOURCES } from '../../config';
+
+global.fetch = jest.fn();
+
+describe('Detect Search', () => {
+  it("should detect that it's a hexadecimal", () => {
+    const expected = true;
+    const testString =
+      '0x073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
+    const actual = isHexadecimal(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it("should detect that it's not hexadecimal", () => {
+    const expected = true;
+    const testString =
+      '073ceaab59e5f2dd0561dec4883e7ee5bc7165cd4de34717a3ab8f2cbe3007f9';
+    const actual = isNonHex(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it("should detect that it's a network party", () => {
+    const expected = true;
+    const testString = 'network';
+    const actual = isNetworkParty(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it("should detect that it's a block", () => {
+    const expected = true;
+    const testString = '3188';
+    const actual = isBlock(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it('should convert from non-hex to hex', () => {
+    const expected = '0x123';
+    const testString = '123';
+    const actual = toHex(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it('should convert from hex to non-hex', () => {
+    const expected = '123';
+    const testString = '0x123';
+    const actual = toNonHex(testString);
+    expect(actual).toBe(expected);
+  });
+
+  it("should detect type client side from query if it's a hexadecimal", () => {
+    const expected = [SearchTypes.Party, SearchTypes.Transaction];
+    const testString =
+      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("should detect type client side from query if it's a non hex", () => {
+    const expected = [SearchTypes.Party, SearchTypes.Transaction];
+    const testString =
+      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("should detect type client side from query if it's a network party", () => {
+    const expected = [SearchTypes.Party];
+    const testString = 'network';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("should detect type client side from query if it's a block (number)", () => {
+    const expected = [SearchTypes.Block];
+    const testString = '23432';
+    const actual = detectTypeFromQuery(testString);
+    expect(actual).toStrictEqual(expected);
+  });
+
+  it("detectTypeByFetching should call fetch with non-hex query it's a transaction", async () => {
+    const query = '0xabc';
+    const type = SearchTypes.Transaction;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: true,
+          json: () =>
+            Promise.resolve({
+              transaction: {
+                hash: query,
+              },
+            }),
+        })
+      )
+    );
+    const result = await detectTypeByFetching(query);
+    expect(fetch).toHaveBeenCalledWith(
+      `${DATA_SOURCES.blockExplorerUrl}/transactions/${toNonHex(query)}`
+    );
+    expect(result).toBe(type);
+  });
+
+  it("detectTypeByFetching should call fetch with non-hex query it's a party", async () => {
+    const query = 'abc';
+    const type = SearchTypes.Party;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: false,
+        })
+      )
+    );
+    const result = await detectTypeByFetching(query);
+    expect(result).toBe(type);
+  });
+
+  it('getSearchType should return party from fetch response', async () => {
+    const query =
+      '0x4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const expected = SearchTypes.Party;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: false,
+        })
+      )
+    );
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return transaction from fetch response', async () => {
+    const query =
+      '4624293CFE3D8B67A0AB448BAFF8FBCF1A1B770D9D5F263761D3D6CBEA94D97F';
+    const expected = SearchTypes.Transaction;
+    // @ts-ignore issue related to polyfill
+    fetch.mockImplementation(
+      jest.fn(() =>
+        Promise.resolve({
+          ok: true,
+          json: () =>
+            Promise.resolve({
+              transaction: {
+                hash: query,
+              },
+            }),
+        })
+      )
+    );
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return undefined from transaction response', async () => {
+    const query = 'u';
+    const expected = undefined;
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return block if query is number', async () => {
+    const query = '123';
+    const expected = SearchTypes.Block;
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+
+  it('getSearchType should return party if query is network', async () => {
+    const query = 'network';
+    const expected = SearchTypes.Party;
+    const result = await getSearchType(query);
+    expect(result).toBe(expected);
+  });
+});
@@ -0,0 +1,143 @@
+import { DATA_SOURCES } from '../../config';
+import type { BlockExplorerTransaction } from '../../routes/types/block-explorer-response';
+
+export enum SearchTypes {
+  Transaction = 'transaction',
+  Party = 'party',
+  Block = 'block',
+  Order = 'order',
+}
+
+export const TX_LENGTH = 64;
+
+export const isHexadecimal = (search: string) =>
+  search.startsWith('0x') && search.length === 2 + TX_LENGTH;
+
+export const isNonHex = (search: string) =>
+  !search.startsWith('0x') && search.length === TX_LENGTH;
+
+export const isBlock = (search: string) => !Number.isNaN(Number(search));
+
+export const isNetworkParty = (search: string) => search === 'network';
+
+export const toHex = (query: string) =>
+  isHexadecimal(query) ? query : `0x${query}`;
+
+export const toNonHex = (query: string) =>
+  isNonHex(query) ? query : `${query.replace('0x', '')}`;
+
+export const detectTypeFromQuery = (
+  query: string
+): SearchTypes[] | undefined => {
+  const i = query.toLowerCase();
+
+  if (isHexadecimal(i) || isNonHex(i)) {
+    return [SearchTypes.Party, SearchTypes.Transaction];
+  } else if (isNetworkParty(i)) {
+    return [SearchTypes.Party];
+  } else if (isBlock(i)) {
+    return [SearchTypes.Block];
+  }
+
+  return undefined;
+};
+
+export const detectTypeByFetching = async (
+  query: string
+): Promise<SearchTypes | undefined> => {
+  const hash = toNonHex(query);
+  const request = await fetch(
+    `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
+  );
+
+  if (request?.ok) {
+    const body: BlockExplorerTransaction = await request.json();
+
+    if (body?.transaction) {
+      return SearchTypes.Transaction;
+    }
+  }
+
+  return SearchTypes.Party;
+};
+
+// Code commented out because the current solution to detect a hex is temporary (by process of elimination)
+// export const detectTypeByFetching = async (
+//   query: string,
+//   type: SearchTypes
+// ): Promise<SearchTypes | undefined> => {
+//   const TYPES = [SearchTypes.Party, SearchTypes.Transaction];
+//
+//   if (!TYPES.includes(type)) {
+//     throw new Error('Search type provided not recognised');
+//   }
+//
+//   if (type === SearchTypes.Transaction) {
+//     const hash = toNonHex(query);
+//     const request = await fetch(
+//       `${DATA_SOURCES.blockExplorerUrl}/transactions/${hash}`
+//     );
+//
+//     if (request?.ok) {
+//       const body: BlockExplorerTransaction = await request.json();
+//
+//       if (body?.transaction) {
+//         return SearchTypes.Transaction;
+//       }
+//     }
+//   } else if (type === SearchTypes.Party) {
+//     const party = toNonHex(query);
+//
+//     const request = await fetch(
+//       `${DATA_SOURCES.blockExplorerUrl}/transactions?limit=1&filters[tx.submitter]=${party}`
+//     );
+//
+//     if (request.ok) {
+//       const body: BlockExplorerTransactions = await request.json();
+//
+//       if (body?.transactions?.length) {
+//         return SearchTypes.Party;
+//       }
+//     }
+//   }
+//
+//   return undefined;
+// };
+
+// export const getSearchType = async (
+//   query: string
+// ): Promise<SearchTypes | undefined> => {
+//   const searchTypes = detectTypeFromQuery(query);
+//   const hasResults = searchTypes?.length;
+//
+//   if (hasResults) {
+//     if (hasResults > 1) {
+//       const promises = searchTypes.map((type) =>
+//         detectTypeByFetching(query, type)
+//       );
+//       const results = await Promise.all(promises);
+//       return results.find((result) => result !== undefined);
+//     }
+//
+//     return searchTypes[0];
+//   }
+//
+//   return undefined;
+// };
+
+export const getSearchType = async (
+  query: string
+): Promise<SearchTypes | undefined> => {
+  const searchTypes = detectTypeFromQuery(query);
+  const hasResults = searchTypes?.length;
+
+  if (hasResults) {
+    if (hasResults > 1) {
+      return await detectTypeByFetching(query);
+    }
+
+    return searchTypes[0];
+  }
+
+  return undefined;
+};
@@ -2,14 +2,23 @@ import { fireEvent, render, screen, waitFor } from '@testing-library/react';
 import { Search } from './search';
 import { MemoryRouter } from 'react-router-dom';
 import { Routes } from '../../routes/route-names';
+import { SearchTypes, getSearchType } from './detect-search';

 const mockedNavigate = jest.fn();
+const mockGetSearchType = getSearchType as jest.MockedFunction<
+  typeof getSearchType
+>;

 jest.mock('react-router-dom', () => ({
  ...jest.requireActual('react-router-dom'),
  useNavigate: () => mockedNavigate,
 }));

+jest.mock('./detect-search', () => ({
+  ...jest.requireActual('./detect-search'),
+  getSearchType: jest.fn(),
+}));
+
 beforeEach(() => {
  mockedNavigate.mockClear();
 });
@@ -39,9 +48,10 @@ describe('Search', () => {
    fireEvent.click(button);

    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      "Something doesn't look right"
+      'Transaction type is not recognised'
    );
  });
+
  it('should render error if no input is given', async () => {
    render(renderComponent());
    const { button } = getInputs();
@@ -49,47 +59,14 @@ describe('Search', () => {
    fireEvent.click(button);

    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      'Search required'
-    );
-  });
-
-  it('should render error if transaction is not hex', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    fireEvent.change(input, {
-      target: {
-        value:
-          '0x123456789012345678901234567890123456789012345678901234567890123Q',
-      },
-    });
-
-    fireEvent.click(button);
-
-    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      'Transaction is not hexadecimal'
-    );
-  });
-
-  it('should render error if transaction is not hex and does not have leading 0x', async () => {
-    render(renderComponent());
-    const { button, input } = getInputs();
-    fireEvent.change(input, {
-      target: {
-        value:
-          '123456789012345678901234567890123456789012345678901234567890123Q',
-      },
-    });
-
-    fireEvent.click(button);
-
-    expect(await screen.findByTestId('search-error')).toHaveTextContent(
-      'Transaction is not hexadecimal'
+      'Search query required'
    );
  });

  it('should redirect to transactions page', async () => {
    render(renderComponent());
    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
    fireEvent.change(input, {
      target: {
        value:
@@ -108,6 +85,7 @@ describe('Search', () => {
  it('should redirect to transactions page without proceeding 0x', async () => {
    render(renderComponent());
    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Transaction);
    fireEvent.change(input, {
      target: {
        value:
@@ -123,9 +101,48 @@ describe('Search', () => {
    });
  });

+  it('should redirect to parties page', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
+    fireEvent.change(input, {
+      target: {
+        value:
+          '0x1234567890123456789012345678901234567890123456789012345678901234',
+      },
+    });
+
+    fireEvent.click(button);
+    await waitFor(() => {
+      expect(mockedNavigate).toBeCalledWith(
+        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
+      );
+    });
+  });
+
+  it('should redirect to parties page without proceeding 0x', async () => {
+    render(renderComponent());
+    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Party);
+    fireEvent.change(input, {
+      target: {
+        value:
+          '1234567890123456789012345678901234567890123456789012345678901234',
+      },
+    });
+
+    fireEvent.click(button);
+    await waitFor(() => {
+      expect(mockedNavigate).toBeCalledWith(
+        `${Routes.PARTIES}/0x1234567890123456789012345678901234567890123456789012345678901234`
+      );
+    });
+  });
+
  it('should redirect to blocks page if passed a number', async () => {
    render(renderComponent());
    const { button, input } = getInputs();
+    mockGetSearchType.mockResolvedValue(SearchTypes.Block);
    fireEvent.change(input, {
      target: {
        value: '123',
@@ -1,55 +1,54 @@
+import React, { useCallback, useState } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
-import { Input, InputError, Button } from '@vegaprotocol/ui-toolkit';
-import React from 'react';
+import { Button, Input, InputError } from '@vegaprotocol/ui-toolkit';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
+import { getSearchType, SearchTypes, toHex } from './detect-search';
 import { Routes } from '../../routes/route-names';

-const TX_LENGTH = 64;
-
 interface FormFields {
  search: string;
 }

-const isPrependedTransaction = (search: string) =>
-  search.startsWith('0x') && search.length === 2 + TX_LENGTH;
-
-const isTransaction = (search: string) =>
-  !search.startsWith('0x') && search.length === TX_LENGTH;
-
-const isBlock = (search: string) => !Number.isNaN(Number(search));
-
 export const Search = () => {
  const { register, handleSubmit } = useForm<FormFields>();
  const navigate = useNavigate();
-  const [error, setError] = React.useState<Error | null>(null);
-  const onSubmit = React.useCallback(
-    (fields: FormFields) => {
+  const [error, setError] = useState<Error | null>(null);
+
+  const onSubmit = useCallback(
+    async (fields: FormFields) => {
      setError(null);

-      const search = fields.search;
-      if (!search) {
-        setError(new Error(t('Search required')));
-      } else if (isPrependedTransaction(search)) {
-        if (Number.isNaN(Number(search))) {
-          setError(new Error(t('Transaction is not hexadecimal')));
-        } else {
-          navigate(`${Routes.TX}/${search}`);
-        }
-      } else if (isTransaction(search)) {
-        if (Number.isNaN(Number(`0x${search}`))) {
-          setError(new Error(t('Transaction is not hexadecimal')));
-        } else {
-          navigate(`${Routes.TX}/0x${search}`);
-        }
-      } else if (isBlock(search)) {
-        navigate(`${Routes.BLOCKS}/${Number(search)}`);
-      } else {
-        setError(new Error(t("Something doesn't look right")));
+      const query = fields.search;
+
+      if (!query) {
+        return setError(new Error(t('Search query required')));
      }
+
+      const result = await getSearchType(query);
+      const urlAsHex = toHex(query);
+      const unrecognisedError = new Error(
+        t('Transaction type is not recognised')
+      );
+
+      if (result) {
+        switch (result) {
+          case SearchTypes.Party:
+            return navigate(`${Routes.PARTIES}/${urlAsHex}`);
+          case SearchTypes.Transaction:
+            return navigate(`${Routes.TX}/${urlAsHex}`);
+          case SearchTypes.Block:
+            return navigate(`${Routes.BLOCKS}/${Number(query)}`);
+          default:
+            return setError(unrecognisedError);
+        }
+      }
+
+      return setError(unrecognisedError);
    },
    [navigate]
  );
+
  return (
    <form
      onSubmit={handleSubmit(onSubmit)}
@@ -59,22 +58,24 @@ export const Search = () => {
        {t('Search by block number or transaction hash')}
      </label>
      <div className="flex items-stretch gap-2">
-        <Input
-          {...register('search')}
-          id="search"
-          data-testid="search"
-          className="text-white"
-          hasError={Boolean(error?.message)}
-          type="text"
-          placeholder={t('Enter block number or transaction hash')}
-        />
-        {error?.message && (
-          <div className="absolute top-[100%] flex-1 w-full">
-            <InputError data-testid="search-error" intent="danger">
-              {error.message}
-            </InputError>
-          </div>
-        )}
+        <div className="flex grow relative">
+          <Input
+            {...register('search')}
+            id="search"
+            data-testid="search"
+            className="text-white"
+            hasError={Boolean(error?.message)}
+            type="text"
+            placeholder={t('Enter block number, party id or transaction hash')}
+          />
+          {error?.message && (
+            <div className="bg-white border border-t-0 border-accent absolute top-[100%] flex-1 w-full pb-2 px-2 rounded-b">
+              <InputError data-testid="search-error" intent="danger">
+                {error.message}
+              </InputError>
+            </div>
+          )}
+        </div>
        <Button type="submit" size="sm" data-testid="search-button">
          {t('Search')}
        </Button>
@@ -1,92 +1,90 @@
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
-import { render, screen, fireEvent, act } from '@testing-library/react';
+import { render, screen } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';

 describe('Txs infinite list item', () => {
-  it('should display "missing vital data" if "Type" data missing', () => {
+  it('should display "missing vital data" if "type" data missing', () => {
    render(
      <TxsInfiniteListItem
-        // @ts-ignore testing deliberate failure
-        Type={undefined}
-        Command={'test'}
-        Sig={'test'}
-        PubKey={'test'}
-        Nonce={1}
-        TxHash={'test'}
+        type={undefined}
+        submitter="test"
+        hash=""
+        index={0}
+        block="1"
      />
    );
    expect(screen.getByText('Missing vital data')).toBeInTheDocument();
  });

-  it('should display "missing vital data" if "Command" data missing', () => {
+  it('should display "missing vital data" if "hash" data missing', () => {
    render(
      <TxsInfiniteListItem
-        Type={'test'}
-        // @ts-ignore testing deliberate failure
-        Command={undefined}
-        Sig={'test'}
-        PubKey={'test'}
-        Nonce={1}
-        TxHash={'test'}
+        type="test"
+        submitter="test"
+        hash={undefined}
+        index={0}
+        block="1"
      />
    );
    expect(screen.getByText('Missing vital data')).toBeInTheDocument();
  });

-  it('should display "missing vital data" if "Pubkey" data missing', () => {
+  it('should display "missing vital data" if "submitter" data missing', () => {
    render(
      <TxsInfiniteListItem
-        Type={'test'}
-        Command={'test'}
-        Sig={'test'}
-        // @ts-ignore testing deliberate failure
-        PubKey={undefined}
-        Nonce={1}
-        TxHash={'test'}
+        type="test"
+        submitter={undefined}
+        hash="test"
+        index={0}
+        block="1"
      />
    );
    expect(screen.getByText('Missing vital data')).toBeInTheDocument();
  });

-  it('should display "missing vital data" if "TxHash" data missing', () => {
+  it('should display "missing vital data" if "block" data missing', () => {
    render(
      <TxsInfiniteListItem
-        Type={'test'}
-        Command={'test'}
-        Sig={'test'}
-        PubKey={'test'}
-        Nonce={1}
-        // @ts-ignore testing deliberate failure
-        TxHash={undefined}
+        type="test"
+        submitter="test"
+        hash="test"
+        index={0}
+        block={undefined}
+      />
+    );
+    expect(screen.getByText('Missing vital data')).toBeInTheDocument();
+  });
+
+  it('should display "missing vital data" if "index" data missing', () => {
+    render(
+      <TxsInfiniteListItem
+        type="test"
+        submitter="test"
+        hash="test"
+        index={undefined}
+        block="1"
      />
    );
    expect(screen.getByText('Missing vital data')).toBeInTheDocument();
  });

  it('renders data correctly', () => {
-    const testCommandData = JSON.stringify({
-      test: 'test of command data',
-    });
-
    render(
      <MemoryRouter>
        <TxsInfiniteListItem
-          Type={'testType'}
-          Command={testCommandData}
-          Sig={'testSig'}
-          PubKey={'testPubKey'}
-          Nonce={1}
-          TxHash={'testTxHash'}
+          type="testType"
+          submitter="testPubKey"
+          hash="testTxHash"
+          index={1}
+          block="1"
        />
      </MemoryRouter>
    );
    expect(screen.getByTestId('tx-hash')).toHaveTextContent('testTxHash');
    expect(screen.getByTestId('pub-key')).toHaveTextContent('testPubKey');
-    expect(screen.getByTestId('type')).toHaveTextContent('testType');
-    const button = screen.getByTestId('command-details');
-    act(() => {
-      fireEvent.click(button);
-    });
-    expect(screen.getByText('"test of command data"')).toBeInTheDocument();
+    expect(screen.getByTestId('tx-type')).toHaveTextContent('testType');
+    expect(screen.getByTestId('tx-block')).toHaveTextContent(
+      'Block 1 (index 1)'
+    );
  });
 });
@@ -1,69 +1,60 @@
-import React, { useState } from 'react';
-import {
-  Dialog,
-  Icon,
-  Intent,
-  SyntaxHighlighter,
-} from '@vegaprotocol/ui-toolkit';
+import React from 'react';
 import { TruncatedLink } from '../truncate/truncated-link';
 import { Routes } from '../../routes/route-names';
 import { TxOrderType } from './tx-order-type';
-import type { ChainExplorerTxResponse } from '../../routes/types/chain-explorer-response';
+import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';
+import { toHex } from '../search/detect-search';

 const TRUNCATE_LENGTH = 14;

 export const TxsInfiniteListItem = ({
-  TxHash,
-  PubKey,
-  Type,
-  Command,
-}: ChainExplorerTxResponse) => {
-  const [open, setOpen] = useState(false);
-
-  if (!TxHash || !PubKey || !Type || !Command) {
+  hash,
+  submitter,
+  type,
+  block,
+  index,
+}: Partial<BlockExplorerTransactionResult>) => {
+  if (
+    !hash ||
+    !submitter ||
+    !type ||
+    block === undefined ||
+    index === undefined
+  ) {
    return <div>Missing vital data</div>;
  }

  return (
    <div
      data-testid="transaction-row"
-      className="grid grid-cols-[repeat(2,_1fr)_240px] gap-12 w-full border-t border-neutral-600 dark:border-neutral-800 py-8 txs-infinite-list-item"
+      className="grid grid-flow-col auto-cols-auto border-t border-neutral-600 dark:border-neutral-800 py-2 txs-infinite-list-item"
    >
-      <div className="whitespace-nowrap overflow-scroll" data-testid="tx-hash">
+      <div className="whitespace-nowrap" data-testid="tx-type">
+        <TxOrderType orderType={type} />
+      </div>
+      <div className="whitespace-nowrap" data-testid="pub-key">
        <TruncatedLink
-          to={`/${Routes.TX}/${TxHash}`}
-          text={TxHash}
+          to={`/${Routes.PARTIES}/${submitter}`}
+          text={submitter}
          startChars={TRUNCATE_LENGTH}
          endChars={TRUNCATE_LENGTH}
        />
      </div>
-      <div className="whitespace-nowrap overflow-scroll" data-testid="pub-key">
+      <div className="whitespace-nowrap" data-testid="tx-hash">
        <TruncatedLink
-          to={`/${Routes.PARTIES}/${PubKey}`}
-          text={PubKey}
+          to={`/${Routes.TX}/${toHex(hash)}`}
+          text={hash}
          startChars={TRUNCATE_LENGTH}
          endChars={TRUNCATE_LENGTH}
        />
      </div>
-      <div
-        className="flex justify-between whitespace-nowrap overflow-scroll"
-        data-testid="type"
-      >
-        <TxOrderType orderType={Type} />
-        <button
-          title="More details"
-          onClick={() => setOpen(true)}
-          data-testid="command-details"
-        >
-          <Icon name="search-template" />
-        </button>
-        <Dialog
-          open={open}
-          onChange={(isOpen) => setOpen(false)}
-          intent={Intent.None}
-        >
-          <SyntaxHighlighter data={JSON.parse(Command)} />
-        </Dialog>
+      <div className="whitespace-nowrap" data-testid="tx-block">
+        <TruncatedLink
+          to={`/${Routes.BLOCKS}/${block}`}
+          text={`Block ${block} (index ${index})`}
+          startChars={TRUNCATE_LENGTH}
+          endChars={TRUNCATE_LENGTH}
+        />
      </div>
    </div>
  );
@@ -1,18 +1,34 @@
 import { TxsInfiniteList } from './txs-infinite-list';
 import { render, screen, fireEvent, act } from '@testing-library/react';
 import { MemoryRouter } from 'react-router-dom';
+import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';

-const generateTxs = (number: number) => {
+const generateTxs = (number: number): BlockExplorerTransactionResult[] => {
  return Array.from(Array(number)).map((_) => ({
-    Type: 'ChainEvent',
-    Command:
-      '{"txId":"0xc8941ac4ea989988cb8f72e8fdab2e2009376fd17619491439d36b519d27bc93","nonce":"1494","stakingEvent":{"index":"263","block":"14805346","stakeDeposited":{"ethereumAddress":"0x2e5fe63e5d49c26998cf4bfa9b64de1cf9ae7ef2","vegaPublicKey":"657c2a8a5867c43c831e24820b7544e2fdcc1cf610cfe0ece940fe78137400fd","amount":"38471116086510047870875","blockTime":"1652968806"}}}',
-    Sig: 'fe7624ab742c492cf1e667e79de4777992aca8e093c8707e1f22685c3125c6082cd21b85cd966a61ad4ca0cca2f8bed3082565caa5915bc3b2f78c1ae35cac0b',
-    PubKey:
-      '0x7d69327393cdfaaae50e5e215feca65273eafabfb38f32b8124e66298af346d5',
-    Nonce: 18296387398179254000,
-    TxHash:
-      '0x9C753FA6325F7A40D9C4FA5C25E24476C54613E12B1FA2DD841E3BB00D088B77',
+    block: '87901',
+    index: 2,
+    hash: '0F8B98DA0923A50786B852D9CA11E051CACC4C733E1DB93D535C7D81DBD10F6F',
+    submitter:
+      '4b782482f587d291e8614219eb9a5ee9280fa2c58982dee71d976782a9be1964',
+    type: 'Submit Order',
+    code: 0,
+    cursor: '87901.2',
+    command: {
+      nonce: '4214037379192575529',
+      blockHeight: '87898',
+      orderSubmission: {
+        marketId:
+          'b4d0a070f5cc73a7d53b23d6f63f8cb52e937ed65d2469a3af4cc1e80e155fcf',
+        price: '14525946',
+        size: '54',
+        side: 'SIDE_SELL',
+        timeInForce: 'TIME_IN_FORCE_GTT',
+        expiresAt: '1664966445481288736',
+        type: 'TYPE_LIMIT',
+        reference: 'traderbot',
+        peggedOrder: null,
+      },
+    },
  }));
 };

@@ -41,7 +57,9 @@ describe('Txs infinite list', () => {
        error={Error('test error!')}
      />
    );
-    expect(screen.getByText('Error: test error!')).toBeInTheDocument();
+    expect(
+      screen.getByText('Cannot fetch transaction: Error: test error!')
+    ).toBeInTheDocument();
  });

  it('item renders data of n length into list of n length', () => {
@@ -3,19 +3,19 @@ import { FixedSizeList as List } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
 import { t } from '@vegaprotocol/react-helpers';
 import { TxsInfiniteListItem } from './txs-infinite-list-item';
-import type { ChainExplorerTxResponse } from '../../routes/types/chain-explorer-response';
+import type { BlockExplorerTransactionResult } from '../../routes/types/block-explorer-response';

 interface TxsInfiniteListProps {
  hasMoreTxs: boolean;
  areTxsLoading: boolean | undefined;
-  txs: ChainExplorerTxResponse[] | undefined;
+  txs: BlockExplorerTransactionResult[] | undefined;
  loadMoreTxs: () => void;
  error: Error | undefined;
  className?: string;
 }

 interface ItemProps {
-  index: ChainExplorerTxResponse;
+  index: BlockExplorerTransactionResult;
  style: React.CSSProperties;
  isLoading: boolean;
  error: Error | undefined;
@@ -27,19 +27,19 @@ const NOOP = () => {};
 const Item = ({ index, style, isLoading, error }: ItemProps) => {
  let content;
  if (error) {
-    content = t(`${error}`);
+    content = t(`Cannot fetch transaction: ${error}`);
  } else if (isLoading) {
    content = t('Loading...');
  } else {
-    const { TxHash, PubKey, Type, Command, Sig, Nonce } = index;
+    const { hash, submitter, type, command, block, index: blockIndex } = index;
    content = (
      <TxsInfiniteListItem
-        Type={Type}
-        Command={Command}
-        Sig={Sig}
-        PubKey={PubKey}
-        Nonce={Nonce}
-        TxHash={TxHash}
+        type={type}
+        command={command}
+        submitter={submitter}
+        hash={hash}
+        block={block}
+        index={blockIndex}
      />
    );
  }
@@ -71,10 +71,11 @@ export const TxsInfiniteList = ({

  return (
    <div className={className} data-testid="transactions-list">
-      <div className="grid grid-cols-[repeat(2,_1fr)_240px] gap-12 w-full mb-8">
-        <div className="text-lg font-bold">Txn hash</div>
-        <div className="text-lg font-bold">Party</div>
+      <div className="grid grid-flow-col auto-cols-auto w-full mb-8">
        <div className="text-lg font-bold pl-2">Type</div>
+        <div className="text-lg font-bold">Submitted By</div>
+        <div className="text-lg font-bold">Transaction ID</div>
+        <div className="text-lg font-bold">Block</div>
      </div>
      <div data-testid="infinite-scroll-wrapper">
        <InfiniteLoader
@@ -13,6 +13,7 @@ export const ENV = {
  dsn: windowOrDefault('NX_EXPLORER_SENTRY_DSN'),
  dataSources: {
    chainExplorerUrl: windowOrDefault('NX_CHAIN_EXPLORER_URL'),
+    blockExplorerUrl: windowOrDefault('NX_BLOCK_EXPLORER'),
    tendermintUrl: windowOrDefault('NX_TENDERMINT_URL'),
    tendermintWebsocketUrl: windowOrDefault('NX_TENDERMINT_WEBSOCKET_URL'),
  },
@@ -1,10 +1,13 @@
 import { gql, useQuery } from '@apollo/client';
-import { getAssets, t } from '@vegaprotocol/react-helpers';
+import { t } from '@vegaprotocol/react-helpers';
 import React from 'react';
 import { RouteTitle } from '../../components/route-title';
 import { SubHeading } from '../../components/sub-heading';
 import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
-import type { AssetsQuery } from './__generated__/AssetsQuery';
+import type {
+  AssetsQuery,
+  AssetsQuery_assetsConnection_edges_node,
+} from './__generated__/AssetsQuery';

 export const ASSETS_QUERY = gql`
  query AssetsQuery {
@@ -39,7 +42,10 @@ export const ASSETS_QUERY = gql`
 const Assets = () => {
  const { data } = useQuery<AssetsQuery>(ASSETS_QUERY);

-  const assets = getAssets(data);
+  const assets =
+    data?.assetsConnection?.edges
+      ?.filter((e) => e && e?.node)
+      .map((e) => e?.node as AssetsQuery_assetsConnection_edges_node) || [];

  return (
    <section>
@@ -13,12 +13,13 @@ import { SubHeading } from '../../../components/sub-heading';
 import { SyntaxHighlighter } from '@vegaprotocol/ui-toolkit';
 import { Panel } from '../../../components/panel';
 import { InfoPanel } from '../../../components/info-panel';
+import { toNonHex } from '../../../components/search/detect-search';
 import { DATA_SOURCES } from '../../../config';
-import type { TendermintSearchTransactionResponse } from '../tendermint-transaction-response';
 import type {
  PartyAssetsQuery,
  PartyAssetsQueryVariables,
 } from './__generated__/PartyAssetsQuery';
+import type { BlockExplorerTransactions } from '../../../routes/types/block-explorer-response';

 const PARTY_ASSETS_QUERY = gql`
  query PartyAssetsQuery($partyId: ID!) {
@@ -57,13 +58,12 @@ const PARTY_ASSETS_QUERY = gql`

 const Party = () => {
  const { party } = useParams<{ party: string }>();
+  const partyId = party ? toNonHex(party) : '';

  const {
    state: { data: partyData },
-  } = useFetch<TendermintSearchTransactionResponse>(
-    `${
-      DATA_SOURCES.tendermintUrl
-    }/tx_search?query="tx.submitter='${party?.replace('0x', '')}'"`
+  } = useFetch<BlockExplorerTransactions>(
+    `${DATA_SOURCES.blockExplorerUrl}/transactions?limit=1&filters[tx.submitter]=${partyId}`
  );

  const { data } = useQuery<PartyAssetsQuery, PartyAssetsQueryVariables>(
@@ -71,7 +71,7 @@ const Party = () => {
    {
      // Don't cache data for this query, party information can move quite quickly
      fetchPolicy: 'network-only',
-      variables: { partyId: party?.replace('0x', '') || '' },
+      variables: { partyId },
      skip: !party,
    }
  );
@@ -150,7 +150,9 @@ const Party = () => {
          <SubHeading>{t('Staking')}</SubHeading>
          {staking}
          <SubHeading>{t('JSON')}</SubHeading>
-          <SyntaxHighlighter data={data} />
+          <section data-testid="parties-json">
+            <SyntaxHighlighter data={data} />
+          </section>
        </>
      ) : null}

@@ -13,7 +13,7 @@ import Genesis from './genesis';
 import { Block } from './blocks/id';
 import { Blocks } from './blocks/home';
 import { Tx } from './txs/id';
-import { TxsHome, TxsHomeFallback } from './txs/home';
+import { TxsList } from './txs/home';
 import { PendingTxs } from './pending';
 import flags from '../config/flags';
 import { t } from '@vegaprotocol/react-helpers';
@@ -141,7 +141,7 @@ const routerConfig = [
      },
      {
        index: true,
-        element: flags.txsList ? <TxsHome /> : <TxsHomeFallback />,
+        element: <TxsList />,
      },
    ],
  },
@@ -1,86 +1,73 @@
 import { DATA_SOURCES } from '../../../config';
-import { useCallback, useState, useMemo } from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { t, useFetch } from '@vegaprotocol/react-helpers';
 import { RouteTitle } from '../../../components/route-title';
 import { BlocksRefetch } from '../../../components/blocks';
-import { JumpToBlock } from '../../../components/jump-to-block';
 import { TxsInfiniteList } from '../../../components/txs';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import type { ChainExplorerTxResponse } from '../../types/chain-explorer-response';
-import type { TendermintBlockchainResponse } from '../../blocks/tendermint-blockchain-response';
-
-interface TxsProps {
-  latestBlockHeight: string;
-}
+import type {
+  BlockExplorerTransactionResult,
+  BlockExplorerTransactions,
+} from '../../../routes/types/block-explorer-response';

 interface TxsStateProps {
-  txsData: ChainExplorerTxResponse[];
+  txsData: BlockExplorerTransactionResult[];
  hasMoreTxs: boolean;
-  nextPage: number;
+  lastCursor: string;
 }

-const Txs = ({ latestBlockHeight }: TxsProps) => {
-  const [{ txsData, hasMoreTxs, nextPage }, setTxsState] =
+const BE_TXS_PER_REQUEST = 100;
+
+export const TxsList = () => {
+  const [{ txsData, hasMoreTxs, lastCursor }, setTxsState] =
    useState<TxsStateProps>({
      txsData: [],
      hasMoreTxs: true,
-      nextPage: 1,
+      lastCursor: '',
    });

-  const reusedBodyParams = useMemo(
-    () => ({
-      node_url: DATA_SOURCES.tendermintUrl,
-      transaction_height: parseInt(latestBlockHeight),
-      page_size: 30,
-    }),
-    [latestBlockHeight]
-  );
-
  const {
-    state: { error, loading },
+    state: { data, error, loading },
    refetch,
-  } = useFetch(
-    DATA_SOURCES.chainExplorerUrl,
-    {
-      method: 'POST',
-      body: JSON.stringify(reusedBodyParams),
-    },
+  } = useFetch<BlockExplorerTransactions>(
+    `${DATA_SOURCES.blockExplorerUrl}/transactions?` +
+      new URLSearchParams({
+        limit: BE_TXS_PER_REQUEST.toString(10),
+      }),
+    {},
    false
  );

-  const loadTxs = useCallback(async () => {
-    const data = await refetch(
-      undefined,
-      JSON.stringify({
-        ...reusedBodyParams,
-        page_number: nextPage,
-      })
-    );
-
-    if (data) {
+  useEffect(() => {
+    if (data?.transactions?.length) {
      setTxsState((prev) => ({
-        ...prev,
-        nextPage: prev.nextPage + 1,
+        txsData: [...prev.txsData, ...data.transactions],
        hasMoreTxs: true,
-        txsData: [...prev.txsData, ...(data as ChainExplorerTxResponse[])],
+        lastCursor:
+          data.transactions[data.transactions.length - 1].cursor || '',
      }));
    }
-  }, [nextPage, refetch, reusedBodyParams]);
+  }, [data?.transactions]);
+
+  const loadTxs = useCallback(() => {
+    return refetch({
+      limit: BE_TXS_PER_REQUEST,
+      before: lastCursor,
+    });
+  }, [lastCursor, refetch]);
+
+  const refreshTxs = useCallback(async () => {
+    setTxsState((prev) => ({
+      ...prev,
+      lastCursor: '',
+      hasMoreTxs: true,
+      txsData: [],
+    }));
+  }, [setTxsState]);

  return (
    <section>
      <RouteTitle>{t('Transactions')}</RouteTitle>
-      <BlocksRefetch
-        refetch={() =>
-          refetch(
-            undefined,
-            JSON.stringify({
-              ...reusedBodyParams,
-              page_number: 1,
-            })
-          )
-        }
-      />
+      <BlocksRefetch refetch={refreshTxs} />
      <TxsInfiniteList
        hasMoreTxs={hasMoreTxs}
        areTxsLoading={loading}
@@ -89,42 +76,6 @@ const Txs = ({ latestBlockHeight }: TxsProps) => {
        error={error}
        className="mb-28"
      />
-      <JumpToBlock />
    </section>
  );
 };
-
-export const TxsHome = () => {
-  const {
-    state: { data, error, loading },
-  } = useFetch<TendermintBlockchainResponse>(
-    `${DATA_SOURCES.tendermintUrl}/blockchain`
-  );
-
-  return (
-    <AsyncRenderer
-      loading={!!loading}
-      loadingMessage={t('Getting latest block height...')}
-      error={error}
-      data={data}
-      noDataMessage={t('Could not get latest block height')}
-      render={(data) => (
-        <Txs
-          latestBlockHeight={
-            data?.result?.block_metas?.[0]?.header?.height || ''
-          }
-        />
-      )}
-    />
-  );
-};
-
-export const TxsHomeFallback = () => (
-  <>
-    <RouteTitle>{t('Transactions')}</RouteTitle>
-    <div>
-      The transactions list is currently disabled. Please use the search bar to
-      discover transaction data
-    </div>
-  </>
-);
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`ozone access unlock valid olympic save include omit supply green clown session`