fix: fix candles.mock

fix: fix position dp on volume chart
Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop
2023-01-26 14:13:46 +00:00 · 2023-01-26 13:47:18 +00:00 · 2023-01-26 12:41:00 +00:00 · 2023-01-26 12:36:47 +00:00 · 2023-01-26 12:06:16 +00:00 · 2023-01-26 12:00:00 +00:00
210 changed files with 3798 additions and 2264 deletions
@@ -1,6 +1,18 @@
+outputs:
+  token:
+    description: 'api-token of wallet'
+    value: ${{ steps.generate-api-token.outputs.api-token }}
 runs:
  using: 'composite'
  steps:
+    - name: Vegacapsule version
+      shell: bash
+      run: vegacapsule version
+
+    - name: Vega wallet version
+      shell: bash
+      run: vega wallet software version
+
    - name: Start nomad
      shell: bash
      run: vegacapsule nomad &
@@ -8,3 +20,32 @@ runs:
    - name: Bootstrap network
      shell: bash
      run: vegacapsule network bootstrap --config-path=./frontend-monorepo/vegacapsule/config.hcl --force
+
+    - name: Initialize wallet
+      shell: bash
+      run: vega wallet init -f --home ~/.vegacapsule/testnet/wallet
+
+    - name: Import wallet
+      shell: bash
+      run: vega wallet import -w capsule_wallet --recovery-phrase-file ./frontend-monorepo/vegacapsule/recovery -p ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet
+
+    - name: Generate second public key
+      shell: bash
+      run: vega wallet key generate -w capsule_wallet -p ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet
+
+    - name: Import network
+      shell: bash
+      run: vega wallet network import --force --from-file ./frontend-monorepo/vegacapsule/wallet-config.toml --home ~/.vegacapsule/testnet/wallet
+
+    - name: Init api-token
+      shell: bash
+      run: vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file ./frontend-monorepo/vegacapsule/passphrase
+
+    - name: Generate api-token
+      id: generate-api-token
+      shell: bash
+      run: echo api-token=$(vega wallet api-token generate --wallet-name capsule_wallet --tokens-passphrase-file ./frontend-monorepo/vegacapsule/passphrase  --wallet-passphrase-file ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet | grep -Eo '[a-zA-Z0-9]{64}') >> $GITHUB_OUTPUT
+
+    - name: Start service using capsule network
+      shell: bash
+      run: vega wallet service run -n DV --load-tokens --tokens-passphrase-file ./frontend-monorepo/vegacapsule/passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet &
@@ -1,35 +0,0 @@
-outputs:
-  token:
-    description: 'api-token of wallet'
-    value: ${{ steps.generate-api-token.outputs.api-token }}
-runs:
-  using: 'composite'
-  steps:
-    - name: Initialize wallet
-      shell: bash
-      run: vega wallet init -f --home ~/.vegacapsule/testnet/wallet
-
-    - name: Import wallet
-      shell: bash
-      run: vega wallet import -w capsule_wallet --recovery-phrase-file ./frontend-monorepo/vegacapsule/recovery -p ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet
-
-    - name: Generate second public key
-      shell: bash
-      run: vega wallet key generate -w capsule_wallet -p ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet
-
-    - name: Import network
-      shell: bash
-      run: vega wallet network import --force --from-file ./frontend-monorepo/vegacapsule/wallet-config.toml --home ~/.vegacapsule/testnet/wallet
-
-    - name: Init api-token
-      shell: bash
-      run: vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file ./frontend-monorepo/vegacapsule/passphrase
-
-    - name: Generate api-token
-      id: generate-api-token
-      shell: bash
-      run: echo api-token=$(vega wallet api-token generate --wallet-name capsule_wallet --tokens-passphrase-file ./frontend-monorepo/vegacapsule/passphrase  --wallet-passphrase-file ./frontend-monorepo/vegacapsule/passphrase --home ~/.vegacapsule/testnet/wallet | grep -Eo '[a-zA-Z0-9]{64}') >> $GITHUB_OUTPUT
-
-    - name: Start service using capsule network
-      shell: bash
-      run: vega wallet service run -n DV --load-tokens --tokens-passphrase-file ./frontend-monorepo/vegacapsule/passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet &
@@ -1,48 +0,0 @@
-inputs:
-  recovery:
-    description: 'Recovery phrase'
-  passphrase:
-    description: 'Wallet password'
-outputs:
-  token:
-    description: 'api-token of wallet'
-    value: ${{ steps.generate-api-token.outputs.api-token }}
-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: vega wallet init -f --home ~/.vegacapsule/testnet/wallet
-
-    - name: Import wallet
-      shell: bash
-      run: vega wallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-    - name: Create public key 2
-      shell: bash
-      run: vega wallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-    - name: Import network
-      shell: bash
-      run: vega wallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml" --force --home ~/.vegacapsule/testnet/wallet
-
-    - name: Init api-token
-      shell: bash
-      run: vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file passphrase
-
-    - name: Generate api-token
-      id: generate-api-token
-      shell: bash
-      run: echo api-token=$(vega wallet api-token generate --wallet-name UI_Trading_Test --tokens-passphrase-file passphrase  --wallet-passphrase-file passphrase --home ~/.vegacapsule/testnet/wallet | grep -Eo '[a-zA-Z0-9]{64}') >> $GITHUB_OUTPUT
-
-    - name: Start service using stagnet3 network
-      shell: bash
-      run: vega wallet service run -n stagnet3 --load-tokens --tokens-passphrase-file passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet &
@@ -1,49 +0,0 @@
-name: Cypress tests -- manual trigger
-
-# This workflow runs the frontend tests against chosen branch
-
-on:
-  workflow_dispatch:
-    inputs:
-      project:
-        description: 'Project'
-        required: true
-        type: choice
-        options:
-          - explorer-e2e
-          - token-e2e
-          - trading-e2e
-      tags:
-        description: 'Test tags to run'
-        required: true
-        type: string
-        default: '@smoke, @regression, @slow'
-      skip-nx-cache:
-        description: 'Add --skip-nx-cache to cypress test'
-        required: false
-        type: boolean
-        default: false
-jobs:
-  manual:
-    name: Run Cypress tests -- manual trigger
-    runs-on: ubuntu-latest
-    steps:
-      - name: Set tags
-        run: echo TAGS="--env.grepTags '[ ${{ github.event.inputs.tags }} ]'" >> $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
-
-    outputs:
-      skip-cache: ${{env.SKIP_NX_CACHE}}
-      tags: ${{env.TAGS}}
-
-  dispatch:
-    needs: manual
-    uses: ./.github/workflows/tests-dispatcher.yml
-    secrets: inherit
-    with:
-      project: ${{ inputs.project }}
-      skip-cache: ${{needs.manual.outputs.skip-cache}}
-      tags: ${{needs.manual.outputs.tags}}
@@ -1,17 +0,0 @@
-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:
-    uses: ./.github/workflows/tests-dispatcher.yml
-    secrets: inherit
-    with:
-      project: '[explorer-e2e, token-e2e, trading-e2e]'
-      tags: --env.grepTags '[ @smoke, @regression, @slow ]'
-      night-run: true
@@ -1,61 +0,0 @@
-name: Cypress tests - PR
-
-on:
-  push:
-    branches:
-      - develop
-      - main
-  pull_request:
-    types:
-      - opened
-      - reopened
-      - synchronize
-      - ready_for_review
-jobs:
-  pr:
-    runs-on: ubuntu-latest
-    steps:
-      # Checkout front ends
-      - name: Checkout frontend mono repo
-        uses: actions/checkout@v2
-        with:
-          fetch-depth: 0
-          path: './frontend-monorepo'
-
-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            frontend-monorepo/node_modules
-            /home/runner/.cache/Cypress
-          key: node_modules_cypress-${{ hashFiles('frontend-monorepo/yarn.lock', 'frontend-monorepo/package.json') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      # 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 affected projects
-      - name: See affected apps
-        run: echo AFFECTED=$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects) >> $GITHUB_ENV
-        working-directory: frontend-monorepo
-
-    outputs:
-      projects: ${{ env.AFFECTED }}
-
-  dispatch:
-    needs: pr
-    uses: ./.github/workflows/tests-dispatcher.yml
-    secrets: inherit
-    with:
-      project: ${{ needs.pr.outputs.projects }}
-      tags: "--env.grepTags='[ @smoke, @regression ]'"
@@ -1,99 +0,0 @@
-name: Cypress - explorer
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-      skip-cache:
-        required: false
-        type: string
-      tags:
-        required: false
-        type: string
-      night-run:
-        required: false
-        type: boolean
-        default: false
-
-jobs:
-  explorer-e2e:
-    if: ${{ inputs.trigger == 'true' }}
-    runs-on: self-hosted
-    timeout-minutes: 30
-    steps:
-      - name: Vega version
-        run: vega version
-
-      - name: Vegacapsule version
-        run: vegacapsule version
-
-      # Checkout front ends
-      - name: Checkout frontend mono repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          path: './frontend-monorepo'
-
-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            frontend-monorepo/node_modules
-            /home/runner/.cache/Cypress
-          key: node_modules_cypress-${{ hashFiles('frontend-monorepo/yarn.lock', 'frontend-monorepo/package.json') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      ######
-      ## Setup a Vega wallet for our user
-      ######
-
-      - name: Run Vegacapsule network
-        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-
-      - name: Set up Vegawallet for capsule
-        id: setup-vega
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet-docker
-
-      ######
-      ## Run some tests
-      ######
-
-      # To make sure that all Cypress binaries are installed properly
-      - name: Install cypress bins
-        run: yarn cypress install
-        working-directory: frontend-monorepo
-
-      - name: Run Cypress tests
-        run: npx nx run explorer-e2e:e2e ${{ inputs.skip-cache }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ inputs.tags }}
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_NIGHTLY_RUN: ${{ inputs.night-run }}
-          CYPRESS_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}
-
-      ######
-      ## Upload logs
-      ######
-
-      # Artifact path is not valid: /ganache-1/capsule-logscolletor.stderr-2022-12-22T10:20:30Z.log. Contains the following character:  Colon :
-      - name: Rename files to allow archive
-        if: ${{ always() }}
-        run: |
-          while read -r file; do
-            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
-          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)
-
-      - uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: logs
-          path: /home/runner/.vegacapsule/testnet/logs
@@ -0,0 +1,33 @@
+name: Cypress tests -- manual trigger
+
+# This workflow runs the frontend tests against chosen branch
+
+on:
+  workflow_dispatch:
+    inputs:
+      project:
+        description: 'Project'
+        required: true
+        type: choice
+        options:
+          - explorer-e2e
+          - token-e2e
+          - trading-e2e
+      tags:
+        description: 'Test tags to run'
+        required: true
+        type: string
+        default: '@smoke @regression @slow'
+      skip-nx-cache:
+        description: 'Skip NX cache'
+        required: false
+        type: boolean
+        default: false
+jobs:
+  manual:
+    uses: ./.github/workflows/cypress-run.yml
+    secrets: inherit
+    with:
+      projects: '["${{inputs.project}}"]'
+      skip-cache: ${{inputs.skip-nx-cache}}
+      tags: ${{inputs.tags}}
@@ -0,0 +1,14 @@
+name: Cypress tests -- night run
+
+on:
+  schedule:
+    - cron: '0 4 * * *'
+  workflow_dispatch:
+
+jobs:
+  nightly:
+    uses: ./.github/workflows/cypress-run.yml
+    secrets: inherit
+    with:
+      projects: '["explorer-e2e","token-e2e","trading-e2e"]'
+      tags: '@smoke @regression @slow'
@@ -0,0 +1,78 @@
+name: Cypress tests - PR
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - synchronize
+      - ready_for_review
+jobs:
+  pr:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout frontend mono repo
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+
+      - name: Remove package.json & yarn.lock to avoid installing everything
+        run: rm package.json yarn.lock
+
+      - name: Install nx
+        run: yarn add nx
+
+      # Check SHAs
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
+        with:
+          main-branch-name: ${{ github.base_ref || github.ref_name }}
+          set-environment-variables-for-job: true
+
+      # See affected apps
+      - name: See affected apps
+        run: |
+          affected=$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)
+          echo -n "Affected projects: $affected"
+          projects=""
+          if [[ $affected == *"token"* ]]; then projects+='"token-e2e" '; fi
+          if [[ $affected == *"trading"* ]]; then projects+='"trading-e2e" '; fi
+          if [[ $affected == *"explorer"* ]]; then projects+='"explorer-e2e" '; fi
+          if [[ -z "$projects" ]]; then projects+='"token-e2e" "trading-e2e" "explorer-e2e" '; fi
+          projects=${projects%?}
+          projects=[${projects// /,}]
+          echo PROJECTS=$projects >> $GITHUB_ENV
+
+    outputs:
+      projects: ${{ env.PROJECTS }}
+
+  run:
+    needs: pr
+    if: ${{ needs.pr.outputs.projects != '[]' }}
+    uses: ./.github/workflows/cypress-run.yml
+    secrets: inherit
+    with:
+      projects: ${{ needs.pr.outputs.projects }}
+      tags: '@smoke @regression'
+
+  # Report single result at the end, to avoid mess with required checks in PR
+  result:
+    if: ${{ always() }}
+    needs: run
+    runs-on: ubuntu-latest
+    name: Cypress result
+    steps:
+      - run: |
+          result="${{ needs.run.result }}"
+          if [[ $result == "success" || $result == "skipped" ]]; then
+            exit 0
+          else
+            exit 1
+          fi
@@ -1,30 +1,29 @@
-name: Cypress - token
-
 on:
  workflow_call:
    inputs:
-      trigger:
+      projects:
        required: true
        type: string
-        default: 'false'
      skip-cache:
        required: false
-        type: string
+        type: boolean
      tags:
        required: false
        type: string

 jobs:
-  token-e2e:
-    if: ${{ inputs.trigger == 'true' }}
-    runs-on: self-hosted
-    timeout-minutes: 60
+  e2e:
+    strategy:
+      fail-fast: false
+      matrix:
+        project: ${{ fromJSON(inputs.projects) }}
+    runs-on: self-hosted-runner
+    timeout-minutes: 30
    steps:
-      - name: Vega version
-        run: vega version
-
-      - name: Vegacapsule version
-        run: vegacapsule version
+      # Checks if skip cache was requested
+      - name: Set skip-nx-cache flag
+        if: ${{ inputs.skip-cache == true }}
+        run: echo "SKIP_CACHE=--skip-nx-cache" >> $GITHUB_ENV

      # Checkout front ends
      - name: Checkout frontend mono repo
@@ -47,33 +46,31 @@ jobs:
        run: yarn install --frozen-lockfile
        working-directory: frontend-monorepo

+      # Make sure that all Cypress binaries are installed properly
+      - name: Install cypress bins
+        run: yarn cypress install
+        working-directory: frontend-monorepo
+
      ######
-      ## Setup a Vega wallet for our user
+      ## Setup Vegacapsule and Vega wallet
      ######

-      - name: Run Vegacapsule network
-        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-
-      - name: Set up Vegawallet for capsule
+      - name: Run Vegacapsule network and Vega wallet
        id: setup-vega
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet-docker
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule

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

-      # To make sure that all Cypress binaries are installed properly
-      - name: Install cypress bins
-        run: yarn cypress install
-        working-directory: frontend-monorepo
-
      - name: Run Cypress tests
-        run: npx nx run token-e2e:e2e ${{ inputs.skip-cache }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ inputs.tags }}
+        run: yarn nx run ${{ matrix.project }}:e2e ${{ env.SKIP_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        working-directory: frontend-monorepo
        env:
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}
+          CYPRESS_grepTags: ${{ inputs.tags }}

      ######
      ## Upload logs
@@ -87,8 +84,8 @@ jobs:
            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)

-      - uses: actions/upload-artifact@v2
+      - uses: actions/upload-artifact@v3
        if: ${{ always() }}
        with:
-          name: logs-token
+          name: logs-${{ matrix.project }}
          path: /home/runner/.vegacapsule/testnet/logs
@@ -1,86 +0,0 @@
-name: Cypress - trading
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-      skip-cache:
-        required: false
-        type: string
-      tags:
-        required: false
-        type: string
-
-jobs:
-  trading-e2e:
-    if: ${{ inputs.trigger == 'true' }}
-    timeout-minutes: 30
-    runs-on: self-hosted
-    steps:
-      - name: Vega version
-        run: vega version
-
-      # Checkout front ends
-      - name: Checkout frontend mono repo
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          path: './frontend-monorepo'
-
-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        with:
-          path: |
-            frontend-monorepo/node_modules
-            /home/runner/.cache/Cypress
-          key: node_modules_cypress-${{ hashFiles('frontend-monorepo/yarn.lock', 'frontend-monorepo/package.json') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      ######
-      ## Setup a Vega wallet for our user
-      ######
-
-      - name: Run Vegacapsule network
-        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-
-      - name: Set up Vegawallet for capsule
-        id: setup-vega
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet-docker
-
-      # To make sure that all Cypress binaries are installed properly
-      - name: Install cypress bins
-        run: yarn cypress install
-        working-directory: frontend-monorepo
-
-      - name: Run Cypress tests
-        run: npx nx run trading-e2e:e2e ${{ inputs.skip-cache }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ inputs.tags }}
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}
-
-      ######
-      ## Upload logs
-      ######
-
-      - name: Rename files to allow archive
-        if: ${{ always() }}
-        run: |
-          while read -r file; do
-            mv "${file}" "$(echo ${file} | sed 's|:|-|g')"
-          done< <(find /home/runner/.vegacapsule/testnet/logs -type f)
-
-      - uses: actions/upload-artifact@v2
-        if: ${{ always() }}
-        with:
-          name: logs-trading
-          path: /home/runner/.vegacapsule/testnet/logs
@@ -1,41 +0,0 @@
-on:
-  workflow_call:
-    inputs:
-      project:
-        required: true
-        type: string
-      skip-cache:
-        required: false
-        type: string
-      tags:
-        required: false
-        type: string
-      night-run:
-        required: false
-        type: boolean
-
-jobs:
-  run-explorer-e2e:
-    uses: ./.github/workflows/cypress-explorer-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'explorer-e2e') || contains(inputs.project, 'explorer') }}
-      skip-cache: ${{ inputs.skip-cache }}
-      tags: ${{ inputs.tags }}
-      night-run: ${{ inputs.night-run }}
-
-  run-token-e2e:
-    uses: ./.github/workflows/cypress-token-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'token-e2e') || contains(inputs.project, 'token') }}
-      skip-cache: ${{ inputs.skip-cache }}
-      tags: ${{ inputs.tags }}
-
-  run-trading-e2e:
-    uses: ./.github/workflows/cypress-trading-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'trading-e2e') || contains(inputs.project, 'trading') }}
-      skip-cache: ${{ inputs.skip-cache }}
-      tags: ${{ inputs.tags }}
@@ -60,12 +60,10 @@ context('Home Page', function () {
      cy.get(statsValue).eq(9).should('not.be.empty');
      cy.get(statsValue).eq(10).should('not.be.empty');
      cy.get(statsValue).eq(11).should('not.be.empty');
-      if (Cypress.env('NIGHTLY_RUN') != true) {
-        cy.get(statsValue)
-          .eq(12)
-          .invoke('text')
-          .should('match', /v\d+\.\d+\.\d+/i);
-      }
+      cy.get(statsValue)
+        .eq(12)
+        .invoke('text')
+        .should('match', /v\d+\.\d+\.\d+/i);
      cy.get(statsValue)
        .eq(13)
        .invoke('text')
@@ -1,7 +1,7 @@
 # App configuration variables
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.testnet.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.testnet.vega.xyz/websocket/
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=TESTNET
@@ -2,16 +2,5 @@ query ExplorerSettlementAssetForMarket($id: ID!) {
  market(id: $id) {
    id
    decimalPlaces
-    tradableInstrument {
-      instrument {
-        product {
-          ... on Future {
-            settlementAsset {
-              decimals
-            }
-          }
-        }
-      }
-    }
  }
 }
@@ -8,7 +8,7 @@ export type ExplorerSettlementAssetForMarketQueryVariables = Types.Exact<{
 }>;


-export type ExplorerSettlementAssetForMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', product: { __typename?: 'Future', settlementAsset: { __typename?: 'Asset', decimals: number } } } } } | null };
+export type ExplorerSettlementAssetForMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number } | null };


 export const ExplorerSettlementAssetForMarketDocument = gql`
@@ -16,17 +16,6 @@ export const ExplorerSettlementAssetForMarketDocument = gql`
  market(id: $id) {
    id
    decimalPlaces
-    tradableInstrument {
-      instrument {
-        product {
-          ... on Future {
-            settlementAsset {
-              decimals
-            }
-          }
-        }
-      }
-    }
  }
 }
    `;
@@ -91,7 +91,7 @@ describe('LiquidityProvisionDetails component', () => {
    expect(res.getByTestId('SIDE_SELL-40-1')).toBeInTheDocument();
    expect(res.getByText('-1')).toBeInTheDocument();
    expect(res.getByText('Best Bid')).toBeInTheDocument();
-    expect(res.getByText('40% (normalised from: 20%)')).toBeInTheDocument();
+    expect(res.getByText('40%')).toBeInTheDocument();
  });

  it('handles a missing offset gracefully (should not happen)', () => {
@@ -125,7 +125,7 @@ describe('LiquidityProvisionDetails component', () => {
    );
    // Row test ids and keys are based on the side, reference and proportion - and that proportion is scaled
    expect(res.getByTestId('SIDE_SELL-40-1')).toBeInTheDocument();
-    expect(res.getByText('40% (normalised from: 20%)')).toBeInTheDocument();
+    expect(res.getByText('40%')).toBeInTheDocument();
    expect(res.getByText('-')).toBeInTheDocument();
  });
 });
@@ -67,11 +67,7 @@ export function LiquidityProvisionDetailsRow({
      <td className="text-center">
        {order.reference ? LiquidityReferenceLabel[order.reference] : '-'}
      </td>
-      <td className="text-center">
-        {proportion === order.proportion
-          ? `${proportion}%`
-          : `${proportion}% (normalised from: ${order.proportion}%)`}{' '}
-      </td>
+      <td className="text-center">{proportion}%</td>
    </TableRow>
  );
 }
@@ -13,15 +13,6 @@ const decimalsMock: ExplorerSettlementAssetForMarketQuery = {
    id: '123',
    __typename: 'Market',
    decimalPlaces: 5,
-    tradableInstrument: {
-      instrument: {
-        product: {
-          settlementAsset: {
-            decimals: 5,
-          },
-        },
-      },
-    },
  },
 };

@@ -36,7 +36,7 @@ export function LiquidityProvisionOffset({
 }

 /**
- * Does the work of formatting the number now we have the settlement decimal places.
+ * Does the work of formatting the number now we have the market decimal places.
 * If no market data is assigned (i.e. during loading, or if the market doesn't exist)
 * this function will return the unformatted number
 *
@@ -49,9 +49,7 @@ export function getFormattedOffset(
  offset: string,
  data?: ExplorerSettlementAssetForMarketQuery
 ) {
-  const decimals =
-    data?.market?.tradableInstrument.instrument.product.settlementAsset
-      .decimals;
+  const decimals = data?.market?.decimalPlaces;

  if (!decimals) {
    return offset;
@@ -203,7 +203,7 @@ describe('LiquidityProvisionDetails component', () => {
    };

    const res = renderComponent(mock);
-    expect(res.getByText('45% (normalised from: 25%)')).toBeInTheDocument();
-    expect(res.getByText('55% (normalised from: 30%)')).toBeInTheDocument();
+    expect(res.getByText('45%')).toBeInTheDocument();
+    expect(res.getByText('55%')).toBeInTheDocument();
  });
 });
@@ -0,0 +1,45 @@
+import { render } from '@testing-library/react';
+import { JSONOracleData, parseData } from './data-submission-json-oracle';
+
+describe('JSONOracleData', () => {
+  it('renders a code block if there is a payload that is base64 encoded', () => {
+    const p = 'eyJwcmljZXMuRVRIOTkudmFsdWUiOiAiMTMwNTAwMDAwMCJ9';
+    const screen = render(<JSONOracleData payload={p} />);
+    expect(screen.getByTestId('json-code')).toBeInTheDocument();
+  });
+
+  it('renders an error if b64 decoding fails', () => {
+    const p = 'not-encoded';
+    const screen = render(<JSONOracleData payload={p} />);
+
+    expect(
+      screen.getByText('Awaiting Block Explorer transaction details')
+    ).toBeInTheDocument();
+  });
+});
+
+describe('Parse JSON oracle data', () => {
+  it('returns null for an invalid b64 string', () => {
+    expect(parseData('🤷')).toBeNull();
+  });
+
+  it('returns null for a string that looks like an object', () => {
+    expect(parseData('{}')).toBeNull();
+  });
+
+  it('returns null for null', () => {
+    expect(parseData(null as unknown as string)).toBeNull();
+  });
+
+  it('returns a string for b64 encoded data', () => {
+    const res = parseData('dGVzdCA9IHRydWU=');
+    expect(typeof res).toEqual('string');
+    expect(res).toEqual('test = true');
+  });
+
+  it('returns a string for b64 encoded json, without any extra parsing', () => {
+    const res = parseData('eyJ0ZXN0Ijp0cnVlfQ==');
+    expect(typeof res).toEqual('string');
+    expect(res).toEqual('{"test":true}');
+  });
+});
@@ -0,0 +1,40 @@
+import { t } from '@vegaprotocol/react-helpers';
+
+interface JSONOracleDataProps {
+  payload: string;
+}
+
+/**
+ * Renders a JSON oracle. Given the shape could be any valid JSON,
+ * this doesn't try to do anything smart - it just renders the message
+ */
+export const JSONOracleData = ({ payload }: JSONOracleDataProps) => {
+  const decodedSubmission = parseData(payload);
+
+  if (!decodedSubmission) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  return (
+    <section>
+      <code data-testid="json-code">{decodedSubmission}</code>
+    </section>
+  );
+};
+
+/**
+ * Safely parses the JSON Oracle payload
+ *
+ * @param payload base64 encoded JSON
+ * @returns Object or null
+ */
+export function parseData(payload: string) {
+  try {
+    if (!payload || typeof payload !== 'string') {
+      throw new Error('Not a string');
+    }
+    return atob(payload);
+  } catch (e) {
+    return null;
+  }
+}
@@ -0,0 +1,58 @@
+import { render } from '@testing-library/react';
+import { OpenOracleData, parseData } from './data-submission-open-oracle';
+
+describe('OpenOracleData', () => {
+  it('renders a table if there is data', () => {
+    const p =
+      'eyJtZXNzYWdlcyI6IFsiMHgwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDgwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDA2M2M3ZTMwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwYzAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwNGYxZjM4ZWEwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwNjcwNzI2OTYzNjU3MzAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAzNDI1NDQzMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMCJdLCAicHJpY2VzIjogeyJFVEgiOiIxMjMifSwgInNpZ25hdHVyZXMiOiBbIjB4N2U0Nzc2OWEyNzI5NzIwN2Q5ZTIyMmM3YTY2YjBlYzk3Njg4MWY3NmVkYjg5OGFhYzQ5OTRlZWYwOTc4MmI3NGUxMGE5MTJmZWQ1Y2E3NmFlN2U3NzVjOWZiOTBjZGE4ZjhkMDhlNzUyOTE1NzQ2ZTY2OGE1ZWM3OWRmOTZmNmQwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDFjIl0sICJ0aW1lc3RhbXAiOiAiMTIzIn0=';
+
+    const screen = render(<OpenOracleData payload={p} />);
+    expect(screen.getByTestId('decoded-payload')).toBeInTheDocument();
+    expect(screen.getByText('ETH')).toBeInTheDocument();
+    expect(screen.getByText('123')).toBeInTheDocument();
+  });
+
+  it('renders an error if decoding fails', () => {
+    const p = 'not-encoded';
+    const screen = render(<OpenOracleData payload={p} />);
+
+    expect(
+      screen.getByText('Awaiting Block Explorer transaction details')
+    ).toBeInTheDocument();
+  });
+});
+
+describe('Parse Open oracle data', () => {
+  it('returns null for an invalid b64 string', () => {
+    expect(parseData('🤷')).toBeNull();
+  });
+
+  it('returns null for a string that looks like an object', () => {
+    expect(parseData('{}')).toBeNull();
+  });
+
+  it('returns null for null', () => {
+    expect(parseData(null as unknown as string)).toBeNull();
+  });
+
+  it('returns a string for b64 encoded data', () => {
+    const res = parseData('dGVzdCA9IHRydWU=');
+    expect(res).toBeNull();
+  });
+
+  it('returns null if the parsed object does not look like te right shape', () => {
+    // Encoded: {"test":true}
+    const res = parseData('eyJ0ZXN0Ijp0cnVlfQ==');
+    expect(res).toBeNull();
+  });
+
+  it('returns an object if the payload parses and looks fine', () => {
+    // Encoded: {"messages": [], "prices": {}, "signatures": [], "timestamp": "123"}
+    const res = parseData(
+      'eyJtZXNzYWdlcyI6IFtdLCAicHJpY2VzIjoge30sICJzaWduYXR1cmVzIjogW10sICJ0aW1lc3RhbXAiOiAiMTIzIn0='
+    );
+    expect(typeof res.prices).toEqual('object');
+    expect(Array.isArray(res.messages)).toBeTruthy();
+    expect(Array.isArray(res.signatures)).toBeTruthy();
+  });
+});
@@ -0,0 +1,64 @@
+import { t } from '@vegaprotocol/react-helpers';
+import { NestedDataList } from '../../../nested-data-list';
+import { OpenOraclePrices } from './open-oracle/open-oracle-prices';
+
+interface OpenOracleDataProps {
+  payload: string;
+}
+
+/**
+ * Decodes Open Oracle data based on it's main parts:
+ * - messages
+ * - signatures
+ * - prices
+ */
+export const OpenOracleData = ({ payload }: OpenOracleDataProps) => {
+  const decodedSubmission = parseData(payload);
+
+  if (!decodedSubmission) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const date = decodedSubmission.timestamp;
+  const formattedDate = new Date(date * 1000).toLocaleString();
+
+  return (
+    <section>
+      <span>{formattedDate}</span>
+      <code>
+        <OpenOraclePrices
+          prices={decodedSubmission.prices}
+          messages={decodedSubmission.messages}
+          signatures={decodedSubmission.signatures}
+        />
+      </code>
+      <details data-testid="decoded-payload">
+        <summary>{t('Decoded payload')}</summary>
+        <NestedDataList data={decodedSubmission} />
+      </details>
+    </section>
+  );
+};
+
+/**
+ * Safely parses the Open Oracle payload
+ *
+ * @param payload base64 encoded JSON
+ * @returns Object or null
+ */
+export function parseData(payload: string) {
+  try {
+    if (!payload || typeof payload !== 'string') {
+      throw new Error('Not a string');
+    }
+
+    const res = JSON.parse(atob(payload));
+    if (!res.prices || !res.messages || !res.signatures) {
+      throw new Error('Not an open oracle format message');
+    }
+
+    return res;
+  } catch (e) {
+    return null;
+  }
+}
@@ -0,0 +1,88 @@
+import { render } from '@testing-library/react';
+import { OpenOraclePrices } from './open-oracle-prices';
+import type { Price } from './open-oracle-prices';
+
+describe('OpenOraclePrices', () => {
+  it('Will not render with no prices', () => {
+    const p = undefined as unknown as Price;
+    const m: string[] = [];
+    const s: string[] = [];
+    const screen = render(
+      <OpenOraclePrices prices={p} messages={m} signatures={s} />
+    );
+    expect(screen.container).toBeEmptyDOMElement();
+  });
+
+  it('Will not render with no messages', () => {
+    const m = undefined as unknown as string[];
+    const p: Price = {};
+    const s: string[] = [];
+    const screen = render(
+      <OpenOraclePrices prices={p} messages={m} signatures={s} />
+    );
+    expect(screen.container).toBeEmptyDOMElement();
+  });
+
+  it('will not render with no signatures', () => {
+    const s = undefined as unknown as string[];
+    const m: string[] = [];
+    const p: Price = {};
+    const screen = render(
+      <OpenOraclePrices prices={p} messages={m} signatures={s} />
+    );
+    expect(screen.container).toBeEmptyDOMElement();
+  });
+
+  it('will not render with mismatched prices/signatures', () => {
+    const p: Price = { ETH: '123' };
+    const m = ['0x123', '0x456'];
+    const s: string[] = [];
+    const screen = render(
+      <OpenOraclePrices prices={p} messages={m} signatures={s} />
+    );
+    expect(screen.container).toBeEmptyDOMElement();
+  });
+
+  it('will not render with mismatched signatures and messages', () => {
+    const p: Price = { ETH: '123', BTC: '12' };
+    const s = ['0xcac', '0xb33f'];
+    const m = ['0x1204o42c', '0xb3ddd3f', '0x9999'];
+
+    const screen = render(
+      <OpenOraclePrices prices={p} messages={m} signatures={s} />
+    );
+    expect(screen.container).toBeEmptyDOMElement();
+  });
+
+  it('renders a table when there are prices and signatures and messages', () => {
+    const p: Price = { ETH: '123', BTC: '12' };
+    const s = ['0xcac', '0xb33f'];
+    const m = ['0x120442c', '0xb3ddd3f'];
+
+    const screen = render(
+      <OpenOraclePrices prices={p} messages={m} signatures={s} />
+    );
+    expect(screen.getByTestId('openoracleprices')).toBeInTheDocument();
+
+    // Table headings
+    expect(screen.getByText('Asset')).toBeInTheDocument();
+    expect(screen.getByText('Price')).toBeInTheDocument();
+    expect(screen.getByText('Signature')).toBeInTheDocument();
+    expect(screen.getByText('Message')).toBeInTheDocument();
+    // Disabled - see vegaprotocol/frontend-monorepo#/2726
+    // expect(screen.getByText('Signer')).toBeInTheDocument();
+
+    // One row per asset
+    expect(screen.getByText('ETH')).toBeInTheDocument();
+    expect(screen.getByText('123')).toBeInTheDocument();
+    expect(screen.getByText('0xcac')).toBeInTheDocument();
+    expect(screen.getByText('0xb33f')).toBeInTheDocument();
+    // Does not test signer element for this row
+
+    expect(screen.getByText('BTC')).toBeInTheDocument();
+    expect(screen.getByText('12')).toBeInTheDocument();
+    expect(screen.getByText('0x120442c')).toBeInTheDocument();
+    expect(screen.getByText('0xb3ddd3f')).toBeInTheDocument();
+    // Does not test signer element for this row
+  });
+});
@@ -0,0 +1,132 @@
+import { t } from '@vegaprotocol/react-helpers';
+import { CopyWithTooltip } from '@vegaprotocol/ui-toolkit';
+import { TableRow } from '../../../../table';
+import { TruncateInline } from '../../../../truncate/truncate';
+import { utils } from 'ethers';
+
+export type Price = {
+  [key: string]: string;
+};
+
+interface OpenOraclePricesProps {
+  prices: Price;
+  signatures: string[];
+  messages: string[];
+}
+
+/**
+ * Open Oracle price table, showing the entries in this
+ * decoded message
+ *
+ * Notes:
+ * - Signer is derived by recovering the address from the
+ *   signature and the message. This is currently disabled
+ *   as the implementation is incorrect
+ */
+export function OpenOraclePrices({
+  prices,
+  messages,
+  signatures,
+}: OpenOraclePricesProps) {
+  if (
+    !prices ||
+    !messages ||
+    !signatures ||
+    Object.keys(prices).length !== messages.length ||
+    signatures.length !== messages.length
+  ) {
+    return null;
+  }
+
+  return (
+    <table data-testid="openoracleprices">
+      <thead>
+        <TableRow modifier="bordered">
+          <th>{t('Asset')}</th>
+          <th className="text-right">{t('Price')}</th>
+          <th>{t('Signature')}</th>
+          <th>{t('Message')}</th>
+          {/* <th>{t('Signer')}</th> */}
+        </TableRow>
+      </thead>
+      <tbody>
+        {Object.keys(prices).map((k: string, i: number) => {
+          if (k && prices[k]) {
+            const message = messages[i];
+            const signature = signatures[i];
+            return (
+              <OpenOraclePrice
+                key={`price-${i}`}
+                asset={k}
+                value={prices[k]}
+                message={message}
+                signature={signature}
+              />
+            );
+          } else {
+            return null;
+          }
+        })}
+      </tbody>
+    </table>
+  );
+}
+
+type OpenOraclePriceProps = {
+  asset: string;
+  value: string;
+  message: string;
+  signature: string;
+};
+
+export function OpenOraclePrice({
+  asset,
+  value,
+  signature,
+  message,
+}: OpenOraclePriceProps) {
+  //  const addr = getAddressFromMessageAndSignature(message, signature);
+  return (
+    <TableRow modifier="bordered" key={`${asset}`}>
+      <td className="px-4">{asset}</td>
+      <td className="px-4 text-right">{value}</td>
+      <td className="px-4">
+        <CopyWithTooltip text={signature}>
+          <button>
+            <TruncateInline text={signature} startChars={5} endChars={5} />
+          </button>
+        </CopyWithTooltip>
+      </td>
+      <td className="px-4">
+        <CopyWithTooltip text={message}>
+          <button>
+            <TruncateInline text={message} startChars={5} endChars={5} />
+          </button>
+        </CopyWithTooltip>
+      </td>
+      {/*<td className="px-4">
+        <CopyWithTooltip text={message}>
+          <button>
+            <TruncateInline text={addr} startChars={5} endChars={5} />
+          </button>
+      </CopyWithTooltip>
+      </td> */}
+    </TableRow>
+  );
+}
+
+export function getAddressFromMessageAndSignature(
+  message: string,
+  signature: string
+) {
+  try {
+    const m = utils.hashMessage(utils.arrayify(utils.keccak256(message)));
+    const s = utils.splitSignature(
+      signature.slice(0, 130) + signature.slice(-2)
+    );
+
+    return utils.recoverAddress(m, s);
+  } catch (e) {
+    return '-';
+  }
+}
@@ -0,0 +1,55 @@
+import { t } from '@vegaprotocol/react-helpers';
+import type { BlockExplorerTransactionResult } from '../../../routes/types/block-explorer-response';
+import type { TendermintBlocksResponse } from '../../../routes/blocks/tendermint-blocks-response';
+import { TxDetailsShared } from './shared/tx-details-shared';
+import { TableWithTbody } from '../../table';
+import type { components } from '../../../../types/explorer';
+import { OpenOracleData } from './oracle-data/data-submission-open-oracle';
+import { JSONOracleData } from './oracle-data/data-submission-json-oracle';
+
+export type OracleSubmissionSource =
+  components['schemas']['OracleDataSubmissionOracleSource'];
+
+interface TxDetailsDataSubmissionProps {
+  txData: BlockExplorerTransactionResult | undefined;
+  pubKey: string | undefined;
+  blockData: TendermintBlocksResponse | undefined;
+}
+
+/**
+ * Someone cancelled an order
+ */
+export const TxDetailsDataSubmission = ({
+  txData,
+  pubKey,
+  blockData,
+}: TxDetailsDataSubmissionProps) => {
+  if (!txData || !txData.command.oracleDataSubmission) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const type: OracleSubmissionSource =
+    txData.command.oracleDataSubmission.source;
+  if (!type) {
+    return <>{t('Awaiting Block Explorer transaction details')}</>;
+  }
+
+  const payload = txData.command.oracleDataSubmission.payload;
+
+  return (
+    <>
+      <TableWithTbody className="mb-8">
+        <TxDetailsShared
+          txData={txData}
+          pubKey={pubKey}
+          blockData={blockData}
+        />
+      </TableWithTbody>
+      {type === 'ORACLE_SOURCE_OPEN_ORACLE' ? (
+        <OpenOracleData payload={payload} />
+      ) : (
+        <JSONOracleData payload={payload} />
+      )}
+    </>
+  );
+};
@@ -19,6 +19,7 @@ import { TxDetailsUndelegate } from './tx-undelegation';
 import { TxDetailsLiquiditySubmission } from './tx-liquidity-submission';
 import { TxDetailsLiquidityAmendment } from './tx-liquidity-amend';
 import { TxDetailsLiquidityCancellation } from './tx-liquidity-cancel';
+import { TxDetailsDataSubmission } from './tx-data-submission';

 interface TxDetailsWrapperProps {
  txData: BlockExplorerTransactionResult | undefined;
@@ -82,6 +83,8 @@ function getTransactionComponent(txData?: BlockExplorerTransactionResult) {
  switch (txData.type) {
    case 'Submit Order':
      return TxDetailsOrder;
+    case 'Submit Oracle Data':
+      return TxDetailsDataSubmission;
    case 'Cancel Order':
      return TxDetailsOrderCancel;
    case 'Amend Order':
@@ -27,7 +27,7 @@ export const TxDetailsLiquidityCancellation = ({
  pubKey,
  blockData,
 }: TxDetailsLiquidityCancellationProps) => {
-  if (!txData || !txData.command.liquidityProvisionAmendment) {
+  if (!txData || !txData.command.liquidityProvisionCancellation) {
    return <>{t('Awaiting Block Explorer transaction details')}</>;
  }

@@ -10,7 +10,6 @@ import {
  formatNumberPercentage,
  t,
  toBigNum,
-  getDateTimeFormat,
 } from '@vegaprotocol/react-helpers';
 import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
 import type * as Schema from '@vegaprotocol/types';
@@ -31,6 +30,7 @@ import { HealthBar } from '../../health-bar';
 import { HealthDialog } from '../../health-dialog';
 import { Status } from '../../status';
 import { formatDistanceToNow } from 'date-fns';
+import { getExpiryDate } from '@vegaprotocol/react-helpers';

 export const MarketList = () => {
  const { data, error, loading } = useMarketsLiquidity();
@@ -299,17 +299,20 @@ export const MarketList = () => {
          />
          <AgGridColumn
            headerName={t('Closing Time')}
-            field="proposal.terms.closingDatetime"
+            field="tradableInstrument.instrument.metadata.tags"
            headerTooltip={t('Closing time of the market')}
            valueFormatter={({
-              value,
-            }: VegaValueFormatterParams<
-              Market,
-              'proposal.terms.closingDatetime'
-            >) => {
-              return value
-                ? getDateTimeFormat().format(new Date(value).getTime())
-                : '-';
+              data,
+            }: VegaValueFormatterParams<Market, ''>) => {
+              let expiry;
+              if (data?.tradableInstrument.instrument.metadata.tags) {
+                expiry = getExpiryDate(
+                  data?.tradableInstrument.instrument.metadata.tags,
+                  data?.marketTimestamps.close,
+                  data?.state
+                );
+              }
+              return expiry ? expiry : '-';
            }}
          />
        </Grid>
@@ -829,7 +829,7 @@ context(
        cy.highlight(`Associating tokens for first time`);
        cy.ethereum_wallet_connect();
        cy.connectVegaWallet();
-        cy.get('[href="/validators/associate"]').first().click();
+        cy.get('[href="/token/associate"]').first().click();
        cy.getByTestId('associate-radio-wallet', { timeout: 30000 }).click();
        cy.getByTestId('token-amount-input', epochTimeout).type('1');
        cy.getByTestId('token-input-submit-button', txTimeout)
@@ -61,7 +61,7 @@ context(
      // 3002-PROP-007
      cy.get(newProposalDescription).type('E2E test for proposals');

-      cy.get(proposalParameterSelect).find('option').should('have.length', 115);
+      cy.get(proposalParameterSelect).find('option').should('have.length', 116);
      cy.get(proposalParameterSelect).select(
        // 3007-PNEC-002
        'governance_proposal_asset_minEnact'
@@ -93,6 +93,7 @@ context(
          .contains(2.0, epochTimeout)
          .should('be.visible');

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        // 2002-SINC-007
@@ -145,6 +146,7 @@ context(
          .contains(2.0, epochTimeout)
          .should('be.visible');

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        cy.validate_validator_list_total_stake_and_share(
@@ -209,6 +211,7 @@ context(
          .contains(6.0, epochTimeout)
          .should('be.visible');

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        cy.validate_validator_list_total_stake_and_share(
@@ -243,6 +246,7 @@ context(
          .parent()
          .should('contain', 2.0, txTimeout);

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        cy.click_on_validator_from_list(1);
@@ -264,6 +268,7 @@ context(
          .eq(1)
          .should('contain', 1.0, txTimeout);

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        cy.get(`[row-id="${0}"]`).within(() => {
@@ -323,6 +328,7 @@ context(
            txTimeout
          );

+          cy.close_staking_dialog();
          cy.navigate_to('validators');
          // 2001-STKE-040
          cy.click_on_validator_from_list(0);
@@ -388,6 +394,7 @@ context(
          txTimeout
        );

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        cy.click_on_validator_from_list('0');
@@ -447,6 +454,7 @@ context(
          txTimeout
        );

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        cy.click_on_validator_from_list(0);
@@ -488,6 +496,7 @@ context(
          txTimeout
        );

+        cy.close_staking_dialog();
        cy.navigate_to('validators');

        cy.click_on_validator_from_list(0);
@@ -7,11 +7,11 @@ const vegaWalletUnstakedBalance =
  '[data-testid="vega-wallet-balance-unstaked"]';
 const txTimeout = Cypress.env('txTimeout');
 const vegaWalletPublicKeyShort = Cypress.env('vegaWalletPublicKeyShort');
-const ethWalletAssociateButton = '[href="/validators/associate"]';
+const ethWalletAssociateButton = '[href="/token/associate"]';
 const associateWalletRadioButton = '[data-testid="associate-radio-wallet"]';
 const tokenAmountInputBox = '[data-testid="token-amount-input"]';
 const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
-const ethWalletDissociateButton = '[href="/validators/disassociate"]';
+const ethWalletDissociateButton = '[href="/token/disassociate"]';
 const vestingContractSection = '[data-testid="vega-in-vesting-contract"]';
 const vegaInWalletSection = '[data-testid="vega-in-wallet"]';
 const connectedVegaKey = '[data-testid="connected-vega-key"]';
@@ -170,6 +170,27 @@ context(
        });
    });

+    it('Unable to withdraw asset on pub key view', function () {
+      const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey');
+      const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
+
+      // Disconnect vega wallet
+      cy.getByTestId('manage-vega-wallet').click();
+      cy.getByTestId('disconnect').click();
+
+      cy.connectPublicKey(vegaWalletPubKey);
+      cy.getByTestId(withdraw).should('be.visible').click();
+      cy.getByTestId(selectAsset).select(usdtName);
+      cy.getByTestId(balanceAvailable, txTimeout).should('exist');
+      cy.getByTestId(amountInput).click().type('100');
+      cy.getByTestId(submitWithdrawalButton).click();
+
+      cy.getByTestId('dialog-content').within(() => {
+        cy.get('h1').should('have.text', 'Transaction failed');
+        cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+      });
+    });
+
    function waitForAssetsDisplayed(expectedAsset) {
      cy.contains(expectedAsset, txTimeout).should('be.visible');
    }
@@ -131,7 +131,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
        cy.get(associateVegaLink)
          .should('be.visible')
          .and('have.attr', 'href')
-          .and('equal', '/validators/associate');
+          .and('equal', '/token/associate');
      });
      it('should have STAKING button', function () {
        cy.get(stakingBtn)
@@ -0,0 +1,62 @@
+/// <reference types="cypress" />
+const vegaWalletPubKey = Cypress.env('vegaWalletPublicKey2');
+const vegaPubkeyTruncated = Cypress.env('vegaWalletPublicKey2Short');
+const banner = 'view-banner';
+
+context('View functionality with public key', { tags: '@smoke' }, function () {
+  before('send asset to wallet', function () {
+    cy.vega_wallet_faucet_assets_without_check(
+      'fUSDC',
+      '1000000',
+      vegaWalletPubKey
+    );
+  });
+
+  beforeEach('visit home page', function () {
+    cy.visit('/');
+    cy.wait_for_spinner();
+    cy.connectPublicKey(vegaWalletPubKey);
+  });
+
+  it('Able to connect public key via wallet', function () {
+    verifyConnectedToPubKey();
+    cy.getByTestId('currency-title').should('contain.text', 'USDC (fake)');
+  });
+
+  it('Able to connect public key using url', function () {
+    cy.getByTestId('exit-view').click();
+    cy.visit(`/?address=${vegaWalletPubKey}`);
+    verifyConnectedToPubKey();
+  });
+
+  it('Unable to submit proposal with public key', function () {
+    const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;
+
+    cy.navigate_to('proposals');
+    cy.go_to_make_new_proposal('Freeform');
+    cy.enter_unique_freeform_proposal_body('50', 'pub key proposal test');
+    cy.getByTestId('proposal-submit').should('be.visible').click();
+    cy.getByTestId('dialog-content').within(() => {
+      cy.get('h1').should('have.text', 'Transaction failed');
+      cy.getByTestId('Error').should('have.text', expectedErrorTxt);
+    });
+  });
+
+  it('Able to disconnect via banner', function () {
+    cy.getByTestId('exit-view').click();
+    cy.getByTestId(banner).should('not.exist');
+  });
+
+  it('Able to disconnect via wallet', function () {
+    cy.getByTestId('manage-vega-wallet').click();
+    cy.getByTestId('disconnect').click();
+    cy.getByTestId(banner).should('not.exist');
+  });
+
+  function verifyConnectedToPubKey() {
+    cy.getByTestId(banner).should(
+      'contain.text',
+      `Viewing as Vega user: ${vegaPubkeyTruncated}`
+    );
+  }
+});
@@ -2,8 +2,8 @@ const walletContainer = '[data-testid="ethereum-wallet"]';
 const walletHeader = '[data-testid="wallet-header"] h1';
 const connectToEthButton = '[data-testid="connect-to-eth-wallet-button"]';
 const connectorList = '[data-testid="web3-connector-list"]';
-const associate = '[href="/validators/associate"]';
-const disassociate = '[href="/validators/disassociate"]';
+const associate = '[href="/token/associate"]';
+const disassociate = '[href="/token/disassociate"]';
 const disconnect = '[data-testid="disconnect-from-eth-wallet-button"]';
 const accountNo = '[data-testid="ethereum-account-truncated"]';
 const currencyTitle = '[data-testid="currency-title"]';
@@ -3,8 +3,8 @@ const tokenSubmitButton = '[data-testid="token-input-submit-button"]';
 const tokenInputApprove = '[data-testid="token-input-approve-button"]';
 const addStakeRadioButton = '[data-testid="add-stake-radio"]';
 const removeStakeRadioButton = '[data-testid="remove-stake-radio"]';
-const ethWalletAssociateButton = '[href="/validators/associate"]';
-const ethWalletDissociateButton = '[href="/validators/disassociate"]';
+const ethWalletAssociateButton = '[href="/token/associate"]';
+const ethWalletDissociateButton = '[href="/token/disassociate"]';
 const vegaWalletUnstakedBalance =
  '[data-testid="vega-wallet-balance-unstaked"]';
 const vegaWalletAssociatedBalance = '[data-testid="currency-value"]';
@@ -40,7 +40,6 @@ Cypress.Commands.add('staking_validator_page_add_stake', (stake) => {
    .and('contain', `Add ${stake} $VEGA tokens`)
    .and('be.visible')
    .click();
-  cy.get(dialogCloseButton).click();
 });

 Cypress.Commands.add('staking_validator_page_remove_stake', (stake) => {
@@ -11,6 +11,7 @@ NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -14,6 +14,7 @@ NX_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit suppl
 NX_LOCAL_PROVIDER_URL=http://localhost:8545/
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50

 #Test configuration variables
 CYPRESS_FAIRGROUND=false
@@ -8,3 +8,4 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50
@@ -8,4 +8,5 @@ NX_ETHERSCAN_URL=https://etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
-NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
+NX_SENTRY_DSN=https://4b8c8a8ba07742648aa4dfe1b8d17e40:87edc2605e544f888305d7fc4a9141bd@o286262.ingest.sentry.io/5882996
+NX_DELEGATIONS_PAGINATION=50
@@ -8,3 +8,4 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://mirror.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/mainnet
+NX_DELEGATIONS_PAGINATION=50
@@ -5,3 +5,4 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://sta
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
 NX_VEGA_EXPLORER_URL=https://sandbox.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50
@@ -5,3 +5,4 @@ NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://sta
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+NX_DELEGATIONS_PAGINATION=50
@@ -6,3 +6,4 @@ NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_DELEGATIONS_PAGINATION=50
@@ -9,3 +9,4 @@ NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
+NX_DELEGATIONS_PAGINATION=50
@@ -164,12 +164,12 @@ const ConnectedKey = () => {
        )}
      </section>
      <WalletCardActions>
-        <Link className="flex-1" to={`${Routes.VALIDATORS}/associate`}>
+        <Link className="flex-1" to={Routes.ASSOCIATE}>
          <Button size="sm" fill={true}>
            {t('associate')}
          </Button>
        </Link>
-        <Link className="flex-1" to={`${Routes.VALIDATORS}/disassociate`}>
+        <Link className="flex-1" to={Routes.DISASSOCIATE}>
          <Button size="sm" fill={true}>
            {t('disassociate')}
          </Button>
@@ -21,7 +21,7 @@ export function TemplateSidebar({ children, sidebar }: TemplateSidebarProps) {
      ) : (
        <div />
      )}
-      <div className="w-full border-b border-neutral-700 lg:grid lg:grid-rows-[min-content_1fr] lg:grid-cols-[1fr_450px]">
+      <div className="w-full border-b border-neutral-700 lg:grid lg:grid-rows-[1fr] lg:grid-cols-[1fr_450px]">
        <main className="col-start-1 p-4">{children}</main>
        <aside className="col-start-2 row-start-1 row-span-2 hidden lg:block p-4 bg-banner bg-contain border-l border-neutral-700">
          {sidebar.map((Component, i) => (
@@ -12,7 +12,7 @@ export const SplashLoader = ({ text = 'Loading' }: { text?: string }) => {

  return (
    <div className="flex flex-col items-center" data-testid="splash-loader">
-      <div className="flex flex-wrap w-[50px] h-[50px] mb-20">
+      <div className="flex flex-wrap w-[50px] h-[50px] mb-4">
        {new Array(25).fill(null).map((_, i) => {
          return (
            <div
@@ -7,13 +7,13 @@ fragment WalletDelegationFields on Delegation {
  epoch
 }

-query Delegations($partyId: ID!) {
+query Delegations($partyId: ID!, $delegationsPagination: Pagination) {
  epoch {
    id
  }
  party(id: $partyId) {
    id
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          ...WalletDelegationFields
@@ -7,6 +7,7 @@ export type WalletDelegationFieldsFragment = { __typename?: 'Delegation', amount

 export type DelegationsQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
+  delegationsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;


@@ -23,13 +24,13 @@ export const WalletDelegationFieldsFragmentDoc = gql`
 }
    `;
 export const DelegationsDocument = gql`
-    query Delegations($partyId: ID!) {
+    query Delegations($partyId: ID!, $delegationsPagination: Pagination) {
  epoch {
    id
  }
  party(id: $partyId) {
    id
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          ...WalletDelegationFields
@@ -76,6 +77,7 @@ export const DelegationsDocument = gql`
 * const { data, loading, error } = useDelegationsQuery({
 *   variables: {
 *      partyId: // value for 'partyId'
+ *      delegationsPagination: // value for 'delegationsPagination'
 *   },
 * });
 */
@@ -1,92 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type WalletDelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } };
-
-export type DelegationsQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type DelegationsQuery = { __typename?: 'Query', epoch: { __typename?: 'Epoch', id: string }, party?: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string, name: string } } } | null> | null } | null, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', name: string, id: string, decimals: number, symbol: string, source: { __typename: 'BuiltinAsset' } | { __typename: 'ERC20', contractAddress: string } } } } | null> | null } | null } | null };
-
-export const WalletDelegationFieldsFragmentDoc = gql`
-    fragment WalletDelegationFields on Delegation {
-  amount
-  node {
-    id
-    name
-  }
-  epoch
-}
-    `;
-export const DelegationsDocument = gql`
-    query Delegations($partyId: ID!) {
-  epoch {
-    id
-  }
-  party(id: $partyId) {
-    id
-    delegationsConnection {
-      edges {
-        node {
-          ...WalletDelegationFields
-        }
-      }
-    }
-    stakingSummary {
-      currentStakeAvailable
-    }
-    accountsConnection {
-      edges {
-        node {
-          asset {
-            name
-            id
-            decimals
-            symbol
-            source {
-              __typename
-              ... on ERC20 {
-                contractAddress
-              }
-            }
-          }
-          type
-          balance
-        }
-      }
-    }
-  }
-}
-    ${WalletDelegationFieldsFragmentDoc}`;
-
-/**
- * __useDelegationsQuery__
- *
- * To run a query within a React component, call `useDelegationsQuery` and pass it any options that fit your needs.
- * When your component renders, `useDelegationsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useDelegationsQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useDelegationsQuery(baseOptions: Apollo.QueryHookOptions<DelegationsQuery, DelegationsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<DelegationsQuery, DelegationsQueryVariables>(DelegationsDocument, options);
-      }
-export function useDelegationsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<DelegationsQuery, DelegationsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<DelegationsQuery, DelegationsQueryVariables>(DelegationsDocument, options);
-        }
-export type DelegationsQueryHookResult = ReturnType<typeof useDelegationsQuery>;
-export type DelegationsLazyQueryHookResult = ReturnType<typeof useDelegationsLazyQuery>;
-export type DelegationsQueryResult = Apollo.QueryResult<DelegationsQuery, DelegationsQueryVariables>;
@@ -4,6 +4,7 @@ import keyBy from 'lodash/keyBy';
 import uniq from 'lodash/uniq';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { ENV } from '../../config';

 import noIcon from '../../images/token-no-icon.png';
 import vegaBlack from '../../images/vega_black.png';
@@ -23,18 +24,18 @@ import type {
  DelegationsQuery,
  DelegationsQueryVariables,
  WalletDelegationFieldsFragment,
-} from './__generated___/Delegations';
-import { DelegationsDocument } from './__generated___/Delegations';
+} from './__generated__/Delegations';
+import { DelegationsDocument } from './__generated__/Delegations';

 export const usePollForDelegations = () => {
  const { token: vegaToken } = useContracts();
  const {
    appState: { decimals },
  } = useAppState();
-
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
  const client = useApolloClient();
+  const { delegationsPagination } = ENV;
  const [delegations, setDelegations] = React.useState<
    WalletDelegationFieldsFragment[]
  >([]);
@@ -62,7 +63,14 @@ export const usePollForDelegations = () => {
        client
          .query<DelegationsQuery, DelegationsQueryVariables>({
            query: DelegationsDocument,
-            variables: { partyId: pubKey },
+            variables: {
+              partyId: pubKey,
+              delegationsPagination: delegationsPagination
+                ? {
+                    first: Number(delegationsPagination),
+                  }
+                : undefined,
+            },
            fetchPolicy: 'network-only',
          })
          .then((res) => {
@@ -207,7 +215,7 @@ export const usePollForDelegations = () => {
      clearInterval(interval);
      mounted = false;
    };
-  }, [client, decimals, pubKey, t, vegaToken.address]);
+  }, [delegationsPagination, client, decimals, pubKey, t, vegaToken.address]);

  return { delegations, currentStakeAvailable, delegatedNodes, accounts };
 };
@@ -64,6 +64,7 @@ export const ENV = {
  docsUrl: windowOrDefault('NX_VEGA_DOCS_URL'),
  ethWalletMnemonic: windowOrDefault('NX_ETH_WALLET_MNEMONIC'),
  localProviderUrl: windowOrDefault('NX_LOCAL_PROVIDER_URL'),
+  delegationsPagination: windowOrDefault('NX_DELEGATIONS_PAGINATION'),
  flags: {
    NETWORK_DOWN: TRUTHY.includes(windowOrDefault('NX_NETWORK_DOWN')),
    MOCK: TRUTHY.includes(windowOrDefault('NX_MOCKED')),
@@ -1,5 +1,5 @@
 import BigNumber from 'bignumber.js';
-import create from 'zustand';
+import { create } from 'zustand';
 import type { UserTrancheBalance } from '../../contexts/app-state/app-state-context';

 export interface AssociationBreakdown {
@@ -3,16 +3,17 @@ import type { Web3ReactHooks } from '@web3-react/core';
 import { initializeConnector } from '@web3-react/core';
 import { MetaMask } from '@web3-react/metamask';
 import { WalletConnect } from '@web3-react/walletconnect';
-import { Url } from './url-connector';
 import type { Connector } from '@web3-react/types';
 import { ENV } from '../config/env';
+import { UrlConnector } from '@vegaprotocol/web3';

 const [metamask, metamaskHooks] = initializeConnector<MetaMask>(
  (actions) => new MetaMask(actions)
 );

-const [urlConnector, urlHooks] = initializeConnector<Url>(
-  (actions) => new Url(actions, ENV.localProviderUrl)
+const [urlConnector, urlHooks] = initializeConnector<UrlConnector>(
+  (actions) =>
+    new UrlConnector(actions, ENV.localProviderUrl, ENV.ethWalletMnemonic)
 );

 export const createDefaultProvider = (providerUrl: string, chainId: number) => {
@@ -20,6 +20,24 @@ query Proposal($proposalId: ID!) {
        ... on NewMarket {
          decimalPlaces
          metadata
+          lpPriceRange
+          riskParameters {
+            ... on LogNormalRiskModel {
+              riskAversionParameter
+              tau
+              params {
+                mu
+                r
+                sigma
+              }
+            }
+            ... on SimpleRiskModel {
+              params {
+                factorLong
+                factorShort
+              }
+            }
+          }
          instrument {
            name
            code
@@ -32,6 +50,7 @@ query Proposal($proposalId: ID!) {
                quantum
              }
              quoteName
+
              dataSourceSpecForSettlementData {
                sourceType {
                  ... on DataSourceDefinitionInternal {
@@ -20,7 +20,7 @@ fragment DelegationFields on Delegation {
  epoch
 }

-query Rewards($partyId: ID!) {
+query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
  party(id: $partyId) {
    id
    rewardsConnection {
@@ -30,7 +30,7 @@ query Rewards($partyId: ID!) {
        }
      }
    }
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          ...DelegationFields
@@ -9,6 +9,7 @@ export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: stri

 export type RewardsQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
+  delegationsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;


@@ -39,7 +40,7 @@ export const DelegationFieldsFragmentDoc = gql`
 }
    `;
 export const RewardsDocument = gql`
-    query Rewards($partyId: ID!) {
+    query Rewards($partyId: ID!, $delegationsPagination: Pagination) {
  party(id: $partyId) {
    id
    rewardsConnection {
@@ -49,7 +50,7 @@ export const RewardsDocument = gql`
        }
      }
    }
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          ...DelegationFields
@@ -82,6 +83,7 @@ ${DelegationFieldsFragmentDoc}`;
 * const { data, loading, error } = useRewardsQuery({
 *   variables: {
 *      partyId: // value for 'partyId'
+ *      delegationsPagination: // value for 'delegationsPagination'
 *   },
 * });
 */
@@ -1,98 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type RewardFieldsFragment = { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } };
-
-export type DelegationFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number };
-
-export type RewardsQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type RewardsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, rewardsConnection?: { __typename?: 'RewardsConnection', edges?: Array<{ __typename?: 'RewardEdge', node: { __typename?: 'Reward', rewardType: Types.AccountType, amount: string, percentageOfTotal: string, receivedAt: any, asset: { __typename?: 'Asset', id: string, symbol: string }, party: { __typename?: 'Party', id: string }, epoch: { __typename?: 'Epoch', id: string } } } | null> | null } | null, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } } };
-
-export const RewardFieldsFragmentDoc = gql`
-    fragment RewardFields on Reward {
-  rewardType
-  asset {
-    id
-    symbol
-  }
-  party {
-    id
-  }
-  epoch {
-    id
-  }
-  amount
-  percentageOfTotal
-  receivedAt
-}
-    `;
-export const DelegationFieldsFragmentDoc = gql`
-    fragment DelegationFields on Delegation {
-  amount
-  epoch
-}
-    `;
-export const RewardsDocument = gql`
-    query Rewards($partyId: ID!) {
-  party(id: $partyId) {
-    id
-    rewardsConnection {
-      edges {
-        node {
-          ...RewardFields
-        }
-      }
-    }
-    delegationsConnection {
-      edges {
-        node {
-          ...DelegationFields
-        }
-      }
-    }
-  }
-  epoch {
-    id
-    timestamps {
-      start
-      end
-      expiry
-    }
-  }
-}
-    ${RewardFieldsFragmentDoc}
-${DelegationFieldsFragmentDoc}`;
-
-/**
- * __useRewardsQuery__
- *
- * To run a query within a React component, call `useRewardsQuery` and pass it any options that fit your needs.
- * When your component renders, `useRewardsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useRewardsQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useRewardsQuery(baseOptions: Apollo.QueryHookOptions<RewardsQuery, RewardsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<RewardsQuery, RewardsQueryVariables>(RewardsDocument, options);
-      }
-export function useRewardsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<RewardsQuery, RewardsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<RewardsQuery, RewardsQueryVariables>(RewardsDocument, options);
-        }
-export type RewardsQueryHookResult = ReturnType<typeof useRewardsQuery>;
-export type RewardsLazyQueryHookResult = ReturnType<typeof useRewardsLazyQuery>;
-export type RewardsQueryResult = Apollo.QueryResult<RewardsQuery, RewardsQueryVariables>;
@@ -9,7 +9,7 @@ import type {
  RewardsQuery,
  RewardFieldsFragment,
  DelegationFieldsFragment,
-} from './__generated___/Rewards';
+} from './__generated__/Rewards';
 import {
  formatNumber,
  removePaginationWrapper,
@@ -4,6 +4,7 @@ import { formatDistance } from 'date-fns';
 import Duration from 'duration-js';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
+import { ENV } from '../../../config';

 import { EpochCountdown } from '../../../components/epoch-countdown';
 import { Heading } from '../../../components/heading';
@@ -15,7 +16,7 @@ import {
 import { RewardInfo } from './reward-info';
 import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { useNetworkParams, NetworkParams } from '@vegaprotocol/react-helpers';
-import { useRewardsQuery } from './__generated___/Rewards';
+import { useRewardsQuery } from './__generated__/Rewards';

 export const RewardsPage = () => {
  const { t } = useTranslation();
@@ -24,8 +25,16 @@ export const RewardsPage = () => {
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
  const { appDispatch } = useAppState();
+  const { delegationsPagination } = ENV;
  const { data, loading, error } = useRewardsQuery({
-    variables: { partyId: pubKey || '' },
+    variables: {
+      partyId: pubKey || '',
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
+    },
    skip: !pubKey,
  });
  const { params } = useNetworkParams([
@@ -264,8 +264,6 @@ const routerConfig = [
    path: Routes.VALIDATORS,
    element: <LazyStaking name="Staking" />,
    children: [
-      { path: 'associate', element: <LazyStakingAssociate /> },
-      { path: 'disassociate', element: <LazyStakingDisassociate /> },
      { path: ':node', element: <LazyStakingNode /> },
      {
        index: true,
@@ -311,6 +309,8 @@ const routerConfig = [
          },
        ],
      },
+      { path: 'associate', element: <LazyStakingAssociate /> },
+      { path: 'disassociate', element: <LazyStakingDisassociate /> },
    ],
  },
  {
@@ -12,8 +12,8 @@ const Routes = {
  REDEEM: '/token/redeem',
  WITHDRAWALS: '/token/withdraw',
  SUPPLY: '/token/tranches',
-  ASSOCIATE: '/validators/associate',
-  DISASSOCIATE: '/validators/disassociate',
+  ASSOCIATE: '/token/associate',
+  DISASSOCIATE: '/token/disassociate',
 };

 export default Routes;
@@ -18,6 +18,7 @@ import type {
  NodesFragmentFragment,
 } from '../__generated___/Nodes';
 import type { PreviousEpochQuery } from '../../__generated___/PreviousEpoch';
+import BigNumber from 'bignumber.js';

 export interface ValidatorsTableProps {
  data: NodesQuery | undefined;
@@ -77,8 +78,8 @@ export const ValidatorTables = ({
    const lowestRankingConsensusScore = consensusValidators.reduce(
      (lowest: NodesFragmentFragment, validator: NodesFragmentFragment) => {
        if (
-          validator?.rankingScore &&
-          Number(validator.rankingScore) < Number(lowest.rankingScore)
+          Number(validator.rankingScore.rankingScore) <
+          Number(lowest.rankingScore.rankingScore)
        ) {
          lowest = validator;
        }
@@ -87,10 +88,12 @@ export const ValidatorTables = ({
    ).rankingScore.rankingScore;

    const lowestRankingBigNum = toBigNum(lowestRankingConsensusScore, 0);
-    const totalStakeBigNum = toBigNum(totalStake, decimals);
+    const consensusStakedTotal = consensusValidators.reduce((acc, cur) => {
+      return acc.plus(toBigNum(cur.stakedTotal, decimals));
+    }, new BigNumber(0));

    stakeNeededForPromotion = formatNumber(
-      lowestRankingBigNum.times(totalStakeBigNum),
+      lowestRankingBigNum.times(consensusStakedTotal),
      2
    ).toString();
  }
@@ -6,10 +6,10 @@ fragment StakingDelegationsFields on Delegation {
  epoch
 }

-query PartyDelegations($partyId: ID!) {
+query PartyDelegations($partyId: ID!, $delegationsPagination: Pagination) {
  party(id: $partyId) {
    id
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          ...StakingDelegationsFields
@@ -23,13 +23,13 @@ fragment StakingNodeFields on Node {
  }
 }

-query Staking($partyId: ID!) {
+query Staking($partyId: ID!, $delegationsPagination: Pagination) {
  party(id: $partyId) {
    id
    stakingSummary {
      currentStakeAvailable
    }
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          amount
@@ -7,6 +7,7 @@ export type StakingDelegationsFieldsFragment = { __typename?: 'Delegation', amou

 export type PartyDelegationsQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
+  delegationsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;


@@ -22,10 +23,10 @@ export const StakingDelegationsFieldsFragmentDoc = gql`
 }
    `;
 export const PartyDelegationsDocument = gql`
-    query PartyDelegations($partyId: ID!) {
+    query PartyDelegations($partyId: ID!, $delegationsPagination: Pagination) {
  party(id: $partyId) {
    id
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          ...StakingDelegationsFields
@@ -52,6 +53,7 @@ export const PartyDelegationsDocument = gql`
 * const { data, loading, error } = usePartyDelegationsQuery({
 *   variables: {
 *      partyId: // value for 'partyId'
+ *      delegationsPagination: // value for 'delegationsPagination'
 *   },
 * });
 */
@@ -7,6 +7,7 @@ export type StakingNodeFieldsFragment = { __typename?: 'Node', id: string, name:

 export type StakingQueryVariables = Types.Exact<{
  partyId: Types.Scalars['ID'];
+  delegationsPagination?: Types.InputMaybe<Types.Pagination>;
 }>;


@@ -39,13 +40,13 @@ export const StakingNodeFieldsFragmentDoc = gql`
 }
    `;
 export const StakingDocument = gql`
-    query Staking($partyId: ID!) {
+    query Staking($partyId: ID!, $delegationsPagination: Pagination) {
  party(id: $partyId) {
    id
    stakingSummary {
      currentStakeAvailable
    }
-    delegationsConnection {
+    delegationsConnection(pagination: $delegationsPagination) {
      edges {
        node {
          amount
@@ -94,6 +95,7 @@ export const StakingDocument = gql`
 * const { data, loading, error } = useStakingQuery({
 *   variables: {
 *      partyId: // value for 'partyId'
+ *      delegationsPagination: // value for 'delegationsPagination'
 *   },
 * });
 */
@@ -1,68 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type StakingDelegationsFieldsFragment = { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string } };
-
-export type PartyDelegationsQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type PartyDelegationsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string } } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string } };
-
-export const StakingDelegationsFieldsFragmentDoc = gql`
-    fragment StakingDelegationsFields on Delegation {
-  amount
-  node {
-    id
-  }
-  epoch
-}
-    `;
-export const PartyDelegationsDocument = gql`
-    query PartyDelegations($partyId: ID!) {
-  party(id: $partyId) {
-    id
-    delegationsConnection {
-      edges {
-        node {
-          ...StakingDelegationsFields
-        }
-      }
-    }
-  }
-  epoch {
-    id
-  }
-}
-    ${StakingDelegationsFieldsFragmentDoc}`;
-
-/**
- * __usePartyDelegationsQuery__
- *
- * To run a query within a React component, call `usePartyDelegationsQuery` and pass it any options that fit your needs.
- * When your component renders, `usePartyDelegationsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = usePartyDelegationsQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function usePartyDelegationsQuery(baseOptions: Apollo.QueryHookOptions<PartyDelegationsQuery, PartyDelegationsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<PartyDelegationsQuery, PartyDelegationsQueryVariables>(PartyDelegationsDocument, options);
-      }
-export function usePartyDelegationsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PartyDelegationsQuery, PartyDelegationsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<PartyDelegationsQuery, PartyDelegationsQueryVariables>(PartyDelegationsDocument, options);
-        }
-export type PartyDelegationsQueryHookResult = ReturnType<typeof usePartyDelegationsQuery>;
-export type PartyDelegationsLazyQueryHookResult = ReturnType<typeof usePartyDelegationsLazyQuery>;
-export type PartyDelegationsQueryResult = Apollo.QueryResult<PartyDelegationsQuery, PartyDelegationsQueryVariables>;
@@ -1,110 +0,0 @@
-import * as Types from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type StakingNodeFieldsFragment = { __typename?: 'Node', id: string, name: string, pubkey: string, infoUrl: string, location: string, ethereumAddress: string, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null, rankingScore: { __typename?: 'RankingScore', rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string, status: Types.ValidatorStatus } };
-
-export type StakingQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type StakingQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, stakingSummary: { __typename?: 'StakingSummary', currentStakeAvailable: string }, delegationsConnection?: { __typename?: 'DelegationsConnection', edges?: Array<{ __typename?: 'DelegationEdge', node: { __typename?: 'Delegation', amount: string, epoch: number, node: { __typename?: 'Node', id: string } } } | null> | null } | null } | null, epoch: { __typename?: 'Epoch', id: string, timestamps: { __typename?: 'EpochTimestamps', start?: any | null, end?: any | null, expiry?: any | null } }, nodesConnection: { __typename?: 'NodesConnection', edges?: Array<{ __typename?: 'NodeEdge', node: { __typename?: 'Node', id: string, name: string, pubkey: string, infoUrl: string, location: string, ethereumAddress: string, stakedByOperator: string, stakedByDelegates: string, stakedTotal: string, pendingStake: string, epochData?: { __typename?: 'EpochData', total: number, offline: number, online: number } | null, rankingScore: { __typename?: 'RankingScore', rankingScore: string, stakeScore: string, performanceScore: string, votingPower: string, status: Types.ValidatorStatus } } } | null> | null }, nodeData?: { __typename?: 'NodeData', stakedTotal: string, totalNodes: number, inactiveNodes: number, uptime: number } | null };
-
-export const StakingNodeFieldsFragmentDoc = gql`
-    fragment StakingNodeFields on Node {
-  id
-  name
-  pubkey
-  infoUrl
-  location
-  ethereumAddress
-  stakedByOperator
-  stakedByDelegates
-  stakedTotal
-  pendingStake
-  epochData {
-    total
-    offline
-    online
-  }
-  rankingScore {
-    rankingScore
-    stakeScore
-    performanceScore
-    votingPower
-    status
-  }
-}
-    `;
-export const StakingDocument = gql`
-    query Staking($partyId: ID!) {
-  party(id: $partyId) {
-    id
-    stakingSummary {
-      currentStakeAvailable
-    }
-    delegationsConnection {
-      edges {
-        node {
-          amount
-          epoch
-          node {
-            id
-          }
-        }
-      }
-    }
-  }
-  epoch {
-    id
-    timestamps {
-      start
-      end
-      expiry
-    }
-  }
-  nodesConnection {
-    edges {
-      node {
-        ...StakingNodeFields
-      }
-    }
-  }
-  nodeData {
-    stakedTotal
-    totalNodes
-    inactiveNodes
-    uptime
-  }
-}
-    ${StakingNodeFieldsFragmentDoc}`;
-
-/**
- * __useStakingQuery__
- *
- * To run a query within a React component, call `useStakingQuery` and pass it any options that fit your needs.
- * When your component renders, `useStakingQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useStakingQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function useStakingQuery(baseOptions: Apollo.QueryHookOptions<StakingQuery, StakingQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<StakingQuery, StakingQueryVariables>(StakingDocument, options);
-      }
-export function useStakingLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<StakingQuery, StakingQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<StakingQuery, StakingQueryVariables>(StakingDocument, options);
-        }
-export type StakingQueryHookResult = ReturnType<typeof useStakingQuery>;
-export type StakingLazyQueryHookResult = ReturnType<typeof useStakingLazyQuery>;
-export type StakingQueryResult = Apollo.QueryResult<StakingQuery, StakingQueryVariables>;
@@ -20,7 +20,7 @@ import NodeContainer from './nodes-container';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
 import { Heading, SubHeading } from '../../../components/heading';
 import Routes from '../../routes';
-import type { StakingQuery } from './__generated___/Staking';
+import type { StakingQuery } from './__generated__/Staking';
 import type { PreviousEpochQuery } from '../__generated___/PreviousEpoch';

 interface StakingNodeProps {
@@ -1,14 +1,14 @@
+import { ENV } from '../../../config';
 import { Callout, Intent, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import React from 'react';
 import { useTranslation } from 'react-i18next';
-
-import { useStakingQuery } from './__generated___/Staking';
-import { SplashLoader } from '../../../components/splash-loader';
-import { usePreviousEpochQuery } from '../__generated___/PreviousEpoch';
-import type { StakingQuery } from './__generated___/Staking';
-import type { PreviousEpochQuery } from '../__generated___/PreviousEpoch';
 import { useRefreshValidators } from '../../../hooks/use-refresh-validators';
+import { SplashLoader } from '../../../components/splash-loader';
+import { useStakingQuery } from './__generated__/Staking';
+import { usePreviousEpochQuery } from '../__generated___/PreviousEpoch';
+import type { ReactElement } from 'react';
+import type { StakingQuery } from './__generated__/Staking';
+import type { PreviousEpochQuery } from '../__generated___/PreviousEpoch';

 // TODO should only request a single node. When migrating from deprecated APIs we should address this.

@@ -23,12 +23,20 @@ export const NodeContainer = ({
  }: {
    data?: StakingQuery;
    previousEpochData?: PreviousEpochQuery;
-  }) => React.ReactElement;
+  }) => ReactElement;
 }) => {
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
+  const { delegationsPagination } = ENV;
  const { data, loading, error, refetch } = useStakingQuery({
-    variables: { partyId: pubKey || '' },
+    variables: {
+      partyId: pubKey || '',
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
+    },
  });
  const { data: previousEpochData } = usePreviousEpochQuery({
    variables: {
@@ -5,12 +5,14 @@ interface StakeFailureProps {
  nodeName: string;
  isDialogVisible: boolean;
  toggleDialog: () => void;
+  error: Error | null;
 }

 export const StakeFailure = ({
  nodeName,
  isDialogVisible,
  toggleDialog,
+  error,
 }: StakeFailureProps) => {
  const { t } = useTranslation();
  return (
@@ -20,11 +22,15 @@ export const StakeFailure = ({
      open={isDialogVisible}
      onChange={toggleDialog}
    >
-      <p>
-        {t('stakeFailed', {
-          node: nodeName,
-        })}
-      </p>
+      {error ? (
+        <p>{error.message}</p>
+      ) : (
+        <p>
+          {t('stakeFailed', {
+            node: nodeName,
+          })}
+        </p>
+      )}
    </Dialog>
  );
 };
@@ -13,6 +13,7 @@ interface StakeFormTxStatusesProps {
  removeType: RemoveType;
  isDialogVisible: boolean;
  toggleDialog: () => void;
+  error: Error | null;
 }

 export const StakingFormTxStatuses = ({
@@ -23,6 +24,7 @@ export const StakingFormTxStatuses = ({
  removeType,
  isDialogVisible,
  toggleDialog,
+  error,
 }: StakeFormTxStatusesProps) => {
  switch (formState) {
    case FormState.Requested:
@@ -59,6 +61,7 @@ export const StakingFormTxStatuses = ({
          nodeName={nodeName}
          isDialogVisible={isDialogVisible}
          toggleDialog={toggleDialog}
+          error={error}
        />
      );
    default:
@@ -3,7 +3,8 @@ import * as Sentry from '@sentry/react';
 import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router-dom';
-import { usePartyDelegationsLazyQuery } from './__generated___/PartyDelegations';
+import { ENV } from '../../../config';
+import { usePartyDelegationsLazyQuery } from './__generated__/PartyDelegations';
 import { TokenInput } from '../../../components/token-input';
 import { useAppState } from '../../../contexts/app-state/app-state-context';
 import { useSearchParams } from '../../../hooks/use-search-params';
@@ -70,8 +71,10 @@ export const StakingForm = ({
  const { appState } = useAppState();
  const { sendTx } = useVegaWallet();
  const [formState, setFormState] = React.useState(FormState.Default);
+  const [error, setError] = useState<Error | null>(null);
  const [isDialogVisible, setIsDialogVisible] = useState(false);
  const { t } = useTranslation();
+  const { delegationsPagination } = ENV;
  const [action, setAction] = React.useState<StakeAction>(
    params.action as StakeAction
  );
@@ -135,14 +138,22 @@ export const StakingForm = ({

      // await success via poll
    } catch (err) {
+      if (err instanceof Error) {
+        setError(err);
+      }
      setFormState(FormState.Failure);
      Sentry.captureException(err);
    }
  }

-  const [delegationSearch, { data, error }] = usePartyDelegationsLazyQuery({
+  const [delegationSearch, { data }] = usePartyDelegationsLazyQuery({
    variables: {
      partyId: pubKey,
+      delegationsPagination: delegationsPagination
+        ? {
+            first: Number(delegationsPagination),
+          }
+        : undefined,
    },
    fetchPolicy: 'network-only',
  });
@@ -170,10 +181,6 @@ export const StakingForm = ({
            clearInterval(interval);
          }
        }
-
-        if (error) {
-          Sentry.captureException(error);
-        }
      }, 1000);
    }

@@ -306,6 +313,7 @@ export const StakingForm = ({
        removeType={removeType}
        isDialogVisible={isDialogVisible}
        toggleDialog={toggleDialog}
+        error={error}
      />
    </>
  );
@@ -25,7 +25,7 @@ import {
  getUnnormalisedVotingPower,
 } from '../shared';
 import type { ReactNode } from 'react';
-import type { StakingNodeFieldsFragment } from './__generated___/Staking';
+import type { StakingNodeFieldsFragment } from './__generated__/Staking';
 import type { PreviousEpochQuery } from '../__generated___/PreviousEpoch';

 const statuses = {
@@ -93,7 +93,7 @@ const Home = ({ name }: RouteChildProps) => {
        <p>
          <Link
            data-testid="associate-vega-tokens-link-on-homepage"
-            to={`${Routes.VALIDATORS}/associate`}
+            to={Routes.ASSOCIATE}
            className="underline text-white"
          >
            {t('Associate VEGA tokens')}
@@ -1,6 +1,6 @@
 import type ethers from 'ethers';
 import type { GetState, SetState } from 'zustand';
-import create from 'zustand';
+import { create } from 'zustand';

 export interface TxData {
  tx: ethers.ContractTransaction;
@@ -9,6 +9,8 @@ NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_WALLET_URL=http://localhost:1789
+NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
+NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"

 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -9,6 +9,8 @@ NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"
 NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_WALLET_URL=http://localhost:1789
+NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
+NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"

 # Expose some env vars to cypress environment for market setup
 CYPRESS_ETH_WALLET_MNEMONIC=ozone access unlock valid olympic save include omit supply green clown session
@@ -42,5 +42,6 @@ module.exports = defineConfig({
    grepTags: '@regression @smoke @slow',
    grepFilterSpecs: true,
    grepOmitFiltered: true,
+    txTimeout: { timeout: 70000 },
  },
 });
@@ -8,6 +8,7 @@ import {
 } from '@vegaprotocol/types';
 import { isBefore, isAfter, addSeconds, subSeconds } from 'date-fns';
 import { createOrder } from '../support/create-order';
+import { connectEthereumWallet } from '../support/ethereum-wallet';

 const orderSize = 'size';
 const orderType = 'type';
@@ -17,6 +18,16 @@ const orderPrice = 'price';
 const orderTimeInForce = 'timeInForce';
 const orderCreatedAt = 'createdAt';
 const orderUpdatedAt = 'updatedAt';
+const assetSelectField = 'select[name="asset"]';
+const amountField = 'input[name="amount"]';
+const txTimeout = Cypress.env('txTimeout');
+const btcName = 'BTC (local)';
+const btcSymbol = 'tBTC';
+const usdcSymbol = 'fUSDC';
+const toastContent = 'toast-content';
+const ordersTab = 'Orders';
+const depositsTab = 'Deposits';
+const toastCloseBtn = 'toast-close';

 // TODO: ensure this test runs only if capsule is running via workflow
 describe('capsule', { tags: '@slow' }, () => {
@@ -25,6 +36,7 @@ describe('capsule', { tags: '@slow' }, () => {
    cy.get('@markets').then((markets) => {
      cy.wrap(markets[0]).as('market');
    });
+    cy.updateCapsuleMultiSig();
  });

  beforeEach(() => {
@@ -45,15 +57,16 @@ describe('capsule', { tags: '@slow' }, () => {
    const rawPrice = removeDecimal(order.price, market.decimalPlaces);
    const rawSize = removeDecimal(order.size, market.positionDecimalPlaces);

+    cy.getByTestId('Collateral').click();
+    cy.getByTestId('asset', txTimeout).should('contain.text', usdcSymbol);
+
    createOrder(order);

-    cy.getByTestId('dialog-title').should(
+    cy.getByTestId(toastContent).should(
      'contain.text',
-      'Awaiting network confirmation'
+      `ConfirmedYour transaction has been confirmed View in block explorerSubmit order - activeTEST.24h+0.0005 @ 390.00 ${usdcSymbol}`
    );
-    cy.getByTestId('dialog-title').should('contain.text', 'Order submitted');
-    cy.getByTestId('dialog-close').click();
-
+    cy.getByTestId(toastCloseBtn).click();
    // orderbook cells are keyed by price level
    cy.getByTestId('tab-orderbook')
      .get(`[data-testid="price-${rawPrice}"]`)
@@ -61,7 +74,8 @@ describe('capsule', { tags: '@slow' }, () => {
      .get(`[data-testid="bid-vol-${rawPrice}"]`)
      .should('contain.text', rawSize);

-    cy.getByTestId('Orders').click();
+    cy.getByTestId(ordersTab).click();
+    cy.getByTestId('edit').should('contain.text', 'Edit');
    cy.getByTestId('tab-orders').within(() => {
      cy.get('.ag-center-cols-container')
        .children()
@@ -99,14 +113,18 @@ describe('capsule', { tags: '@slow' }, () => {
          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderCreatedAt);
        });
    });
-
-    cy.getByTestId('edit').first().click();
+    //edit order
+    cy.getByTestId(ordersTab).click();
+    cy.getByTestId('edit').first().should('be.visible').click();
    cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
    cy.get('#limitPrice').focus().clear().type('200');
    cy.getByTestId('edit-order').find('[type="submit"]').click();
-    cy.getByTestId('dialog-title').should('contain.text', 'Order updated');
-    cy.getByTestId('dialog-close').click();
-
+    cy.getByTestId(toastContent).should(
+      'contain.text',
+      `ConfirmedYour transaction has been confirmed View in block explorerEdit order - activeTEST.24h+0.0005 @ 200.00 ${usdcSymbol}+0.0005 @ 200.00 ${usdcSymbol}`
+    );
+    cy.getByTestId(ordersTab).click();
+    cy.getByTestId(toastCloseBtn).click();
    cy.get('.ag-center-cols-container')
      .children()
      .first()
@@ -116,26 +134,144 @@ describe('capsule', { tags: '@slow' }, () => {
        });
        checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
      });
-
+    //cancel order
+    cy.getByTestId(ordersTab).click();
    cy.getByTestId('cancel').first().click();
-
-    cy.getByTestId('dialog-title').should(
+    cy.getByTestId(toastContent).should(
      'contain.text',
-      'Awaiting network confirmation'
+      `ConfirmedYour transaction has been confirmed View in block explorerCancel order - cancelledTEST.24h+0.0005 @ 200.00 ${usdcSymbol}`
    );
-    cy.getByTestId('dialog-title').should('contain.text', 'Order cancelled');
-    cy.getByTestId('dialog-close').click();
+    cy.getByTestId(toastCloseBtn).click();

    cy.getByTestId('tab-orders')
      .get('.ag-center-cols-container')
      .children()
      .first()
-      .get(`[col-id='${orderStatus}']`)
+      .get(`[col-id='${orderStatus}']`, txTimeout)
      .should('contain.text', OrderStatusMapping.STATUS_CANCELLED);
  });
+
+  it('can deposit and withdrawal', function () {
+    // 1001-DEPO-001
+    // 1001-DEPO-002
+    // 1001-DEPO-003
+    // 1001-DEPO-005
+    // 1001-DEPO-006
+    // 1001-DEPO-007
+    // 1001-DEPO-008
+    // 1001-DEPO-009
+    // 1002-WITH-001
+    // 1002-WITH-006
+    // 1002-WITH-009
+    // 002-WITH-011
+    // 1002-WITH-024
+    // 1002-WITH-012
+    // 1002-WITH-013
+    // 1002-WITH-014
+    // 1002-WITH-015
+    // 1002-WITH-016
+    // 1002-WITH-019
+
+    cy.visit('/#/portfolio');
+    cy.get('main[data-testid="/portfolio"]').should('exist');
+
+    cy.highlight('creating deposit');
+
+    cy.getByTestId(depositsTab).click();
+    cy.getByTestId('deposit-button').click();
+    connectEthereumWallet('Unknown');
+    cy.get(assetSelectField, txTimeout).select(btcName);
+    cy.getByTestId('deposit-approve-submit').click();
+    cy.getByTestId('dialog-title').should('contain.text', 'Approve complete');
+    cy.get('[data-testid="Return to deposit"]').click();
+    cy.get(amountField).clear().type('1');
+    cy.getByTestId('deposit-submit').click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      `Transaction completedYour transaction has been completedView on EtherscanDeposit 1.00 ${btcSymbol}`
+    );
+    cy.getByTestId(toastCloseBtn).click();
+    cy.getByTestId('Collateral').click();
+
+    cy.highlight('deposit verification');
+
+    cy.getByTestId('asset', txTimeout).should('contain.text', btcSymbol);
+    // need to reload page to see deposit history complete
+    cy.reload();
+    cy.getByTestId(depositsTab).click();
+    cy.get('.ag-cell-value', txTimeout).should('contain.text', btcSymbol);
+    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);
+
+    cy.get('[col-id="txHash"]')
+      .should('have.length.above', 2)
+      .eq(1)
+      .parent()
+      .within(() => {
+        cy.get('[col-id="asset.symbol"]').should('have.text', btcSymbol);
+        cy.get('[col-id="amount"]').should('have.text', '1.00');
+        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
+        cy.get('[col-id="status"]').should('have.text', 'Finalized');
+        cy.get('[col-id="txHash"]')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', 'https://sepolia.etherscan.io/tx');
+      });
+
+    cy.highlight('creating withdrawals');
+
+    cy.getByTestId('Withdrawals').click();
+    cy.getByTestId('withdraw-dialog-button').click();
+    connectEthereumWallet('Unknown');
+    cy.get(assetSelectField).select(btcName);
+    cy.get(amountField).clear().type('1');
+    cy.getByTestId('submit-withdrawal').click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Funds unlocked'
+    );
+
+    cy.getByTestId('tab-withdrawals').within(() => {
+      cy.get('.ag-center-cols-container')
+        .children()
+        .first()
+        .within(() => {
+          cy.get('[col-id="status"]').should('contain.text', 'Pending');
+        });
+    });
+
+    cy.highlight('withdrawals verification');
+    cy.getByTestId('toast-complete-withdrawal').click();
+    cy.getByTestId(toastContent, txTimeout).should(
+      'contain.text',
+      'Transaction completed'
+    );
+
+    cy.getByTestId('complete-withdrawal', txTimeout).should('not.exist');
+
+    cy.get('[col-id="txHash"]', txTimeout)
+      .should('have.length.above', 1)
+      .eq(1)
+      .parent()
+      .within(() => {
+        cy.get('[col-id="asset.symbol"]').should('have.text', btcSymbol);
+        cy.get('[col-id="amount"]').should('have.text', '1.00');
+        cy.get('[col-id="details.receiverAddress"]')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', 'https://sepolia.etherscan.io/address/');
+        cy.get('[col-id="createdTimestamp"]').should('not.be.empty');
+        cy.get('[col-id="withdrawnTimestamp"]').should('not.be.empty');
+        cy.get('[col-id="status"]').should('have.text', 'Completed');
+        cy.get('[col-id="txHash"]')
+          .find('a')
+          .should('have.attr', 'href')
+          .and('contain', 'https://sepolia.etherscan.io/tx/0x');
+      });
+  });
 });
 function checkIfDataAndTimeOfCreationAndUpdateIsEqual(date: string) {
-  cy.get(`[col-id='${date}']`)
+  cy.get(`[col-id='${date}'] .ag-cell-wrapper`)
+    .children('span')
    .children('span')
    .invoke('data', 'value')
    .then(($dateTime) => {
@@ -1,10 +1,13 @@
 import { connectEthereumWallet } from '../support/ethereum-wallet';
+import { selectAsset } from '../support/helpers';

 const assetSelectField = 'select[name="asset"]';
 const toAddressField = 'input[name="to"]';
 const amountField = 'input[name="amount"]';
 const formFieldError = 'input-error-text';

+const ASSET_EURO = 1;
+
 describe('deposit form validation', { tags: '@smoke' }, () => {
  before(() => {
    cy.mockWeb3Provider();
@@ -16,7 +19,7 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
    cy.getByTestId('Deposits').click();
    cy.getByTestId('deposit-button').click();
    cy.wait('@Assets');
-    connectEthereumWallet();
+    connectEthereumWallet('MetaMask');
    cy.getByTestId('deposit-submit').click();
  });

@@ -43,7 +46,8 @@ describe('deposit form validation', { tags: '@smoke' }, () => {
  it('invalid amount', () => {
    // Deposit amount smaller than minimum viable for selected asset
    // Select an amount so that we have a known decimal places value to work with
-    cy.get(assetSelectField).select('Euro');
+    selectAsset(ASSET_EURO);
+
    cy.get(amountField)
      .clear()
      .type('0.00000000000000000000000000000000001')
@@ -37,7 +37,7 @@ describe('vega wallet v1', { tags: '@smoke' }, () => {
    cy.getByTestId(form).find('#wallet').click().type('invalid name');
    cy.getByTestId(form).find('#passphrase').click().type('invalid password');
    cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-    cy.getByTestId('form-error').should('have.text', 'No wallet detected');
+    cy.getByTestId('form-error').should('have.text', 'Invalid credentials');
  });

  it('doesnt connect with invalid fields', () => {
@@ -119,7 +119,7 @@ describe('ethereum wallet', { tags: '@smoke' }, () => {
    const ethWalletAddress = Cypress.env('ETHEREUM_WALLET_ADDRESS');
    cy.getByTestId('Deposits').click();
    cy.getByTestId('deposit-button').click();
-    connectEthereumWallet();
+    connectEthereumWallet('MetaMask');
    cy.get('#ethereum-address').should('have.value', ethWalletAddress);
    cy.getByTestId('disconnect-ethereum-wallet')
      .should('have.text', 'Disconnect')
@@ -161,6 +161,14 @@ describe('market info is displayed', { tags: '@smoke' }, () => {
    );
  });

+  it('liquidity price range displayed', () => {
+    cy.getByTestId(marketTitle).contains('Liquidity price range').click();
+
+    validateMarketDataRow(0, 'Liquidity Price Range', '2.00%');
+    validateMarketDataRow(1, 'LP Volume Min', '0.05634 tBTC');
+    validateMarketDataRow(2, 'LP Volume Max', '0.05864 tBTC');
+  });
+
  it('oracle displayed', () => {
    cy.getByTestId(marketTitle).contains('Oracle').click();

@@ -1,14 +1,15 @@
 import { connectEthereumWallet } from '../support/ethereum-wallet';
+import { selectAsset } from '../support/helpers';

 const formFieldError = 'input-error-text';
 const toAddressField = 'input[name="to"]';
-const assetSelectField = 'select[name="asset"]';
 const amountField = 'input[name="amount"]';
 const useMaximumAmount = 'use-maximum';
 const submitWithdrawBtn = 'submit-withdrawal';
 const ethAddressValue = Cypress.env('ETHEREUM_WALLET_ADDRESS');
-const asset1Name = 'Sepolia tBTC';
-const asset2Name = 'Euro';
+
+const ASSET_SEPOLIA_TBTC = 2;
+const ASSET_EURO = 1;

 describe('withdraw form validation', { tags: '@smoke' }, () => {
  before(() => {
@@ -23,7 +24,7 @@ describe('withdraw form validation', { tags: '@smoke' }, () => {
    cy.getByTestId('withdraw-dialog-button').click();

    // It also requires connection Ethereum wallet
-    connectEthereumWallet();
+    connectEthereumWallet('MetaMask');

    cy.wait('@Accounts');
    cy.wait('@Assets');
@@ -40,7 +41,7 @@ describe('withdraw form validation', { tags: '@smoke' }, () => {
    cy.get(toAddressField).should('have.value', ethAddressValue);
  });
  it('min amount', () => {
-    selectAsset(asset1Name);
+    selectAsset(ASSET_SEPOLIA_TBTC);
    cy.get(amountField).clear().type('0');
    cy.getByTestId(submitWithdrawBtn).click();
    cy.get('[data-testid="input-error-text"]').should(
@@ -49,7 +50,7 @@ describe('withdraw form validation', { tags: '@smoke' }, () => {
    );
  });
  it('max amount', () => {
-    selectAsset(asset2Name); // Will be above maximum because the vega wallet doesn't have any collateral
+    selectAsset(ASSET_EURO); // Will be above maximum because the vega wallet doesn't have any collateral
    cy.get(amountField).clear().type('1001', { delay: 100 });
    cy.getByTestId(submitWithdrawBtn).click();
    cy.get('[data-testid="input-error-text"]').should(
@@ -59,7 +60,7 @@ describe('withdraw form validation', { tags: '@smoke' }, () => {
  });

  it('can set amount using use maximum button', () => {
-    selectAsset(asset1Name);
+    selectAsset(ASSET_SEPOLIA_TBTC);
    cy.getByTestId(useMaximumAmount).click();
    cy.get(amountField).should('have.value', '1000.00000');
  });
@@ -79,7 +80,7 @@ describe('withdraw actions', { tags: '@regression' }, () => {
    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();

-    connectEthereumWallet();
+    connectEthereumWallet('MetaMask');

    cy.wait('@Accounts');
    cy.wait('@Assets');
@@ -87,7 +88,7 @@ describe('withdraw actions', { tags: '@regression' }, () => {
  });

  it('triggers transaction when submitted', () => {
-    selectAsset(asset1Name);
+    selectAsset(ASSET_SEPOLIA_TBTC);
    cy.getByTestId('BALANCE_AVAILABLE_label').should(
      'contain.text',
      'Balance available'
@@ -111,12 +112,3 @@ describe('withdraw actions', { tags: '@regression' }, () => {
  it.skip('creates a withdrawal on submit'); // Needs capsule
  it.skip('creates a withdrawal on submit and prompts to complete withdrawal'); // Needs capsule
 });
-
-const selectAsset = (assetName: string) => {
-  cy.get(assetSelectField).select(assetName);
-  // The asset only gets set once the queries (getWithdrawThreshold, getDelay)
-  // against the Ethereum change resolve, we should fix this but for now just force
-  // some wait time
-  // eslint-disable-next-line
-  cy.wait(100);
-};
@@ -1,5 +1,5 @@
-export const connectEthereumWallet = () => {
+export const connectEthereumWallet = (connectorName: string) => {
  cy.getByTestId('connect-eth-wallet-btn').should('be.enabled').click();
  cy.getByTestId('web3-connector-list').should('be.visible');
-  cy.getByTestId('web3-connector-MetaMask').click();
+  cy.getByTestId(`web3-connector-${connectorName}`).click();
 };
@@ -0,0 +1,11 @@
+export const selectAsset = (assetIndex: number) => {
+  cy.log(`selecting asset: ${assetIndex}`);
+  cy.getByTestId('select-asset').click();
+  cy.get('[data-testid="rich-select-option"]').eq(assetIndex).click();
+
+  // The asset only gets set once the queries (getWithdrawThreshold, getDelay)
+  // against the Ethereum change resolve, we should fix this but for now just force
+  // some wait time
+  // eslint-disable-next-line
+  cy.wait(100);
+};
@@ -58,13 +58,16 @@ export const testOrderCancellation = (

 const vegaWalletTransaction = (transaction: Transaction) => {
  cy.wait('@VegaWalletTransaction')
-    .its('request.body.params')
-    .should('deep.equal', {
-      token: JSON.parse(localStorage.getItem('vega_wallet_config') || '{}')
-        ?.token,
-      publicKey: Cypress.env('VEGA_PUBLIC_KEY'),
-      sendingMode: 'TYPE_SYNC',
-      transaction,
+    .its('request')
+    .then((req) => {
+      expect(req.body.params).to.deep.equal({
+        publicKey: Cypress.env('VEGA_PUBLIC_KEY'),
+        sendingMode: 'TYPE_SYNC',
+        transaction,
+      });
+      expect(req.headers.authorization).to.equal(
+        `VWT ${Cypress.env('VEGA_WALLET_API_TOKEN')}`
+      );
    });
 };

@@ -9,3 +9,6 @@ NX_VEGA_TOKEN_URL=https://token.fairground.wtf
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_VEGA_DOCS_URL=https://docs.vega.xyz/testnet
+
+NX_ETH_LOCAL_PROVIDER_URL=http://localhost:8545/
+NX_ETH_WALLET_MNEMONIC="ozone access unlock valid olympic save include omit supply green clown session"
@@ -25,7 +25,7 @@ import {
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { useCallback, useEffect, useMemo, useRef } from 'react';

-import { Header, HeaderStat } from '../../components/header';
+import { Header, HeaderStat, HeaderTitle } from '../../components/header';

 import type { AgGridReact } from 'ag-grid-react';
 import type { IGetRowsParams } from 'ag-grid-community';
@@ -224,14 +224,18 @@ export const LiquidityViewContainer = ({
        <Header
          title={
            market?.tradableInstrument.instrument.name &&
+            market?.tradableInstrument.instrument.code &&
            marketId && (
-              <Link to={Links[Routes.MARKET](marketId)}>
-                <UiToolkitLink className="sm:text-sm md:text-md lg:text-lg flex items-center gap-2 whitespace-nowrap">
-                  {`${market?.tradableInstrument.instrument.name} ${t(
-                    'liquidity provision'
-                  )}`}
-                </UiToolkitLink>
-              </Link>
+              <HeaderTitle
+                primaryContent={`${
+                  market.tradableInstrument.instrument.code
+                } ${t('liquidity provision')}`}
+                secondaryContent={
+                  <Link to={Links[Routes.MARKET](marketId)}>
+                    <UiToolkitLink>{t('Go to trading')}</UiToolkitLink>
+                  </Link>
+                }
+              />
            )
          }
        >
@@ -1,3 +1,3 @@
-import { Market } from './market';
+import { MarketPage } from './market';

-export default Market;
+export default MarketPage;
@@ -5,6 +5,7 @@ import {
  t,
  titlefy,
  useDataProvider,
+  useThrottledDataProvider,
 } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import type {
@@ -31,7 +32,47 @@ export interface SingleMarketData extends SingleMarketFieldsFragment {
  data: MarketData;
 }

-export const Market = () => {
+const TitleUpdater = ({
+  marketId,
+  marketName,
+  decimalPlaces,
+}: {
+  marketId?: string;
+  marketName?: string;
+  decimalPlaces?: number;
+}) => {
+  const pageTitle = usePageTitleStore((store) => store.pageTitle);
+  const updateTitle = usePageTitleStore((store) => store.updateTitle);
+  const { data: marketData } = useThrottledDataProvider<
+    MarketData,
+    MarketDataUpdateFieldsFragment
+  >(
+    {
+      dataProvider: marketDataProvider,
+      variables: useMemo(() => ({ marketId }), [marketId]),
+      skip: !marketId,
+    },
+    1000
+  );
+  useEffect(() => {
+    const marketPrice = calculatePrice(marketData?.markPrice, decimalPlaces);
+    if (marketName) {
+      const newPageTitle = titlefy([marketName, marketPrice]);
+      if (pageTitle !== newPageTitle) {
+        updateTitle(newPageTitle);
+      }
+    }
+  }, [
+    decimalPlaces,
+    marketName,
+    marketData?.markPrice,
+    pageTitle,
+    updateTitle,
+  ]);
+  return null;
+};
+
+export const MarketPage = () => {
  const { marketId } = useParams();
  const navigate = useNavigate();

@@ -39,9 +80,6 @@ export const Market = () => {
  const update = useGlobalStore((store) => store.update);
  const lastMarketId = useGlobalStore((store) => store.marketId);

-  const pageTitle = usePageTitleStore((store) => store.pageTitle);
-  const updateTitle = usePageTitleStore((store) => store.updateTitle);
-
  const onSelect = useCallback(
    (id: string) => {
      if (id && id !== marketId) {
@@ -51,56 +89,20 @@ export const Market = () => {
    [marketId, navigate]
  );

-  const variables = useMemo(
-    () => ({
-      marketId: marketId || '',
-    }),
-    [marketId]
-  );
-
-  const updateMarketId = useCallback(
-    ({ data }: { data: { id?: string } | null }) => {
-      if (data?.id && data.id !== lastMarketId) {
-        update({ marketId: data.id });
-      }
-      return true;
-    },
-    [update, lastMarketId]
-  );
  const { data, error, loading } = useDataProvider<
    SingleMarketFieldsFragment,
    never
  >({
    dataProvider: marketProvider,
-    variables,
-    update: updateMarketId,
+    variables: useMemo(() => ({ marketId: marketId || '' }), [marketId]),
    skip: !marketId,
  });

-  const marketName = data?.tradableInstrument.instrument.name;
-  const updateProvider = useCallback(
-    ({ data: marketData }: { data: MarketData | null }) => {
-      const marketPrice = calculatePrice(
-        marketData?.markPrice,
-        data?.decimalPlaces
-      );
-      if (marketName) {
-        const newPageTitle = titlefy([marketName, marketPrice]);
-        if (pageTitle !== newPageTitle) {
-          updateTitle(newPageTitle);
-        }
-      }
-      return true;
-    },
-    [updateTitle, pageTitle, marketName, data?.decimalPlaces]
-  );
-
-  useDataProvider<MarketData, MarketDataUpdateFieldsFragment>({
-    dataProvider: marketDataProvider,
-    update: updateProvider,
-    variables,
-    skip: !marketId || !data,
-  });
+  useEffect(() => {
+    if (data?.id && data.id !== lastMarketId) {
+      update({ marketId: data.id });
+    }
+  }, [update, lastMarketId, data?.id]);

  const tradeView = useMemo(() => {
    if (w > 960) {
@@ -123,6 +125,11 @@ export const Market = () => {
      data={data || undefined}
      noDataCondition={(data) => false}
    >
+      <TitleUpdater
+        marketId={data?.id}
+        marketName={data?.tradableInstrument.instrument.name}
+        decimalPlaces={data?.decimalPlaces}
+      />
      {tradeView}
    </AsyncRenderer>
  );
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	8d37fcd7e4	fix: fix candles.mock	2023-01-26 14:13:46 +00:00
Madalina Raicu	bc22081563	fix: fix position dp on volume chart	2023-01-26 13:47:18 +00:00
Madalina Raicu	a4b5319aa0	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-01-26 12:41:00 +00:00
Art	5766d84804	fix: select position (#2745 )	2023-01-26 12:36:47 +00:00
mattrussell36	6362c022b5	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-26 12:06:16 +00:00
Bartłomiej Głownia	a6118c14dd	feat: fix EthTxCompletedToastContent (#2741 )	2023-01-26 12:00:00 +00:00
Sam Keen	d384fb35f1	feat(2396): token delegations pagination (#2575 )	2023-01-26 10:20:26 +00:00
Ciaran McGhie	3ed3714e79	fix(#2216 ): lp-dashboard grab market close from metadata (#2564 )	2023-01-26 09:58:39 +00:00
Matthew Russell	3893b26d30	fix: dropdown menu portals (#2740 )	2023-01-26 09:52:49 +01:00
mattrussell36	1ba0ad234b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-26 06:07:07 +00:00
mattrussell36	9f6a5aac39	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-26 00:13:06 +00:00
Bartłomiej GłowniaandMatthew Russell	129274a8e6	feat: add seperate transaction toast for completed eth transaction (#2733 ) Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2023-01-25 12:25:44 -08:00
Bartłomiej Głownia	3fadda15fd	chore: remove sentry captureException in marketDepthProvider update (#2713 )	2023-01-25 11:58:37 -08:00
m.rayandasiaznik	7ea7edc1e2	feat(#2565 ): orderbook populate limit (#2690 ) Co-authored-by: asiaznik <artur@vegaprotocol.io>	2023-01-25 11:38:26 -08:00
Edd	dad953b45b	fix(explorer): fix various small lp tx view bugs (#2738 )	2023-01-25 18:18:59 +00:00
mattrussell36	ed1363b035	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-25 18:08:10 +00:00
Art	b2ab4f49d9	feat: rich asset details dropdown (2557) (#2711 )	2023-01-25 14:24:53 +00:00
Edd	a60379b40f	feat(explorer): data submission tx view (#2698 )	2023-01-25 13:33:12 +00:00
mattrussell36	7db2a58f9d	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-25 12:08:53 +00:00
m.ray	7279556bf7	feat(#2599 ): liquidity price range added in market info (#2716 )	2023-01-25 13:42:29 +02:00
Dexter Edwards	52cc2ef7df	fix: add risk parameters (#2706 )	2023-01-25 10:36:22 +00:00
macqbat	a218da93a6	feat: logging - working solution (#2696 )	2023-01-25 09:43:11 +01:00
daro-maj	10fe82dea8	chore: deposit and withdrawal capsule e2e tests (#2720 )	2023-01-25 08:21:17 +01:00
mattrussell36	b0de4dfbf3	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-25 06:06:42 +00:00
Matthew Russell	cd0e2e41a8	chore(#2668 ): use ui-toolkit checkbox for orderbook (#2702 )	2023-01-24 21:49:59 -08:00
mattrussell36	dc3330d55e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-25 00:12:48 +00:00
Matthew Russell	a016feab2a	fix: dont use current value in update callback for estimate queries (#2721 )	2023-01-24 21:33:55 +00:00
mattrussell36	68446ccf65	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-24 18:08:20 +00:00
Matthew Russell	c7aec5cfcb	chore: add cypress files to ignore list and use glob ignore option (#2700 )	2023-01-24 08:06:46 -08:00
Radosław Szpiech	f58144d785	chore: fix skip cache typo in workflow (#2715 )	2023-01-24 15:59:53 +00:00
Dexter Edwards	415b902f53	feat: splash loader more central (#2707 )	2023-01-24 14:02:43 +00:00
Art Dexter Dariusz Majcherczyk	165b131b27	chore: move token's web3 url connector to web3 lib (#2655 ) Co-authored-by: Dexter <dexter.edwards93@gmail.com> Co-authored-by: Dariusz Majcherczyk <dariusz.majcherczyk@gmail.com>	2023-01-24 14:02:17 +00:00
Bartłomiej Głownia	0cff5895c7	feat: call update with null data from useDataProvider hook on variables change (#2689 )	2023-01-24 14:01:51 +00:00
Dexter Edwards	31881f8e5a	fix: calculation of required stake (#2687 )	2023-01-24 14:00:38 +00:00
Art	346af6118d	chore: consolidate persisted order entries (#2673 )	2023-01-24 13:56:12 +00:00
Dexter Edwards	bcbc3bb146	fix: adjust route strcuture (#2708 )	2023-01-24 13:44:11 +00:00
Radosław Szpiech	d7440cfe54	chore: correct runner name (#2710 )	2023-01-24 13:25:29 +01:00
mattrussell36	801606e37f	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-24 12:08:25 +00:00
Dexter Edwards	01e7b8caee	fix: show error message correctly (#2705 )	2023-01-24 11:29:42 +00:00
Joe Tsang	e883ef5c5e	test(#2639 ): e2e view public key tests (#2688 )	2023-01-24 10:52:01 +00:00
mattrussell36	2f391cde5b	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-24 06:07:12 +00:00
mattrussell36	3620314dca	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-24 00:11:13 +00:00
mattrussell36	9bdd1ed387	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-23 18:06:31 +00:00
mattrussell36	37dc8bf110	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-23 12:08:39 +00:00
Edd	3754043f8b	fix(explorer): add correct tendermint websocket url Fairground block explorer seems subtly broken (block count not increasing) because this value is incorrect	2023-01-23 11:44:44 +00:00
mattrussell36	1ee45b6135	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-23 06:08:42 +00:00
mattrussell36	a51410c722	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-23 00:10:33 +00:00
mattrussell36	91173d2434	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-22 18:08:06 +00:00
mattrussell36	8dd33c285e	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-22 12:07:38 +00:00
mattrussell36	6a7385823a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-22 06:06:12 +00:00
mattrussell36	9053b343d1	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-22 00:11:09 +00:00
mattrussell36	6562107578	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-21 18:08:23 +00:00
mattrussell36	8f5bedc12a	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-21 12:08:20 +00:00
mattrussell36	3044f3bdf7	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-21 06:08:34 +00:00
mattrussell36	5eb8fb64c7	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-21 00:10:21 +00:00
botond	ae84e16b9b	chore: bump wallet client (#2662 )	2023-01-20 20:05:18 +00:00
mattrussell36	5e5cc1c587	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-20 18:08:38 +00:00
mattrussell36	a3aa84b983	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-20 12:12:31 +00:00
Radosław Szpiech	49374c8e7c	chore: simplify cypress workflows (#2677 )	2023-01-20 10:21:22 +00:00
mattrussell36	8f4eeba092	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-20 06:07:47 +00:00
mattrussell36	66cceb0f34	chore: update tranches Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>	2023-01-20 00:12:41 +00:00
Matthew Russell	b34fc98c9c	chore: make headers consistent (#2683 )	2023-01-19 22:15:55 +00:00