fix: use n09 in .env.testnet

Merge branch 'release/testnet' of github.com:vegaprotocol/frontend-monorepo into release/testnet
fix: use n08 in .env.testnet
2022-11-01 17:32:43 +00:00 · 2022-11-01 17:29:25 +00:00 · 2022-10-27 11:21:08 +01:00 · 2022-10-27 11:18:50 +01:00
934 changed files with 16547 additions and 40218 deletions
@@ -11,18 +11,21 @@ runs:
  using: 'composite'
  steps:
    - name: Install Vega binaries
+      if: ${{ inputs.all }}
      shell: bash
      run: |
-        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ inputs.version }}/vega-linux-amd64.zip' -q
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip' -q
        unzip vega-linux-amd64.zip -d ${{ inputs.gobin }}

-    - name: Checkout vegawallet-dummy
-      uses: actions/checkout@v3
-      with:
-        repository: 'vegaprotocol/vegawallet-dummy'
-        path: './dummy'
-
-    - name: Install vegawallet-dummy binaries
+    - name: Install date-node binaries
+      if: ${{ inputs.all  }}
      shell: bash
-      run: go install
-      working-directory: ./dummy
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip' -q
+        unzip data-node-linux-amd64.zip -d ${{ inputs.gobin }}
+
+    - name: Install Vega wallet binaries
+      shell: bash
+      run: |
+        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip' -q
+        unzip vegawallet-linux-amd64.zip -d ${{ inputs.gobin }}
@@ -1,25 +0,0 @@
-inputs:
-  passphrase:
-    description: 'Wallet password'
-runs:
-  using: 'composite'
-  steps:
-    - name: Create passphrase
-      shell: bash
-      run: echo "${{ inputs.passphrase }}" > ./passphrase
-
-    - 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 ./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: Start service using capsule network
-      shell: bash
-      run: vegawallet-dummy service run --network DV --wallet capsule_wallet --passphrase-file ./passphrase --home ~/.vegacapsule/testnet/wallet &
@@ -3,6 +3,9 @@ inputs:
    description: 'Recovery phrase'
  passphrase:
    description: 'Wallet password'
+  capsule:
+    description: 'Is Capsule network used'
+    default: false
 runs:
  using: 'composite'
  steps:
@@ -16,20 +19,27 @@ runs:

    - name: Initialize wallet
      shell: bash
-      run: vega wallet init -f --home ~/.vegacapsule/testnet/wallet
+      run: vegawallet 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
+      run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet

    - name: Create public key 2
      shell: bash
-      run: vega wallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet

-    - name: Import network
+    - name: Import fairground 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
+      if: ${{ inputs.capsule==false }}
+      run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks-internal/master/stagnet3/stagnet3.toml" --force --home ~/.vegacapsule/testnet/wallet

-    - name: Start service using stagnet3 network
+    - name: Start service using fairground network
      shell: bash
-      run: vegawallet-dummy service run --network stagnet3 --wallet UI_Trading_Test --passphrase-file ./passphrase --home ~/.vegacapsule/testnet/wallet &
+      if: ${{ inputs.capsule==false }}
+      run: vegawallet service run --network stagnet3 --automatic-consent --no-version-check --home ~/.vegacapsule/testnet/wallet &
+
+    - name: Start service using capsule network
+      shell: bash
+      if: ${{ inputs.capsule==true }}
+      run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
@@ -1,27 +1,25 @@
 ---
-name: 'Add Issues To Project Board'
+name: Auto Assign Issue to New Project

 'on':
  issues:
-    types:
-      - opened
-env:
-  GH_TOKEN: ${{ secrets.GH_NEW_CARD_TO_PROJECT }}
-  PROJECT_ID: ${{ secrets.FRONT_END_PROJECT_ID }}
-  ISSUE_ID: ${{ github.event.issue.node_id }}
-  USER: ${{ github.actor }}
+    types: [opened]

 jobs:
  add_issue:
    runs-on: ubuntu-latest
    steps:
-      - name: 'Add issue to project board'
+      - name: Add Issue to New Front End Project Board
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_NEW_CARD_TO_PROJECT }}
+          PROJECT_ID: ${{ secrets.FRONT_END_PROJECT_ID }}
+          ISSUE_ID: ${{ github.event.issue.node_id }}
        run: |
          gh api graphql -f query='
-            mutation($user:String!, $project:ID!, $issue:ID!) {
-              addProjectV2ItemById(input: {clientMutationId: $user, projectId: $project, contentId: $issue}) {
-                item {
+            mutation($project:ID!, $issue:ID!) {
+              addProjectNextItem(input: {projectId: $project, contentId: $issue}) {
+                projectNextItem {
                  id
                }
              }
-            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID -f user=$USER
+            }' -f project=$PROJECT_ID -f issue=$ISSUE_ID --jq '.data.addProjectNextItem.projectNextItem.id'
@@ -10,51 +10,150 @@ on:
        required: true
        type: choice
        options:
-          - console-lite-e2e
          - explorer-e2e
-          - liquidity-provision-dashboard-e2e
+          - console-lite-e2e
          - stats-e2e
          - token-e2e
          - trading-e2e
-      tags:
-        description: 'Test tags to run'
+      smokeOnly:
+        description: 'Run only smoke tests?'
        required: true
-        type: string
-        default: '@smoke, @regression, @slow'
+        type: boolean
+        default: false
      skip-nx-cache:
        description: 'Add --skip-nx-cache to cypress test'
        required: false
        type: boolean
        default: false
-env:
-  GOBIN: /home/runner/go/bin
-  VEGA_VERSION: 'v0.62.1'

 jobs:
  manual:
    name: Run Cypress tests -- manual trigger
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
+    env:
+      GO111MODULE: 'on'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.58.0'
    steps:
-      - name: Set tags
-        run: echo TAGS="--env.grepTags '[ ${{ github.event.inputs.tags }} ]'" >> $GITHUB_ENV
+      #######
+      ## Setup flags
+      #######
+
+      - name: Set smoke tag
+        if: ${{ github.event.inputs.smokeOnly == 'true' }}
+        run: echo TAGS="--env.grepTags @smoke" >> $GITHUB_ENV

      - name: Set --skip-nx-cache flag
        if: ${{ github.event.inputs.skip-nx-cache == 'true' }}
        run: echo SKIP_NX_CACHE="--skip-nx-cache" >> $GITHUB_ENV

-    outputs:
-      vega-version: ${{env.VEGA_VERSION}}
-      gobin: ${{env.GOBIN}}
-      skip-cache: ${{env.SKIP_NX_CACHE}}
-      tags: ${{env.TAGS}}
+      # See if we capsule is needed for this project
+      - name: Set capsule flag
+        if: ${{  github.event.inputs.project == 'explorer-e2e' || github.event.inputs.project == 'token-e2e'}}
+        run: echo RUN_CAPSULE=true >> $GITHUB_ENV

-  dispatch:
-    needs: manual
-    uses: ./.github/workflows/tests-dispatcher.yml
-    secrets: inherit
-    with:
-      project: ${{ inputs.project }}
-      vega-version: ${{needs.manual.outputs.vega-version}}
-      gobin: ${{needs.manual.outputs.gobin}}
-      skip-cache: ${{needs.manual.outputs.skip-cache}}
-      tags: ${{needs.manual.outputs.tags}}
+      #######
+      ## Setup langs
+      #######
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        id: go
+        with:
+          go-version: 1.19
+
+      - name: Set up Node 16
+        uses: actions/setup-node@v2
+        id: npm
+        with:
+          node-version: 16
+
+      #######
+      ## Install Yarn
+      #######
+      - name: Setup yarn
+        run: npm install -g yarn
+
+      #######
+      ## Checkout repos
+      #######
+
+      # 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') }}
+
+      # Install frontend dependencies
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile
+        working-directory: frontend-monorepo
+
+      #######
+      ## Build and run Vegacapsule network
+      #######
+
+      - name: Install Vega binaries
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}
+
+      - name: Build and run Vegacapsule network
+        if: ${{ env.RUN_CAPSULE }}
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+
+      ######
+      ## Setup a Vega wallet for our user
+      ######
+
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}
+
+      ######
+      ## Run some tests
+      ######
+
+      # 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: yarn nx run ${{ github.event.inputs.project }}:e2e ${{ env.SKIP_NX_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ env.TAGS }}
+        working-directory: frontend-monorepo
+        env:
+          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: false
+
+      ######
+      ## Upload logs
+      ######
+
+      - name: Logs
+        if: ${{ env.RUN_CAPSULE }}
+        run: vegacapsule network logs > vega-capsule-logs.txt
+
+      - uses: actions/upload-artifact@v2
+        if: ${{ env.RUN_CAPSULE }}
+        with:
+          name: logs
+          path: ./vega-capsule-logs.txt
@@ -9,11 +9,115 @@ on:

 jobs:
  nightly:
-    uses: ./.github/workflows/tests-dispatcher.yml
-    secrets: inherit
-    with:
-      project: '[console-lite-e2e, explorer-e2e, liquidity-provision-dashboard-e2e, stats-e2e, token-e2e, trading-e2e]'
-      vega-version: 'v0.62.1'
-      gobin: /home/runner/go/bin
-      tags: --env.grepTags '[ @smoke, @regression, @slow ]'
-      night-run: true
+    name: Run Cypress tests -- nightly
+    runs-on: self-hosted
+    timeout-minutes: 60
+    env:
+      GO111MODULE: 'on'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.58.0'
+      RUN_CAPSULE: true
+    steps:
+      #######
+      ## Setup langs
+      #######
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        id: go
+        with:
+          go-version: 1.19
+      - name: Set up Node 16
+        uses: actions/setup-node@v2
+        id: npm
+        with:
+          node-version: 16
+
+      #######
+      ## Install Yarn
+      #######
+      - name: Setup yarn
+        run: npm install -g yarn
+
+      #######
+      ## Checkout repos
+      #######
+
+      # 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') }}
+
+      # Install frontend dependencies
+      - name: Install root dependencies
+        run: yarn install --frozen-lockfile
+        working-directory: frontend-monorepo
+
+      #######
+      ## Build and run Vegacapsule network
+      #######
+
+      - name: Install Vega binaries
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}
+
+      - name: Build and run Vegacapsule network
+        if: ${{ env.RUN_CAPSULE }}
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+
+      ######
+      ## Setup a Vega wallet for our user
+      ######
+
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}
+
+      ######
+      ## Run some tests
+      ######
+
+      # 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: yarn nx run-many --skip-nx-cache --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome --parallel=1
+        working-directory: frontend-monorepo
+        env:
+          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_NIGHTLY_RUN: true
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
+
+      ######
+      ## Upload logs
+      ######
+
+      - name: Logs
+        run: vegacapsule network logs > vega-capsule-logs.txt
+
+      - uses: actions/upload-artifact@v2
+        with:
+          name: logs
+          path: ./vega-capsule-logs.txt
@@ -1,4 +1,4 @@
-name: Cypress tests - PR
+name: Cypress tests

 on:
  push:
@@ -12,14 +12,41 @@ on:
      - synchronize
      - ready_for_review

-env:
-  GOBIN: /home/runner/go/bin
-  VEGA_VERSION: 'v0.62.1'
-
 jobs:
  pr:
-    runs-on: ubuntu-latest
+    name: Run Cypress tests - PR
+    runs-on: self-hosted
+    timeout-minutes: 30
+    env:
+      GO111MODULE: 'on'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.58.0'
    steps:
+      #######
+      ## Setup langs
+      #######
+      - name: Set up Go
+        uses: actions/setup-go@v3
+        id: go
+        with:
+          go-version: 1.19
+
+      - name: Set up Node 16
+        uses: actions/setup-node@v2
+        id: npm
+        with:
+          node-version: 16
+
+      #######
+      ## Install Yarn
+      #######
+      - name: Setup yarn
+        run: npm install -g yarn
+
+      #######
+      ## Checkout repos
+      #######
+
      # Checkout front ends
      - name: Checkout frontend mono repo
        uses: actions/checkout@v2
@@ -49,22 +76,71 @@ jobs:
          main-branch-name: ${{ github.base_ref || github.ref_name }}
          set-environment-variables-for-job: true

-      # See affected projects
+      # See if we capsule is needed for this project
      - 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 }}
-      vega-version: ${{ env.VEGA_VERSION }}
-      gobin: ${{ env.GOBIN }}
+      - name: See if capsule is necessary
+        if: ${{ contains(env.AFFECTED, 'token') || contains(env.AFFECTED, 'token-e2e') || contains(env.AFFECTED, 'explorer') || contains(env.AFFECTED, 'explorer-e2e') }}
+        run: echo RUN_CAPSULE=true >> $GITHUB_ENV

-  dispatch:
-    needs: pr
-    uses: ./.github/workflows/tests-dispatcher.yml
-    secrets: inherit
-    with:
-      project: ${{ needs.pr.outputs.projects }}
-      vega-version: ${{needs.pr.outputs.vega-version}}
-      gobin: ${{needs.pr.outputs.gobin}}
-      tags: "--env.grepTags='@smoke'"
+      #######
+      ## Build and run Vegacapsule network
+      #######
+
+      - name: Install Vega binaries
+        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
+        with:
+          all: ${{ env.RUN_CAPSULE }}
+          version: ${{ env.VEGA_VERSION }}
+          gobin: ${{ env.GOBIN }}
+
+      - name: Build and run Vegacapsule network
+        if: ${{ env.RUN_CAPSULE }}
+        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
+        with:
+          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+
+      ######
+      ## Setup a Vega wallet for our user
+      ######
+
+      - name: Set up Vegawallet
+        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
+        with:
+          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
+          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          capsule: ${{ env.RUN_CAPSULE }}
+
+      ######
+      ## Run some tests
+      ######
+
+      # 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 affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke' --browser chrome
+        working-directory: frontend-monorepo
+        env:
+          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
+          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: false
+
+      ######
+      ## Upload logs
+      ######
+
+      - name: Logs
+        if: ${{ env.RUN_CAPSULE }}
+        run: vegacapsule network logs > vega-capsule-logs.txt
+
+      - uses: actions/upload-artifact@v2
+        if: ${{ env.RUN_CAPSULE }}
+        with:
+          name: logs
+          path: ./vega-capsule-logs.txt
@@ -1,85 +0,0 @@
-name: Cypress - console-lite
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
-      skip-cache:
-        required: false
-        type: string
-      tags:
-        required: false
-        type: string
-
-jobs:
-  console-lite-e2e:
-    if: ${{ inputs.trigger == 'true' }}
-    runs-on: self-hosted
-    steps:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
-
-      # 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') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      #######
-      ## Build and run Vegacapsule network
-      #######
-
-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
-      ######
-      ## Setup a Vega wallet for our user
-      ######
-
-      - name: Set up Vegawallet
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
-        with:
-          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
-          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-
-      # 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 console-lite-e2e:e2e ${{ inputs.skip-cache }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ inputs.tags }}
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
@@ -1,111 +0,0 @@
-name: Cypress - explorer
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
-      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:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
-
-      # 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') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      #######
-      ## Build and run Vegacapsule network
-      #######
-
-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
-      - name: Build and run Vegacapsule network
-        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        with:
-          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-
-      ######
-      ## Setup a Vega wallet for our user
-      ######
-
-      - name: Set up Vegawallet for docker
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet-docker
-        with:
-          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-
-      ######
-      ## 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_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_NIGHTLY_RUN: ${{ inputs.night-run }}
-
-      ######
-      ## Upload logs
-      ######
-
-      - name: Logs
-        run: vegacapsule network logs > vega-capsule-logs.txt
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: logs
-          path: ./vega-capsule-logs.txt
@@ -1,47 +0,0 @@
-name: Cypress - liquidity provision dashboard
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-
-jobs:
-  liquidity-provision-dashboard-e2e:
-    timeout-minutes: 10
-    if: ${{ inputs.trigger == 'true' }}
-    runs-on: self-hosted
-    steps:
-      # 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') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      # 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 liquidity-provision-dashboard-e2e:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
@@ -1,47 +0,0 @@
-name: Cypress - stats
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-
-jobs:
-  stats-e2e:
-    runs-on: self-hosted
-    if: ${{ inputs.trigger == 'true' }}
-    timeout-minutes: 10
-    steps:
-      # 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') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      # 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 stats-e2e:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
@@ -1,106 +0,0 @@
-name: Cypress - token
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
-      skip-cache:
-        required: false
-        type: string
-      tags:
-        required: false
-        type: string
-
-jobs:
-  token-e2e:
-    if: ${{ inputs.trigger == 'true' }}
-    runs-on: self-hosted
-    timeout-minutes: 60
-    steps:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
-
-      # 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') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      #######
-      ## Build and run Vegacapsule network
-      #######
-
-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
-      - name: Build and run Vegacapsule network
-        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        with:
-          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
-
-      ######
-      ## Setup a Vega wallet for our user
-      ######
-
-      - name: Set up Vegawallet for docker
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet-docker
-        with:
-          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-
-      ######
-      ## 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 }}
-        working-directory: frontend-monorepo
-        env:
-          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
-
-      ######
-      ## Upload logs
-      ######
-
-      - name: Logs
-        run: vegacapsule network logs > vega-capsule-logs.txt
-
-      - uses: actions/upload-artifact@v2
-        with:
-          name: logs
-          path: ./vega-capsule-logs.txt
@@ -1,86 +0,0 @@
-name: Cypress - trading
-
-on:
-  workflow_call:
-    inputs:
-      trigger:
-        required: true
-        type: string
-        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
-      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:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
-
-      # 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') }}
-
-      # Install frontend dependencies
-      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
-        working-directory: frontend-monorepo
-
-      #######
-      ## Build and run Vegacapsule network
-      #######
-
-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
-      ######
-      ## Setup a Vega wallet for our user
-      ######
-
-      - name: Set up Vegawallet
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
-        with:
-          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
-          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-
-      # 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_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
@@ -1,21 +0,0 @@
---
-name: Verify PR title
-
-on:
-  pull_request:
-    types: [opened, ready_for_review, reopened, edited, synchronize]
-jobs:
-  lint_pr:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Use Node.js 16
-        id: Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 16.14.0
-      - name: Install commitlint cli and config
-        run: npm install @commitlint/cli @commitlint/config-conventional
-      - name: Create config
-        run: echo "module.exports = {extends:['@commitlint/config-conventional']};" > commitlint.config.js
-      - name: Check PR title
-        run: echo "${{ github.event.pull_request.title }}" | npx commitlint
@@ -1,76 +0,0 @@
-on:
-  workflow_call:
-    inputs:
-      project:
-        required: true
-        type: string
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
-      skip-cache:
-        required: false
-        type: string
-      tags:
-        required: false
-        type: string
-      night-run:
-        required: false
-        type: boolean
-
-jobs:
-  run-console-lite-e2e:
-    uses: ./.github/workflows/cypress-console-lite-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'console-lite-e2e') || contains(inputs.project, 'console-lite') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
-      skip-cache: ${{ inputs.skip-cache }}
-      tags: ${{ inputs.tags }}
-
-  run-explorer-e2e:
-    uses: ./.github/workflows/cypress-explorer-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'explorer-e2e') || contains(inputs.project, 'explorer') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
-      skip-cache: ${{ inputs.skip-cache }}
-      tags: ${{ inputs.tags }}
-      night-run: ${{ inputs.night-run }}
-
-  run-liquidity-e2e:
-    uses: ./.github/workflows/cypress-liquidity-provision-dashboard-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'liquidity-provision-dashboard-e2e') || contains(inputs.project, 'liquidity-provision-dashboard') }}
-
-  run-stats-e2e:
-    uses: ./.github/workflows/cypress-stats-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'stats-e2e') || contains(inputs.project, 'stats') }}
-
-  run-token-e2e:
-    uses: ./.github/workflows/cypress-token-e2e.yml
-    secrets: inherit
-    with:
-      trigger: ${{ contains(inputs.project, 'token-e2e') || contains(inputs.project, 'token') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
-      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') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
-      skip-cache: ${{ inputs.skip-cache }}
-      tags: ${{ inputs.tags }}
@@ -1,24 +1,6 @@
 module.exports = {
  stories: [],
-  addons: [
-    '@storybook/addon-actions',
-    '@storybook/addon-viewport',
-    {
-      name: '@storybook/addon-docs',
-      options: {
-        configureJSX: true,
-        babelOptions: {},
-        sourceLoaderOptions: null,
-        transcludeMarkdown: true,
-      },
-    },
-    '@storybook/addon-controls',
-    '@storybook/addon-backgrounds',
-    '@storybook/addon-toolbars',
-    '@storybook/addon-measure',
-    '@storybook/addon-outline',
-    '@storybook/addon-a11y',
-  ],
+  addons: ['@storybook/addon-essentials', '@storybook/addon-a11y'],
  // uncomment the property below if you want to apply some webpack config globally
  // webpackFinal: async (config, { configType }) => {
  //   // Make whatever fine-grained changes you need that should apply to all storybook configs
@@ -86,14 +86,13 @@ Run `yarn nx run <my-app>-e2e:e2e` to execute the e2e tests with [cypress](https

 Run `nx test my-app` to execute the unit tests with [Jest](https://jestjs.io), or `nx affected:test` to execute just unit tests affected by a change. You can also use `--watch` with these test to run jest in watch mode, see [Jest executor](https://nx.dev/packages/jest/executors/jest) for all CLI flags.

-### Using wallet
+#### Trading app E2E tests

 To run tests locally using your own wallets you can add the following environment variables to `cypress.json`

 1. Change `TRADING_TEST_VEGA_WALLET_NAME` to your Vega wallet name
 2. Add `TRADING_TEST_VEGA_WALLET_PASSPHRASE` as your wallet passphrase
 3. Add `ETH_WALLET_MNEMONIC` as your Ethereum wallet mnemonic
-4. Use [vegawallet-dummy](https://github.com/vegaprotocol/vegawallet-dummy) to avoid being prompted in CLI during test execution.

 ### Formatting

@@ -1,9 +1,8 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
-CYPRESS_VEGA_ENV=STAGNET3
@@ -1,12 +1,11 @@
-import { connectVegaWallet } from '../support/vega-wallet';
+import { connectVegaWallet } from '../support/connect-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
-  generateMarket,
-  generateMarketData,
  generateMarketsCandles,
  generateMarketsData,
  generateSimpleMarkets,
 } from '../support/mocks/generate-markets';
+import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
 import { generateEstimateOrder } from '../support/mocks/generate-estimate-order';
@@ -16,20 +15,15 @@ import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-p
 import { generateMarketNames } from '../support/mocks/generate-market-names';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
 import type { Market, MarketsQuery } from '@vegaprotocol/market-list';
-import { generateChainId } from '../support/mocks/generate-chain-id';
-import { generateStatistics } from '../support/mocks/generate-statistics';

 describe('market selector', { tags: '@smoke' }, () => {
  let markets: Market[];
  beforeEach(() => {
    cy.mockGQL((req) => {
-      aliasQuery(req, 'ChainId', generateChainId());
-      aliasQuery(req, 'Statistics', generateStatistics());
      aliasQuery(req, 'Markets', generateSimpleMarkets());
      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
      aliasQuery(req, 'MarketsData', generateMarketsData());
-      aliasQuery(req, 'MarketData', generateMarketData());
-      aliasQuery(req, 'Market', generateMarket());
+      aliasQuery(req, 'DealTicket', generateDealTicket());
      aliasQuery(req, 'MarketTags', generateMarketTags());
      aliasQuery(req, 'MarketPositions', generateMarketPositions());
      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
@@ -138,9 +132,7 @@ describe('market selector', { tags: '@smoke' }, () => {
      cy.get('[role="dialog"]').should('not.exist');
      cy.getByTestId('arrow-button').click();
      cy.get('[role="dialog"]').should('be.visible');
-      cy.get('input[placeholder="Search"]').then((search) => {
-        cy.wrap(search).clear();
-      });
+      cy.get('input[placeholder="Search"]').clear();
      cy.getByTestId('market-pane')
        .children()
        .find('[role="button"]')
@@ -1,12 +1,11 @@
-import { connectVegaWallet } from '../support/vega-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generateSimpleMarkets,
  generateMarketsCandles,
  generateMarketsData,
  generateMarket,
-  generateMarketData,
 } from '../support/mocks/generate-markets';
+import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
 import { generateEstimateOrder } from '../support/mocks/generate-estimate-order';
@@ -14,20 +13,18 @@ import { generatePartyBalance } from '../support/mocks/generate-party-balance';
 import { generatePartyMarketData } from '../support/mocks/generate-party-market-data';
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
+import { connectVegaWallet } from '../support/connect-wallet';
 import type { MarketsQuery, Market } from '@vegaprotocol/market-list';
-import { generateChainId } from '../support/mocks/generate-chain-id';
-import { generateStatistics } from '../support/mocks/generate-statistics';

 describe('Market trade', { tags: '@smoke' }, () => {
  let markets: Market[];
  beforeEach(() => {
    cy.mockGQL((req) => {
-      aliasQuery(req, 'ChainId', generateChainId());
-      aliasQuery(req, 'Statistics', generateStatistics());
      aliasQuery(req, 'Markets', generateSimpleMarkets());
      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
      aliasQuery(req, 'MarketsData', generateMarketsData());
      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
+      aliasQuery(req, 'DealTicket', generateDealTicket());
      aliasQuery(req, 'MarketTags', generateMarketTags());
      aliasQuery(req, 'MarketPositions', generateMarketPositions());
      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
@@ -36,7 +33,6 @@ describe('Market trade', { tags: '@smoke' }, () => {
      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
      aliasQuery(req, 'MarketDepth', generateMarketDepth());
      aliasQuery(req, 'Market', generateMarket());
-      aliasQuery(req, 'MarketData', generateMarketData());
    });
    cy.visit('/markets');
    cy.wait('@Markets').then((response) => {
@@ -273,7 +269,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
      cy.get('#step-2-panel')
        .find('dd')
        .eq(3)
-        .should('have.text', '3.00 (3.03%)');
+        .should('have.text', '3.00000 (3.03%)');
    }
  });

@@ -298,7 +294,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
      cy.get('#step-3-panel')
        .find('dd')
        .eq(3)
-        .should('have.text', '3.00 (3.03%)');
+        .should('have.text', '3.00000 (3.03%)');

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

@@ -1,4 +1,7 @@
-import { connectVegaWallet } from '../support/vega-wallet';
+import {
+  connectVegaWallet,
+  disconnectVegaWallet,
+} from '../support/connect-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generatePositions,
@@ -14,10 +17,12 @@ import {
  generateMarketsData,
  generatePositionsMarkets,
 } from '../support/mocks/generate-markets';
-import { generateChainId } from '../support/mocks/generate-chain-id';
-import { generateStatistics } from '../support/mocks/generate-statistics';

-describe('Portfolio page - wallet', { tags: '@smoke' }, () => {
+describe('Portfolio page', { tags: '@smoke' }, () => {
+  afterEach(() => {
+    disconnectVegaWallet();
+  });
+
  it('button for wallet connect should work', () => {
    cy.visit('/');
    cy.get('[href="/portfolio"]').eq(0).click();
@@ -25,21 +30,6 @@ describe('Portfolio page - wallet', { tags: '@smoke' }, () => {
    connectVegaWallet();
    cy.getByTestId('trading-connect-wallet').should('not.exist');
  });
-});
-
-describe('Portfolio page tabs', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockGQL((req) => {
-      aliasQuery(req, 'ChainId', generateChainId());
-      aliasQuery(req, 'Statistics', generateStatistics());
-      aliasQuery(req, 'Positions', generatePositions());
-      aliasQuery(req, 'Margins', generateMargins());
-      aliasQuery(req, 'Markets', generatePositionsMarkets());
-      aliasQuery(req, 'MarketsData', generateMarketsData());
-      aliasQuery(req, 'Accounts', generateAccounts());
-      aliasQuery(req, 'Assets', generateAssets());
-    });
-  });

  it('certain tabs should exist', () => {
    cy.visit('/portfolio');
@@ -62,10 +52,8 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
  });

  describe('Assets view', () => {
-    before(() => {
+    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
        aliasQuery(req, 'Positions', generatePositions());
        aliasQuery(req, 'Margins', generateMargins());
        aliasQuery(req, 'Markets', generatePositionsMarkets());
@@ -95,8 +83,6 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
  describe('Positions view', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
        aliasQuery(req, 'Positions', generatePositions());
        aliasQuery(req, 'Accounts', generateAccounts());
        aliasQuery(req, 'Margins', generateMargins());
@@ -109,15 +95,14 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
    });

    it('data should be properly rendered', () => {
-      cy.get('.ag-center-cols-container .ag-row').should('have.length', 2);
+      cy.getByTestId('positions-asset-tDAI').should('exist');
+      cy.getByTestId('positions-asset-tEURO').should('exist');
    });
  });

  describe('Orders view', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
        aliasQuery(req, 'Orders', generateOrders());
        aliasQuery(req, 'Markets', generateFillsMarkets());
      });
@@ -133,8 +118,6 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
  describe('Fills view', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
        aliasQuery(req, 'Fills', generateFills());
        aliasQuery(req, 'Markets', generateFillsMarkets());
      });
@@ -150,8 +133,6 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
  describe('Empty views', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'ChainId', generateChainId());
-        aliasQuery(req, 'Statistics', generateStatistics());
        aliasQuery(req, 'Positions', emptyPositions());
        aliasQuery(req, 'Accounts', { party: null });
        aliasQuery(req, 'Orders', { party: null });
@@ -162,8 +143,6 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
        aliasQuery(req, 'Assets', {
          assetsConnection: { edges: null, __typename: 'AssetsConnection' },
        });
-        aliasQuery(req, 'Margins', generateMargins());
-        aliasQuery(req, 'MarketsData', generateMarketsData());
      });
      cy.visit('/portfolio');
      connectVegaWallet();
@@ -2,6 +2,7 @@ export const connectVegaWallet = () => {
  const form = 'rest-connector-form';
  const walletName = Cypress.env('TRADING_TEST_VEGA_WALLET_NAME');
  const walletPassphrase = Cypress.env('TRADING_TEST_VEGA_WALLET_PASSPHRASE');
+
  cy.getByTestId('connect-vega-wallet').click();
  cy.getByTestId('connectors-list')
    .find('[data-testid="connector-gui"]')
@@ -10,3 +11,8 @@ export const connectVegaWallet = () => {
  cy.getByTestId(form).find('#passphrase').click().type(walletPassphrase);
  cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
 };
+
+export const disconnectVegaWallet = () => {
+  cy.getByTestId('connect-vega-wallet').click();
+  cy.getByTestId('disconnect').click();
+};
@@ -27,9 +27,7 @@ before(() => {
    aliasQuery(req, 'ChainId', {
      statistics: {
        __typename: 'Statistics',
-        chainId:
-          Cypress.env('VEGA_ENV').toLowerCase() ||
-          'vega-fairground-202210041151',
+        chainId: 'vega-fairground-202210041151',
      },
    });
  });
@@ -1,5 +1,5 @@
 import type { Market } from '@vegaprotocol/market-list';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
 import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';

 export const protoCandles = [
@@ -79,8 +79,8 @@ export const protoCandles = [

 export const protoMarket: Market = {
  id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-  tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-  state: Schema.MarketState.STATE_ACTIVE,
+  tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+  state: MarketState.STATE_ACTIVE,
  decimalPlaces: 5,
  positionDecimalPlaces: 0,
  marketTimestamps: {
@@ -116,12 +116,7 @@ export const protoMarket: Market = {
      product: {
        __typename: 'Future',
        quoteName: 'DAI',
-        settlementAsset: {
-          __typename: 'Asset',
-          id: 'asset-id',
-          symbol: 'tDAI',
-          decimals: 5,
-        },
+        settlementAsset: { symbol: 'tDAI', __typename: 'Asset', decimals: 5 },
      },
      __typename: 'Instrument',
    },
@@ -143,14 +138,10 @@ export const singleMarket: SingleMarketFieldsFragment = {
          id: 'dai-id',
          name: 'DAI Name',
        },
-        dataSourceSpecForTradingTermination: {
+        oracleSpecForTradingTermination: {
          id: 'oid',
        },
      },
    },
  },
-  depth: {
-    __typename: 'MarketDepth',
-    lastTrade: { price: '9893006', __typename: 'Trade' },
-  },
 };
@@ -1,6 +1,6 @@
 import merge from 'lodash/merge';
 import type { AccountsQuery } from '@vegaprotocol/accounts';
-import { Schema as Types } from '@vegaprotocol/types';
+import { AccountType } from '@vegaprotocol/types';
 import type { PartialDeep } from 'type-fest';

 export const generateAccounts = (
@@ -10,85 +10,67 @@ export const generateAccounts = (
    party: {
      __typename: 'Party',
      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '100000000',
-              market: null,
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id',
-              },
-            },
+      accounts: [
+        {
+          __typename: 'AccountBalance',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
+          balance: '100000000',
+          market: null,
+          asset: {
+            __typename: 'Asset',
+            id: 'asset-id',
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '100000000',
-              market: {
-                id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-                __typename: 'Market',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id-2',
-              },
-            },
+        },
+        {
+          __typename: 'AccountBalance',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
+          balance: '100000000',
+          market: {
+            id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
+            __typename: 'Market',
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
-              balance: '1000',
-              market: {
-                __typename: 'Market',
-                id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id',
-              },
-            },
+          asset: {
+            __typename: 'Asset',
+            id: 'asset-id-2',
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
-              balance: '1000',
-              market: {
-                __typename: 'Market',
-                id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-id-2',
-              },
-            },
+        },
+        {
+          __typename: 'AccountBalance',
+          type: AccountType.ACCOUNT_TYPE_MARGIN,
+          balance: '1000',
+          market: {
+            __typename: 'Market',
+            id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '100000000',
-              market: null,
-              asset: {
-                __typename: 'Asset',
-                id: 'asset-0',
-              },
-            },
+          asset: {
+            __typename: 'Asset',
+            id: 'asset-id',
          },
-        ],
-      },
+        },
+        {
+          __typename: 'AccountBalance',
+          type: AccountType.ACCOUNT_TYPE_MARGIN,
+          balance: '1000',
+          market: {
+            __typename: 'Market',
+            id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
+          },
+          asset: {
+            __typename: 'Asset',
+            id: 'asset-id-2',
+          },
+        },
+        {
+          __typename: 'AccountBalance',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
+          balance: '100000000',
+          market: null,
+          asset: {
+            __typename: 'Asset',
+            id: 'asset-0',
+          },
+        },
+      ],
    },
  };
  return merge(defaultAccounts, override);
@@ -1,16 +0,0 @@
-import type { ChainIdQuery } from '@vegaprotocol/react-helpers';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateChainId = (
-  override?: PartialDeep<ChainIdQuery>
-): ChainIdQuery => {
-  const defaultResult = {
-    statistics: {
-      __typename: 'Statistics',
-      chainId: Cypress.env('VEGA_ENV').toLowerCase() || 'test-chain-id',
-    },
-  };
-
-  return merge(defaultResult, override);
-};
@@ -0,0 +1,52 @@
+import type { DealTicketQuery } from '@vegaprotocol/deal-ticket';
+import { MarketTradingMode, MarketState } from '@vegaprotocol/types';
+import merge from 'lodash/merge';
+import type { PartialDeep } from 'type-fest';
+
+export const generateDealTicket = (
+  override?: PartialDeep<DealTicketQuery>
+): DealTicketQuery => {
+  const defaultResult: DealTicketQuery = {
+    market: {
+      id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
+      decimalPlaces: 5,
+      positionDecimalPlaces: 0,
+      state: MarketState.STATE_ACTIVE,
+      tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+      tradableInstrument: {
+        instrument: {
+          id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
+          name: 'AAVEDAI Monthly (30 Jun 2022)',
+          product: {
+            quoteName: 'DAI',
+            settlementAsset: {
+              id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
+              symbol: 'tDAI',
+              name: 'tDAI TEST',
+              decimals: 5,
+              __typename: 'Asset',
+            },
+            __typename: 'Future',
+          },
+          __typename: 'Instrument',
+        },
+        __typename: 'TradableInstrument',
+      },
+      depth: {
+        lastTrade: { price: '9893006', __typename: 'Trade' },
+        __typename: 'MarketDepth',
+      },
+      fees: {
+        factors: {
+          makerFee: '0.0002',
+          infrastructureFee: '0.0005',
+          liquidityFee: '0.001',
+          __typename: 'FeeFactors',
+        },
+        __typename: 'Fees',
+      },
+      __typename: 'Market',
+    },
+  };
+  return merge(defaultResult, override);
+};
@@ -1,44 +1,31 @@
-import type { MarketPositionsQuery } from '@vegaprotocol/deal-ticket';
-import { Schema } from '@vegaprotocol/types';
-
-export const generateMarketPositions = (): MarketPositionsQuery => {
+export const generateMarketPositions = () => {
  return {
    party: {
      id: '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                decimals: 5,
-              },
-              balance: '400000000000000000000',
-              market: {
-                id: '2751c508f9759761f912890f37fb3f97a00300bf7685c02a56a86e05facfe221',
-                __typename: 'Market',
-              },
-            },
+      accounts: [
+        {
+          type: 'General',
+          asset: {
+            decimals: 5,
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              type: Schema.AccountType.ACCOUNT_TYPE_MARGIN,
-              asset: {
-                decimals: 5,
-              },
-              balance: '265329',
-              market: {
-                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-                __typename: 'Market',
-              },
-            },
+          balance: '400000000000000000000',
+          market: {
+            id: '2751c508f9759761f912890f37fb3f97a00300bf7685c02a56a86e05facfe221',
+            __typename: 'Market',
          },
-        ],
-      },
+        },
+        {
+          type: 'Margin',
+          asset: {
+            decimals: 5,
+          },
+          balance: '265329',
+          market: {
+            id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
+            __typename: 'Market',
+          },
+        },
+      ],
      positionsConnection: {
        edges: [
          {
@@ -1,5 +1,9 @@
 import merge from 'lodash/merge';
-import { Schema } from '@vegaprotocol/types';
+import {
+  AuctionTrigger,
+  MarketState,
+  MarketTradingMode,
+} from '@vegaprotocol/types';
 import type {
  MarketsQuery,
  Market,
@@ -11,7 +15,6 @@ import type {
 import { protoMarket, protoCandles, singleMarket } from './commons';
 import type { PartialDeep } from 'type-fest';
 import type { MarketQuery } from '@vegaprotocol/market-list';
-import type { MarketDataQuery } from '@vegaprotocol/market-list';

 export const generateSimpleMarkets = (): MarketsQuery => {
  const markets: Market[] = [
@@ -19,7 +22,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '57fbaa322e97cfc8bb5f1de048c37e033c41b1ac1906d3aed9960912a067ef5a',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -39,9 +42,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-XYZalpha',
              symbol: 'XYZalpha',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -54,7 +56,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: 'ccf2f04865e5951ac3405da6e16b7cbdb535a0ad32df4df2dbed4262cf473255',
-      state: Schema.MarketState.STATE_SUSPENDED,
+      state: MarketState.STATE_SUSPENDED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -74,9 +76,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-XYZbeta',
              symbol: 'XYZbeta',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -89,7 +90,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '6030e5b4e0ca3297a26081e5af4d453f97f96baab2d74bf56f84efcffc4c382f',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -110,9 +111,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'DAI',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tDAI',
              symbol: 'tDAI',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -125,7 +125,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: 'de74a5572045b300e8ec50d136896912ec76e7d7ec135bc305dfd4854d9363a4',
-      state: Schema.MarketState.STATE_PENDING,
+      state: MarketState.STATE_PENDING,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -145,9 +145,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-XYZbeta',
              symbol: 'XYZbeta',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -160,7 +159,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '31ea96284611771e486c820acb26a325a99664f9854b5a7e7ad99023efa8f9e6',
-      state: Schema.MarketState.STATE_CLOSED,
+      state: MarketState.STATE_CLOSED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -179,9 +178,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tUSDC',
              symbol: 'tUSDC',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -194,7 +192,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '34cff959cdc2ffdb0f167820d701fe8b51cc6b8588e650d93369aaa22d6f8b74',
-      state: Schema.MarketState.STATE_SETTLED,
+      state: MarketState.STATE_SETTLED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -215,9 +213,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tBTC',
              symbol: 'tBTC',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -230,7 +227,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '87b0bbb3c171baa5d97dfc3852332829c91e5c5dc9f7c8fb584c6d8ac75aaaf2',
-      state: Schema.MarketState.STATE_SETTLED,
+      state: MarketState.STATE_SETTLED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -250,9 +247,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-XYZgamma',
              symbol: 'XYZgamma',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -265,7 +261,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '45266143c6e9b58f4cff9b8906e971c531bb29ea7af01066973f9b77e8134823',
-      state: Schema.MarketState.STATE_PENDING,
+      state: MarketState.STATE_PENDING,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -286,9 +282,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tBTC',
              symbol: 'tBTC',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -301,7 +296,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '65663ebdc96161162769c4d5c5508137416748178d7cb28e2cb0d07a151a2bc6',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -322,9 +317,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'BTC',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tBTC',
              symbol: 'tBTC',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -337,7 +331,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '234afabd27e3bce1a879039c041f9f00f915d98459935ddafd0169d38dd13850',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -359,9 +353,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tUSDC',
              symbol: 'tUSDC',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -374,7 +367,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '9f2a3c1caa67bb0773ec18d908d32b55b129b9ec2d106a8e9a87f6aa5c0375a6',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -396,9 +389,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'EURO',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tEURO',
              symbol: 'tEURO',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -411,7 +403,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '8a45ee934d3ddac4b036f9884df1064a5353c620a56f775ba36597d0edef9a7a',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -431,9 +423,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-XYZgamma',
              symbol: 'XYZgamma',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -446,7 +437,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: 'aede7b9ac0c3b225004929c5455160a00f59864aad32ec366e8a2bff1b30fd0f',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -467,9 +458,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tBTC',
              symbol: 'tBTC',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -482,7 +472,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '9398707e01daa1a1f1ca6ff87cf8d6c03fe7373ce31121ce81b99a129e6bda47',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -503,9 +493,8 @@ export const generateSimpleMarkets = (): MarketsQuery => {
            __typename: 'Future',
            quoteName: 'USD',
            settlementAsset: {
-              __typename: 'Asset',
-              id: 'asset-tBTC',
              symbol: 'tBTC',
+              __typename: 'Asset',
              decimals: 5,
            },
          },
@@ -1154,51 +1143,52 @@ export const generateFillsMarkets = () => {
  };
 };

-const markets = [
-  {
-    data: {
-      market: {
-        id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-        __typename: 'Market',
-      },
-      marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      staticMidPrice: '0',
-      indicativePrice: '0',
-      bestStaticBidPrice: '0',
-      bestStaticOfferPrice: '0',
-      indicativeVolume: '0',
-      bestBidPrice: '0',
-      bestOfferPrice: '0',
-      markPrice: '17588787',
-      trigger: Schema.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
-      __typename: 'MarketData',
-    },
-    __typename: 'Market',
-  },
-  {
-    data: {
-      market: {
-        id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-        __typename: 'Market',
-      },
-      marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      staticMidPrice: '0',
-      indicativePrice: '0',
-      bestStaticBidPrice: '0',
-      bestStaticOfferPrice: '0',
-      indicativeVolume: '0',
-      bestBidPrice: '0',
-      bestOfferPrice: '0',
-      markPrice: '84377569',
-      trigger: Schema.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
-      __typename: 'MarketData',
-    },
-    __typename: 'Market',
-  },
-];
 export const generateMarketsData = (
  override?: PartialDeep<MarketsDataQuery>
 ): MarketsDataQuery => {
+  const markets = [
+    {
+      data: {
+        market: {
+          id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
+          __typename: 'Market',
+        },
+        marketTradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+        staticMidPrice: '0',
+        indicativePrice: '0',
+        bestStaticBidPrice: '0',
+        bestStaticOfferPrice: '0',
+        indicativeVolume: '0',
+        bestBidPrice: '0',
+        bestOfferPrice: '0',
+        markPrice: '17588787',
+        trigger: AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
+        __typename: 'MarketData',
+      },
+      __typename: 'Market',
+    },
+    {
+      data: {
+        market: {
+          id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
+          __typename: 'Market',
+        },
+        marketTradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+        staticMidPrice: '0',
+        indicativePrice: '0',
+        bestStaticBidPrice: '0',
+        bestStaticOfferPrice: '0',
+        indicativeVolume: '0',
+        bestBidPrice: '0',
+        bestOfferPrice: '0',
+        markPrice: '84377569',
+        trigger: AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
+        __typename: 'MarketData',
+      },
+      __typename: 'Market',
+    },
+  ];
+
  const defaultResult: MarketsDataQuery = {
    marketsConnection: {
      __typename: 'MarketConnection',
@@ -1225,7 +1215,7 @@ export const generatePositionsMarkets = () => {
            decimalPlaces: 5,
            positionDecimalPlaces: 0,
            state: 'STATE_ACTIVE',
-            tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+            tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
            fees: {
              factors: {
                makerFee: '0.0002',
@@ -1254,10 +1244,9 @@ export const generatePositionsMarkets = () => {
                },
                product: {
                  settlementAsset: {
-                    __typename: 'Asset',
-                    id: 'asset-tDAI',
                    symbol: 'tDAI',
                    decimals: 5,
+                    __typename: 'Asset',
                  },
                  quoteName: 'DAI',
                  __typename: 'Future',
@@ -1309,10 +1298,9 @@ export const generatePositionsMarkets = () => {
                },
                product: {
                  settlementAsset: {
-                    __typename: 'Asset',
-                    id: 'asset-tDAI',
                    symbol: 'tDAI',
                    decimals: 5,
+                    __typename: 'Asset',
                  },
                  quoteName: 'DAI',
                  __typename: 'Future',
@@ -1365,10 +1353,9 @@ export const generatePositionsMarkets = () => {
                },
                product: {
                  settlementAsset: {
-                    __typename: 'Asset',
-                    id: 'asset-tEURO',
                    symbol: 'tEURO',
                    decimals: 5,
+                    __typename: 'Asset',
                  },
                  quoteName: 'EURO',
                  __typename: 'Future',
@@ -1399,34 +1386,3 @@ export const generateMarket = (): MarketQuery => {
    },
  };
 };
-
-export const generateMarketData = (): MarketDataQuery => {
-  return {
-    marketsConnection: {
-      edges: [
-        {
-          node: {
-            data: {
-              market: {
-                id: protoMarket.id,
-                __typename: 'Market',
-              },
-              marketTradingMode:
-                Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-              staticMidPrice: '0',
-              indicativePrice: '0',
-              bestStaticBidPrice: '0',
-              bestStaticOfferPrice: '0',
-              indicativeVolume: '0',
-              bestBidPrice: '0',
-              bestOfferPrice: '0',
-              markPrice: '17588787',
-              trigger: Schema.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
-              __typename: 'MarketData',
-            },
-          },
-        },
-      ],
-    },
-  };
-};
@@ -1,78 +1,63 @@
 import merge from 'lodash/merge';
 import type { PartyBalanceQuery } from '@vegaprotocol/deal-ticket';
 import type { PartialDeep } from 'type-fest';
-import { Schema as Types } from '@vegaprotocol/types';
+import { AccountType } from '@vegaprotocol/types';

 export const generatePartyBalance = (
  override?: PartialDeep<PartyBalanceQuery>
 ): PartyBalanceQuery => {
  const defaultResult: PartyBalanceQuery = {
    party: {
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '88474051',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
+      accounts: [
+        {
+          balance: '88474051',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
+          asset: {
+            id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
+            symbol: 'tDAI',
+            name: 'tDAI TEST',
+            decimals: 5,
+            __typename: 'Asset',
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '100000000',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4',
-                symbol: 'tEURO',
-                name: 'tEURO TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
+          __typename: 'AccountBalance',
+        },
+        {
+          balance: '100000000',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
+          asset: {
+            id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4',
+            symbol: 'tEURO',
+            name: 'tEURO TEST',
+            decimals: 5,
+            __typename: 'Asset',
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '3412867',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
+          __typename: 'AccountBalance',
+        },
+        {
+          balance: '3412867',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
+          asset: {
+            id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
+            symbol: 'tDAI',
+            name: 'tDAI TEST',
+            decimals: 5,
+            __typename: 'Asset',
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '70007',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
+          __typename: 'AccountBalance',
+        },
+        {
+          balance: '70007',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
+          asset: {
+            id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
+            symbol: 'tDAI',
+            name: 'tDAI TEST',
+            decimals: 5,
+            __typename: 'Asset',
          },
-        ],
-      },
+          __typename: 'AccountBalance',
+        },
+      ],
      __typename: 'Party',
    },
  };
@@ -1,39 +1,32 @@
-import type { PartyMarketDataQuery } from '@vegaprotocol/deal-ticket';
 import { Schema as Types } from '@vegaprotocol/types';

-export const generatePartyMarketData = (): PartyMarketDataQuery => {
+export const generatePartyMarketData = () => {
  return {
    party: {
      id: '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '1200000',
-              asset: { id: 'fBTC', decimals: 5, __typename: 'Asset' },
-              market: null,
-              __typename: 'AccountBalance',
-            },
+      accounts: [
+        {
+          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          balance: '1200000',
+          asset: { id: 'fBTC', decimals: 5, __typename: 'Asset' },
+          market: null,
+          __typename: 'AccountBalance',
+        },
+        {
+          __typename: 'AccountBalance',
+          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          balance: '0.000000001',
+          asset: {
+            __typename: 'Asset',
+            id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
+            symbol: 'tUSD',
+            name: 'usd',
+            decimals: 0,
          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '0.000000001',
-              asset: {
-                __typename: 'Asset',
-                id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-                decimals: 0,
-              },
-            },
-          },
-        ],
-      },
+        },
+      ],
      marginsConnection: { edges: null, __typename: 'MarginConnection' },
+      positionsConnection: { edges: null, __typename: 'PositionConnection' },
      __typename: 'Party',
    },
  };
@@ -1,17 +0,0 @@
-import type { StatisticsQuery } from '@vegaprotocol/environment';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateStatistics = (
-  override?: PartialDeep<StatisticsQuery>
-): StatisticsQuery => {
-  const defaultResult = {
-    statistics: {
-      __typename: 'Statistics',
-      chainId: Cypress.env('VEGA_ENV').toLowerCase() || 'test-chain-id',
-      blockHeight: '11',
-    },
-  };
-
-  return merge(defaultResult, override);
-};
@@ -17,9 +17,9 @@ NX_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY
 NX_URL=$URL
 NX_DEPLOY_URL=$DEPLOY_URL
 NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
-NX_VEGA_CONFIG_URL="https://static.vega.xyz/assets/stagnet3-network.json"
-NX_VEGA_ENV=STAGNET3
-NX_VEGA_URL="https://api.stagnet3.vega.xyz/graphql"
+NX_VEGA_CONFIG_URL="https://static.vega.xyz/assets/testnet-network.json"
+NX_VEGA_ENV = 'TESTNET'
+NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
 NX_VEGA_WALLET_URL=http://localhost:1789
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -4,4 +4,4 @@ NX_VEGA_ENV=SANDBOX
 NX_VEGA_NETWORKS='{"DEVNET":"https://dev.token.vega.xyz","STAGNET3":"https://stagnet3.token.vega.xyz","STAGNET1":"https://stagnet1.token.vega.xyz","TESTNET":"https://token.fairground.wtf","MAINNET":"https://token.vega.xyz"}'
 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_VEGA_DOCS_URL=https://docs.vega.xyz/docs/testnet
@@ -1,6 +1,6 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -1,5 +1,6 @@
 import { useEffect } from 'react';
 import { useLocation } from 'react-router-dom';
+import { createClient } from './lib/apollo-client';
 import { ThemeContext } from '@vegaprotocol/react-helpers';
 import { useThemeSwitcher } from '@vegaprotocol/react-helpers';
 import { EnvironmentProvider, NetworkLoader } from '@vegaprotocol/environment';
@@ -15,7 +16,6 @@ import Header from './components/header';
 import { Main } from './components/main';
 import LocalContext from './context/local-context';
 import useLocalValues from './hooks/use-local-values';
-import type { InMemoryCacheConfig } from '@apollo/client';

 function App() {
  const [theme, toggleTheme] = useThemeSwitcher();
@@ -30,34 +30,10 @@ function App() {
    setMenuOpen(false);
  }, [location, setMenuOpen]);

-  const cacheConfig: InMemoryCacheConfig = {
-    typePolicies: {
-      Market: {
-        merge: true,
-      },
-      Party: {
-        merge: true,
-      },
-      Query: {},
-      Account: {
-        keyFields: false,
-        fields: {
-          balanceFormatted: {},
-        },
-      },
-      Node: {
-        keyFields: false,
-      },
-      Instrument: {
-        keyFields: false,
-      },
-    },
-  };
-
  return (
    <EnvironmentProvider>
      <ThemeContext.Provider value={theme}>
-        <NetworkLoader cache={cacheConfig}>
+        <NetworkLoader createClient={createClient}>
          <VegaWalletProvider>
            <LocalContext.Provider value={localValues}>
              <AppLoader>
@@ -1,17 +1,13 @@
 query PartyBalanceQuery($partyId: ID!) {
  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          type
-          balance
-          asset {
-            id
-            symbol
-            name
-            decimals
-          }
-        }
+    accounts {
+      type
+      balance
+      asset {
+        id
+        symbol
+        name
+        decimals
      }
    }
  }
@@ -8,24 +8,20 @@ export type PartyBalanceQueryQueryVariables = Types.Exact<{
 }>;


-export type PartyBalanceQueryQuery = { __typename?: 'Query', party?: { __typename?: 'Party', accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } } } | null> | null } | null } | null };
+export type PartyBalanceQueryQuery = { __typename?: 'Query', party?: { __typename?: 'Party', accounts?: Array<{ __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } }> | null } | null };


 export const PartyBalanceQueryDocument = gql`
    query PartyBalanceQuery($partyId: ID!) {
  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          type
-          balance
-          asset {
-            id
-            symbol
-            name
-            decimals
-          }
-        }
+    accounts {
+      type
+      balance
+      asset {
+        id
+        symbol
+        name
+        decimals
      }
    }
  }
@@ -1,22 +1,25 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import type { AccountFragment } from '@vegaprotocol/deal-ticket';
+import type {
+  AccountFragment,
+  DealTicketMarketFragment,
+} from '@vegaprotocol/deal-ticket';
 import { DealTicketBalance } from './deal-ticket-balance';
-import { Schema } from '@vegaprotocol/types';
-import type { MarketDealTicketAsset } from '@vegaprotocol/market-list';
+import { AccountType } from '@vegaprotocol/types';

-const tDAI: MarketDealTicketAsset = {
-  __typename: 'Asset',
-  id: '1',
-  symbol: 'tDAI',
-  name: 'TDAI',
-  decimals: 2,
-};
+const tDAI: DealTicketMarketFragment['tradableInstrument']['instrument']['product']['settlementAsset'] =
+  {
+    __typename: 'Asset',
+    id: '1',
+    symbol: 'tDAI',
+    name: 'TDAI',
+    decimals: 2,
+  };

 const accounts: AccountFragment[] = [
  {
    __typename: 'AccountBalance',
-    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
+    type: AccountType.ACCOUNT_TYPE_GENERAL,
    balance: '1000000',
    asset: tDAI,
  },
@@ -1,12 +1,14 @@
 import classNames from 'classnames';
 import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
-import { Schema } from '@vegaprotocol/types';
-import type { AccountFragment } from '@vegaprotocol/deal-ticket';
-import type { MarketDealTicket } from '@vegaprotocol/market-list';
+import { AccountType } from '@vegaprotocol/types';
+import type {
+  AccountFragment,
+  DealTicketMarketFragment,
+} from '@vegaprotocol/deal-ticket';
 import { useSettlementAccount } from '@vegaprotocol/deal-ticket';

 interface DealTicketBalanceProps {
-  settlementAsset: MarketDealTicket['tradableInstrument']['instrument']['product']['settlementAsset'];
+  settlementAsset: DealTicketMarketFragment['tradableInstrument']['instrument']['product']['settlementAsset'];
  accounts: AccountFragment[];
  isWalletConnected: boolean;
  className?: string;
@@ -23,7 +25,7 @@ export const DealTicketBalance = ({
  const settlementAccount = useSettlementAccount(
    settlementAssetId,
    accounts,
-    Schema.AccountType.ACCOUNT_TYPE_GENERAL
+    AccountType.ACCOUNT_TYPE_GENERAL
  );
  const formattedNumber =
    settlementAccount?.balance &&
@@ -1,22 +1,16 @@
 import { useParams } from 'react-router-dom';
-import compact from 'lodash/compact';
 import {
  DealTicketManager,
+  DealTicketContainer as Container,
  usePartyBalanceQuery,
 } from '@vegaprotocol/deal-ticket';
-import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
-import { t, useDataProvider } from '@vegaprotocol/react-helpers';
+import { Loader } from '@vegaprotocol/ui-toolkit';
+import { t } from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { DealTicketSteps } from './deal-ticket-steps';
 import { DealTicketBalance } from './deal-ticket-balance';
 import Baubles from './baubles-decor';
 import ConnectWallet from '../wallet-connector';
-import { useMemo } from 'react';
-import type {
-  MarketDataUpdateFieldsFragment,
-  MarketDealTicket,
-} from '@vegaprotocol/market-list';
-import { marketDealTicketProvider } from '@vegaprotocol/market-list';

 const tempEmptyText = (
  <p>{t('Please select a market from the markets page')}</p>
@@ -26,64 +20,49 @@ export const DealTicketContainer = () => {
  const { marketId } = useParams<{ marketId: string }>();
  const { pubKey } = useVegaWallet();

-  const { data: partyData } = usePartyBalanceQuery({
+  const { data: partyData, loading } = usePartyBalanceQuery({
    variables: { partyId: pubKey || '' },
    skip: !pubKey,
  });

-  const variables = useMemo(
-    () => ({
-      marketId: marketId || '',
-    }),
-    [marketId]
-  );
-  const { data, loading } = useDataProvider<
-    MarketDealTicket,
-    MarketDataUpdateFieldsFragment
-  >({
-    dataProvider: marketDealTicketProvider,
-    variables,
-    skip: !marketId,
-  });
-
-  const accounts = compact(partyData?.party?.accountsConnection?.edges).map(
-    (e) => e.node
-  );
-
  const loader = <Loader />;
-  if (marketId && data) {
-    const balance = (
-      <DealTicketBalance
-        className="mb-4"
-        settlementAsset={
-          data.tradableInstrument.instrument.product?.settlementAsset
+
+  const container = marketId ? (
+    <Container marketId={marketId}>
+      {(data) => {
+        if (!data.market) {
+          return null as unknown as JSX.Element;
        }
-        accounts={accounts || []}
-        isWalletConnected={!!pubKey}
-      />
-    );

-    const container = (
-      <DealTicketManager market={data}>
-        {loading ? loader : balance}
-        <DealTicketSteps market={data} />
-      </DealTicketManager>
-    );
+        const balance = (
+          <DealTicketBalance
+            className="mb-4"
+            settlementAsset={
+              data.market.tradableInstrument.instrument.product?.settlementAsset
+            }
+            accounts={partyData?.party?.accounts || []}
+            isWalletConnected={!!pubKey}
+          />
+        );

-    return (
-      <section className="flex p-4 md:p-6">
-        <section className="w-full md:w-1/2 md:min-w-[500px]">
-          {pubKey ? container : <ConnectWallet />}
-        </section>
-        <Baubles />
-      </section>
-    );
-  }
-  return marketId ? (
-    <Splash>
-      <p>{t('Could not load market')}</p>
-    </Splash>
+        return (
+          <DealTicketManager market={data.market}>
+            {loading ? loader : balance}
+            <DealTicketSteps market={data.market} />
+          </DealTicketManager>
+        );
+      }}
+    </Container>
  ) : (
    tempEmptyText
  );
+
+  return (
+    <section className="flex p-4 md:p-6">
+      <section className="w-full md:w-1/2 md:min-w-[500px]">
+        {pubKey ? container : <ConnectWallet />}
+      </section>
+      <Baubles />
+    </section>
+  );
 };
@@ -11,8 +11,8 @@ import { InputSetter } from '../../components/input-setter';
 import { IconNames } from '@blueprintjs/icons';
 import {
  DataTitle,
-  ValueTooltipRow,
  EST_SLIPPAGE,
+  ValueTooltipRow,
 } from '@vegaprotocol/deal-ticket';

 interface DealTicketSlippageProps {
@@ -1,16 +1,19 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useForm, Controller } from 'react-hook-form';
-import compact from 'lodash/compact';
 import { Stepper } from '../stepper';
+import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
 import {
-  getDefaultOrder,
  useOrderCloseOut,
  useOrderMargin,
  usePartyBalanceQuery,
  useMaximumPositionSize,
  useCalculateSlippage,
-  validateAmount,
+} from '@vegaprotocol/deal-ticket';
+import {
+  getDefaultOrder,
+  useOrderValidation,
+  validateSize,
 } from '@vegaprotocol/deal-ticket';
 import { InputError } from '@vegaprotocol/ui-toolkit';
 import { BigNumber } from 'bignumber.js';
@@ -23,8 +26,6 @@ import {
  toDecimal,
  removeDecimal,
  addDecimalsFormatNumber,
-  addDecimal,
-  formatNumber,
 } from '@vegaprotocol/react-helpers';
 import {
  useOrderSubmit,
@@ -39,11 +40,9 @@ import SideSelector, { SIDE_NAMES } from './side-selector';
 import ReviewTrade from './review-trade';
 import { Schema } from '@vegaprotocol/types';
 import { DealTicketSlippage } from './deal-ticket-slippage';
-import { useOrderValidation } from './use-order-validation';
-import type { MarketDealTicket } from '@vegaprotocol/market-list';

 interface DealTicketMarketProps {
-  market: MarketDealTicket;
+  market: DealTicketMarketFragment;
 }

 export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
@@ -70,10 +69,17 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
  const step = toDecimal(market.positionDecimalPlaces);
  const order = watch();
  const { pubKey } = useVegaWallet();
+  const estMargin = useOrderMargin({
+    order,
+    market,
+    partyId: pubKey || '',
+  });
  const { message: invalidText, isDisabled } = useOrderValidation({
    market,
-    order,
+    orderType: order.type,
+    orderTimeInForce: order.timeInForce,
    fieldErrors: errors,
+    estMargin,
  });
  const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();

@@ -82,12 +88,9 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
    skip: !pubKey,
  });

-  const accounts = compact(partyBalance?.party?.accountsConnection?.edges).map(
-    (e) => e.node
-  );
  const maxTrade = useMaximumPositionSize({
    partyId: pubKey || '',
-    accounts: accounts,
+    accounts: partyBalance?.party?.accounts || [],
    marketId: market.id,
    settlementAssetId:
      market.tradableInstrument.instrument.product.settlementAsset.id,
@@ -122,18 +125,11 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
      );
      return new BigNumber(market?.depth?.lastTrade?.price)
        .multipliedBy(multiplier)
-        .toString();
+        .toNumber();
    }
-    return undefined;
+    return null;
  }, [market?.depth?.lastTrade?.price, order.side, slippage]);

-  const estMargin = useOrderMargin({
-    order,
-    market,
-    partyId: pubKey || '',
-    derivedPrice: price,
-  });
-
  const formattedPrice =
    price && addDecimalsFormatNumber(price, market.decimalPlaces);

@@ -146,9 +142,6 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
    return null;
  }, [market.decimalPlaces, order.size, price]);

-  const assetDecimals =
-    market.tradableInstrument.instrument.product.settlementAsset.decimals;
-
  const fees = useMemo(() => {
    if (estMargin?.totalFees && notionalSize) {
      const percentage = new BigNumber(estMargin?.totalFees)
@@ -157,14 +150,11 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
        .decimalPlaces(2)
        .toString();

-      return `${addDecimalsFormatNumber(
-        estMargin.totalFees,
-        assetDecimals
-      )} (${formatNumber(addDecimal(percentage, assetDecimals), 2)}%)`;
+      return `${estMargin.totalFees} (${percentage}%)`;
    }

    return null;
-  }, [assetDecimals, estMargin?.totalFees, notionalSize]);
+  }, [estMargin?.totalFees, notionalSize]);

  const max = useMemo(() => {
    return new BigNumber(maxTrade)
@@ -181,7 +171,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
      const newVal = new BigNumber(value)
        .decimalPlaces(market.positionDecimalPlaces)
        .toString();
-      const isValid = validateAmount(step, 'Size')(newVal);
+      const isValid = validateSize(step)(newVal);
      if (isValid !== 'step') {
        setValue('size', newVal);
      }
@@ -5,17 +5,17 @@ import {
  KeyValueTableRow,
 } from '@vegaprotocol/ui-toolkit';
 import classNames from 'classnames';
+import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
 import { DealTicketEstimates } from '@vegaprotocol/deal-ticket';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { SIDE_NAMES } from './side-selector';
 import { gql, useQuery } from '@apollo/client';
-import { Schema } from '@vegaprotocol/types';
-import { MarketExpires } from '@vegaprotocol/market-info';
-import type { MarketDealTicket } from '@vegaprotocol/market-list';
 import type {
  MarketTags,
  MarketTagsVariables,
 } from './__generated__/MarketTags';
+import { Schema } from '@vegaprotocol/types';
+import { MarketExpires } from '@vegaprotocol/market-info';

 export const MARKET_TAGS_QUERY = gql`
  query MarketTags($marketId: ID!) {
@@ -32,7 +32,7 @@ export const MARKET_TAGS_QUERY = gql`
 `;

 interface Props {
-  market: MarketDealTicket;
+  market: DealTicketMarketFragment;
  isDisabled: boolean;
  transactionStatus?: string;
  order: OrderSubmissionBody['orderSubmission'];
@@ -1,396 +0,0 @@
-import * as React from 'react';
-import { renderHook } from '@testing-library/react';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { MockedProvider } from '@apollo/client/testing';
-import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import {
-  MarketStateMapping,
-  Schema as Types,
-  Schema,
-} from '@vegaprotocol/types';
-import type { ValidationProps } from './use-order-validation';
-import { marketTranslations, useOrderValidation } from './use-order-validation';
-import type { MarketDealTicket } from '@vegaprotocol/market-list';
-import * as DealTicket from '@vegaprotocol/deal-ticket';
-
-jest.mock('@vegaprotocol/wallet');
-jest.mock('@vegaprotocol/deal-ticket', () => {
-  return {
-    ...jest.requireActual('@vegaprotocol/deal-ticket'),
-    useOrderMarginValidation: jest.fn(),
-  };
-});
-
-type SettlementAsset =
-  MarketDealTicket['tradableInstrument']['instrument']['product']['settlementAsset'];
-const asset: SettlementAsset = {
-  __typename: 'Asset',
-  id: 'asset-id',
-  symbol: 'asset-symbol',
-  name: 'asset-name',
-  decimals: 2,
-};
-
-const market: MarketDealTicket = {
-  id: 'market-id',
-  decimalPlaces: 2,
-  positionDecimalPlaces: 1,
-  tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-  state: Schema.MarketState.STATE_ACTIVE,
-  tradableInstrument: {
-    __typename: 'TradableInstrument',
-    instrument: {
-      __typename: 'Instrument',
-      id: 'instrument-id',
-      name: 'instrument-name',
-      code: 'instriment-code',
-      metadata: {
-        tags: [],
-      },
-      product: {
-        __typename: 'Future',
-        quoteName: 'quote-name',
-        settlementAsset: asset,
-        dataSourceSpecForTradingTermination: {
-          id: 'dataSource-id',
-        },
-      },
-    },
-  },
-  depth: {
-    __typename: 'MarketDepth',
-    lastTrade: {
-      __typename: 'Trade',
-      price: '100',
-    },
-  },
-  fees: {
-    __typename: 'Fees',
-    factors: {
-      __typename: 'FeeFactors',
-      makerFee: '1',
-      infrastructureFee: '2',
-      liquidityFee: '3',
-    },
-  },
-  data: {
-    __typename: 'MarketData',
-    bestBidPrice: '1605489971',
-    bestOfferPrice: '1606823730',
-    markPrice: '1606823730',
-    trigger: Types.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
-    staticMidPrice: '1606156850',
-    marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-    indicativeVolume: '0',
-    indicativePrice: '0',
-    bestStaticBidPrice: '1605489971',
-    bestStaticOfferPrice: '1606823730',
-    targetStake: '8561302732',
-    suppliedStake: '727654170336',
-    auctionStart: null,
-    auctionEnd: null,
-    market: { __typename: 'Market', id: 'market-id' },
-  },
-  marketTimestamps: {},
-};
-
-const defaultWalletContext = {
-  pubKey: '111111__111111',
-  pubKeys: [],
-  sendTx: jest.fn().mockReturnValue(Promise.resolve(null)),
-  connect: jest.fn(),
-  disconnect: jest.fn(),
-  selectPubKey: jest.fn(),
-  connector: null,
-};
-
-const order = {
-  type: Schema.OrderType.TYPE_MARKET,
-  timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-  marketId: 'market-id',
-  side: Schema.Side.SIDE_BUY,
-  size: '0.1',
-};
-
-const defaultOrder = {
-  market: { ...market },
-  step: 0.1,
-  order: {
-    ...order,
-  },
-};
-
-const ERROR = {
-  KEY_MISSING: 'No public key selected',
-  KEY_TAINTED: 'Selected public key has been tainted',
-  MARKET_SUSPENDED: 'Market is currently suspended',
-  MARKET_INACTIVE: 'Market is no longer active',
-  MARKET_WAITING: 'Market is not active yet',
-  MARKET_CONTINUOUS_LIMIT:
-    'Only limit orders are permitted when market is in auction',
-  MARKET_CONTINUOUS_TIF:
-    'Until the auction ends, you can only place GFA, GTT, or GTC limit orders',
-  FIELD_SIZE_REQ: 'You need to provide a size',
-  FIELD_SIZE_MIN: `Size cannot be lower than "${defaultOrder.step}"`,
-  FIELD_PRICE_REQ: 'You need to provide a price',
-  FIELD_PRICE_MIN: 'The price cannot be negative',
-  FIELD_PRICE_STEP_NULL: 'Order sizes must be in whole numbers for this market',
-  FIELD_PRICE_STEP_DECIMAL: `The size field accepts up to ${market.positionDecimalPlaces} decimal places`,
-};
-
-function setup(
-  props?: Partial<ValidationProps>,
-  context?: Partial<VegaWalletContextShape>
-) {
-  const mockUseVegaWallet = useVegaWallet as jest.Mock;
-  mockUseVegaWallet.mockReturnValue({ ...defaultWalletContext, context });
-  return renderHook(() => useOrderValidation({ ...defaultOrder, ...props }), {
-    wrapper: MockedProvider,
-  });
-}
-
-describe('useOrderValidation', () => {
-  afterEach(() => {
-    jest.clearAllMocks();
-  });
-
-  it('Returns empty string when given valid data', () => {
-    jest.spyOn(DealTicket, 'useOrderMarginValidation').mockReturnValue({
-      balance: '0',
-      margin: '100',
-      balanceError: false,
-    });
-
-    const { result } = setup();
-    expect(result.current).toStrictEqual({
-      isDisabled: false,
-      message: ``,
-      section: '',
-    });
-  });
-
-  it('Returns an error message when no keypair found', () => {
-    jest.spyOn(DealTicket, 'useOrderMarginValidation').mockReturnValue({
-      balance: '0',
-      margin: '100',
-      balanceError: false,
-    });
-    const { result } = setup(defaultOrder, { pubKey: null });
-    expect(result.current).toStrictEqual({
-      isDisabled: false,
-      message: ``,
-      section: '',
-    });
-  });
-
-  it.each`
-    state
-    ${Schema.MarketState.STATE_SETTLED}
-    ${Schema.MarketState.STATE_REJECTED}
-    ${Schema.MarketState.STATE_TRADING_TERMINATED}
-    ${Schema.MarketState.STATE_CLOSED}
-    ${Schema.MarketState.STATE_CANCELLED}
-  `(
-    'Returns an error message for market state when not accepting orders',
-    ({ state }) => {
-      const { result } = setup({ market: { ...defaultOrder.market, state } });
-      expect(result.current).toStrictEqual({
-        isDisabled: true,
-        message: `This market is ${marketTranslations(
-          state
-        )} and not accepting orders`,
-        section: 'sec-summary',
-      });
-    }
-  );
-
-  it.each`
-    state
-    ${Schema.MarketState.STATE_PENDING}
-    ${Schema.MarketState.STATE_PROPOSED}
-  `(
-    'Returns an error message for market state suspended or pending',
-    ({ state }) => {
-      jest.spyOn(DealTicket, 'useOrderMarginValidation').mockReturnValue({
-        balance: '0',
-        margin: '100',
-        balanceError: false,
-        // asset,
-      });
-      const { result } = setup({
-        market: {
-          ...defaultOrder.market,
-          state,
-          tradingMode: Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-        },
-        order: {
-          ...order,
-          type: Schema.OrderType.TYPE_LIMIT,
-          timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTT,
-        },
-      });
-      expect(result.current).toStrictEqual({
-        isDisabled: false,
-        message: `This market is ${MarketStateMapping[
-          state as Schema.MarketState
-        ].toLowerCase()} and only accepting liquidity commitment orders`,
-        section: 'sec-summary',
-      });
-    }
-  );
-
-  it.each`
-    tradingMode                                                 | errorMessage
-    ${Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION}      | ${ERROR.MARKET_CONTINUOUS_LIMIT}
-    ${Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION} | ${ERROR.MARKET_CONTINUOUS_LIMIT}
-    ${Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION}    | ${ERROR.MARKET_CONTINUOUS_LIMIT}
-  `(
-    `Returns an error message when trying to submit a non-limit order for a "$tradingMode" market`,
-    ({ tradingMode, errorMessage }) => {
-      const { result } = setup({
-        market: { ...defaultOrder.market, tradingMode },
-        order: {
-          ...order,
-          type: Schema.OrderType.TYPE_MARKET,
-        },
-      });
-      expect(result.current.isDisabled).toBeTruthy();
-      expect(result.current.message).toBe(errorMessage);
-    }
-  );
-
-  it.each`
-    tradingMode                                                 | orderTimeInForce                             | errorMessage
-    ${Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION}      | ${Schema.OrderTimeInForce.TIME_IN_FORCE_FOK} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION} | ${Schema.OrderTimeInForce.TIME_IN_FORCE_FOK} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION}    | ${Schema.OrderTimeInForce.TIME_IN_FORCE_FOK} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION}      | ${Schema.OrderTimeInForce.TIME_IN_FORCE_IOC} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION} | ${Schema.OrderTimeInForce.TIME_IN_FORCE_IOC} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION}    | ${Schema.OrderTimeInForce.TIME_IN_FORCE_IOC} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION}      | ${Schema.OrderTimeInForce.TIME_IN_FORCE_GFN} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION} | ${Schema.OrderTimeInForce.TIME_IN_FORCE_GFN} | ${ERROR.MARKET_CONTINUOUS_TIF}
-    ${Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION}    | ${Schema.OrderTimeInForce.TIME_IN_FORCE_GFN} | ${ERROR.MARKET_CONTINUOUS_TIF}
-  `(
-    `Returns an error message when submitting a limit order with a "$orderTimeInForce" value to a "$tradingMode" market`,
-    ({ tradingMode, orderTimeInForce, errorMessage }) => {
-      const { result } = setup({
-        market: { ...defaultOrder.market, tradingMode },
-        order: {
-          ...order,
-          type: Schema.OrderType.TYPE_LIMIT,
-          timeInForce: orderTimeInForce,
-        },
-      });
-      expect(result.current).toStrictEqual({
-        isDisabled: true,
-        message: errorMessage,
-        section: 'sec-force',
-      });
-    }
-  );
-
-  it.each`
-    fieldName  | errorType     | section        | errorMessage
-    ${`size`}  | ${`required`} | ${'sec-size'}  | ${ERROR.FIELD_SIZE_REQ}
-    ${`size`}  | ${`min`}      | ${'sec-size'}  | ${ERROR.FIELD_SIZE_MIN}
-    ${`price`} | ${`required`} | ${'sec-price'} | ${ERROR.FIELD_PRICE_REQ}
-    ${`price`} | ${`min`}      | ${'sec-price'} | ${ERROR.FIELD_PRICE_MIN}
-  `(
-    `Returns an error message when the order $fieldName "$errorType" validation fails`,
-    ({ fieldName, errorType, section, errorMessage }) => {
-      const { result } = setup({
-        fieldErrors: { [fieldName]: { type: errorType } },
-        order: {
-          ...order,
-          type: Schema.OrderType.TYPE_LIMIT,
-        },
-      });
-      expect(result.current).toStrictEqual({
-        isDisabled: true,
-        message: errorMessage,
-        section,
-      });
-    }
-  );
-
-  it('Returns an error message when the order size incorrectly has decimal values', () => {
-    const { result } = setup({
-      market: { ...market, positionDecimalPlaces: 0 },
-      fieldErrors: {
-        size: { type: `validate`, message: DealTicket.ERROR_SIZE_DECIMAL },
-      },
-    });
-    expect(result.current).toStrictEqual({
-      isDisabled: true,
-      message: ERROR.FIELD_PRICE_STEP_NULL,
-      section: 'sec-size',
-    });
-  });
-
-  it('Returns an error message when the order size has more decimals than allowed', () => {
-    const { result } = setup({
-      fieldErrors: {
-        size: { type: `validate`, message: DealTicket.ERROR_SIZE_DECIMAL },
-      },
-    });
-    expect(result.current).toStrictEqual({
-      isDisabled: true,
-      message: ERROR.FIELD_PRICE_STEP_DECIMAL,
-      section: 'sec-size',
-    });
-  });
-
-  it('Returns an error message when the estimated margin is higher than collateral', async () => {
-    const invalidatedMockValue = {
-      balance: '100',
-      margin: '200',
-      balanceError: true,
-    };
-
-    jest
-      .spyOn(DealTicket, 'useOrderMarginValidation')
-      .mockReturnValue(invalidatedMockValue);
-
-    const { result } = setup({});
-
-    expect(result.current.isDisabled).toBe(false);
-
-    const testElement = (
-      <DealTicket.MarginWarning
-        margin={invalidatedMockValue.margin}
-        balance={invalidatedMockValue.balance}
-        asset={asset}
-      />
-    );
-    expect((result.current.message as React.ReactElement)?.props).toEqual(
-      testElement.props
-    );
-    expect((result.current.message as React.ReactElement)?.type).toEqual(
-      testElement.type
-    );
-  });
-
-  it.each`
-    state
-    ${Schema.MarketState.STATE_PENDING}
-    ${Schema.MarketState.STATE_PROPOSED}
-  `(
-    'Returns error when market state is pending and size is wrong',
-    ({ state }) => {
-      const { result } = setup({
-        fieldErrors: {
-          size: { type: `validate`, message: DealTicket.ERROR_SIZE_DECIMAL },
-        },
-        market: {
-          ...market,
-          state,
-        },
-      });
-      expect(result.current).toStrictEqual({
-        isDisabled: true,
-        message: ERROR.FIELD_PRICE_STEP_DECIMAL,
-        section: 'sec-size',
-      });
-    }
-  );
-});
@@ -1,384 +0,0 @@
-import type { ReactNode } from 'react';
-import type { FieldErrors } from 'react-hook-form';
-import { useMemo } from 'react';
-import { t, toDecimal } from '@vegaprotocol/react-helpers';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { MarketStateMapping, Schema } from '@vegaprotocol/types';
-import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
-import { Tooltip } from '@vegaprotocol/ui-toolkit';
-import {
-  MarketDataGrid,
-  compileGridData,
-  MarginWarning,
-  isMarketInAuction,
-  ERROR_SIZE_DECIMAL,
-  useOrderMarginValidation,
-} from '@vegaprotocol/deal-ticket';
-import type { MarketDealTicket } from '@vegaprotocol/market-list';
-
-export const DEAL_TICKET_SECTION = {
-  TYPE: 'sec-type',
-  SIZE: 'sec-size',
-  PRICE: 'sec-price',
-  FORCE: 'sec-force',
-  EXPIRY: 'sec-expiry',
-  SUMMARY: 'sec-summary',
-};
-
-export const ERROR_EXPIRATION_IN_THE_PAST = 'ERROR_EXPIRATION_IN_THE_PAST';
-
-export type ValidationProps = {
-  step?: number;
-  market: MarketDealTicket;
-  order: OrderSubmissionBody['orderSubmission'];
-  fieldErrors?: FieldErrors<OrderSubmissionBody['orderSubmission']>;
-};
-
-export const marketTranslations = (marketState: Schema.MarketState) => {
-  switch (marketState) {
-    case Schema.MarketState.STATE_TRADING_TERMINATED:
-      return t('terminated');
-    default:
-      return t(MarketStateMapping[marketState]).toLowerCase();
-  }
-};
-
-export type DealTicketSection =
-  | ''
-  | typeof DEAL_TICKET_SECTION[keyof typeof DEAL_TICKET_SECTION];
-
-export const useOrderValidation = ({
-  market,
-  fieldErrors,
-  order,
-}: ValidationProps): {
-  message: ReactNode | string;
-  isDisabled: boolean;
-  section: DealTicketSection;
-} => {
-  const { pubKey } = useVegaWallet();
-  const minSize = toDecimal(market.positionDecimalPlaces);
-  const isInvalidOrderMargin = useOrderMarginValidation({ market, order });
-
-  const fieldErrorChecking = useMemo<{
-    message: ReactNode | string;
-    isDisabled: boolean;
-    section: DealTicketSection;
-  } | null>(() => {
-    if (fieldErrors?.size?.type || fieldErrors?.price?.type) {
-      if (fieldErrors?.size?.type === 'required') {
-        return {
-          isDisabled: true,
-          message: t('You need to provide a size'),
-          section: DEAL_TICKET_SECTION.SIZE,
-        };
-      }
-
-      if (fieldErrors?.size?.type === 'min') {
-        return {
-          isDisabled: true,
-          message: t(`Size cannot be lower than "${minSize}"`),
-          section: DEAL_TICKET_SECTION.SIZE,
-        };
-      }
-
-      if (
-        fieldErrors?.price?.type === 'required' &&
-        order.type !== Schema.OrderType.TYPE_MARKET
-      ) {
-        return {
-          isDisabled: true,
-          message: t('You need to provide a price'),
-          section: DEAL_TICKET_SECTION.PRICE,
-        };
-      }
-
-      if (
-        fieldErrors?.price?.type === 'min' &&
-        order.type !== Schema.OrderType.TYPE_MARKET
-      ) {
-        return {
-          isDisabled: true,
-          message: t(`The price cannot be negative`),
-          section: DEAL_TICKET_SECTION.PRICE,
-        };
-      }
-
-      if (
-        fieldErrors?.size?.type === 'validate' &&
-        fieldErrors?.size?.message === ERROR_SIZE_DECIMAL
-      ) {
-        if (market.positionDecimalPlaces === 0) {
-          return {
-            isDisabled: true,
-            message: t('Order sizes must be in whole numbers for this market'),
-            section: DEAL_TICKET_SECTION.SIZE,
-          };
-        }
-        return {
-          isDisabled: true,
-          message: t(
-            `The size field accepts up to ${market.positionDecimalPlaces} decimal places`
-          ),
-          section: DEAL_TICKET_SECTION.SIZE,
-        };
-      }
-    }
-
-    if (
-      fieldErrors?.expiresAt?.type === 'validate' &&
-      fieldErrors?.expiresAt.message === ERROR_EXPIRATION_IN_THE_PAST
-    ) {
-      return {
-        isDisabled: false,
-        message: t(
-          'The expiry date that you have entered appears to be in the past'
-        ),
-        section: DEAL_TICKET_SECTION.EXPIRY,
-      };
-    }
-    return null;
-  }, [
-    fieldErrors?.size?.type,
-    fieldErrors?.size?.message,
-    fieldErrors?.price?.type,
-    fieldErrors?.expiresAt?.type,
-    fieldErrors?.expiresAt?.message,
-    order.type,
-    minSize,
-    market.positionDecimalPlaces,
-  ]);
-
-  const { message, isDisabled, section } = useMemo<{
-    message: ReactNode | string;
-    isDisabled: boolean;
-    section: DealTicketSection;
-  }>(() => {
-    if (!pubKey) {
-      return {
-        message: t('No public key selected'),
-        isDisabled: true,
-        section: DEAL_TICKET_SECTION.SUMMARY,
-      };
-    }
-
-    if (
-      [
-        Schema.MarketState.STATE_SETTLED,
-        Schema.MarketState.STATE_REJECTED,
-        Schema.MarketState.STATE_TRADING_TERMINATED,
-        Schema.MarketState.STATE_CANCELLED,
-        Schema.MarketState.STATE_CLOSED,
-      ].includes(market.state)
-    ) {
-      return {
-        isDisabled: true,
-        message: t(
-          `This market is ${marketTranslations(
-            market.state
-          )} and not accepting orders`
-        ),
-        section: DEAL_TICKET_SECTION.SUMMARY,
-      };
-    }
-
-    if (
-      [
-        Schema.MarketState.STATE_PROPOSED,
-        Schema.MarketState.STATE_PENDING,
-      ].includes(market.state)
-    ) {
-      if (fieldErrorChecking) {
-        return fieldErrorChecking;
-      }
-      return {
-        isDisabled: false,
-        message: t(
-          `This market is ${marketTranslations(
-            market.state
-          )} and only accepting liquidity commitment orders`
-        ),
-        section: DEAL_TICKET_SECTION.SUMMARY,
-      };
-    }
-
-    if (isMarketInAuction(market)) {
-      if (order.type === Schema.OrderType.TYPE_MARKET) {
-        if (
-          market.tradingMode ===
-            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger ===
-            Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
-        ) {
-          return {
-            isDisabled: true,
-            message: (
-              <span>
-                {t('This market is in auction until it reaches')}{' '}
-                <Tooltip
-                  description={
-                    <MarketDataGrid grid={compileGridData(market)} />
-                  }
-                >
-                  <span>{t('sufficient liquidity')}</span>
-                </Tooltip>
-                {'. '}
-                {t('Only limit orders are permitted when market is in auction')}
-              </span>
-            ),
-            section: DEAL_TICKET_SECTION.TYPE,
-          };
-        }
-        if (
-          market.tradingMode ===
-            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger === Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE
-        ) {
-          return {
-            isDisabled: true,
-            message: (
-              <span>
-                {t('This market is in auction due to')}{' '}
-                <Tooltip
-                  description={
-                    <MarketDataGrid grid={compileGridData(market)} />
-                  }
-                >
-                  <span>{t('high price volatility')}</span>
-                </Tooltip>
-                {'. '}
-                {t('Only limit orders are permitted when market is in auction')}
-              </span>
-            ),
-            section: DEAL_TICKET_SECTION.TYPE,
-          };
-        }
-        return {
-          isDisabled: true,
-          message: t(
-            'Only limit orders are permitted when market is in auction'
-          ),
-          section: DEAL_TICKET_SECTION.SUMMARY,
-        };
-      }
-      if (
-        order.type === Schema.OrderType.TYPE_LIMIT &&
-        [
-          Schema.OrderTimeInForce.TIME_IN_FORCE_FOK,
-          Schema.OrderTimeInForce.TIME_IN_FORCE_IOC,
-          Schema.OrderTimeInForce.TIME_IN_FORCE_GFN,
-        ].includes(order.timeInForce)
-      ) {
-        if (
-          market.tradingMode ===
-            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger ===
-            Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
-        ) {
-          return {
-            isDisabled: true,
-            message: (
-              <span>
-                {t('This market is in auction until it reaches')}{' '}
-                <Tooltip
-                  description={
-                    <MarketDataGrid grid={compileGridData(market)} />
-                  }
-                >
-                  <span>{t('sufficient liquidity')}</span>
-                </Tooltip>
-                {'. '}
-                {t(
-                  `Until the auction ends, you can only place GFA, GTT, or GTC limit orders`
-                )}
-              </span>
-            ),
-            section: DEAL_TICKET_SECTION.FORCE,
-          };
-        }
-        if (
-          market.tradingMode ===
-            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger === Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE
-        ) {
-          return {
-            isDisabled: true,
-            message: (
-              <span>
-                {t('This market is in auction due to')}{' '}
-                <Tooltip
-                  description={
-                    <MarketDataGrid grid={compileGridData(market)} />
-                  }
-                >
-                  <span>{t('high price volatility')}</span>
-                </Tooltip>
-                {'. '}
-                {t(
-                  `Until the auction ends, you can only place GFA, GTT, or GTC limit orders`
-                )}
-              </span>
-            ),
-            section: DEAL_TICKET_SECTION.FORCE,
-          };
-        }
-        return {
-          isDisabled: true,
-          message: t(
-            `Until the auction ends, you can only place GFA, GTT, or GTC limit orders`
-          ),
-          section: DEAL_TICKET_SECTION.FORCE,
-        };
-      }
-    }
-
-    if (fieldErrorChecking) {
-      return fieldErrorChecking;
-    }
-
-    if (isInvalidOrderMargin.balanceError) {
-      return {
-        isDisabled: false,
-        message: (
-          <MarginWarning
-            margin={isInvalidOrderMargin.margin}
-            balance={isInvalidOrderMargin.balance}
-            asset={market.tradableInstrument.instrument.product.settlementAsset}
-          />
-        ),
-        section: DEAL_TICKET_SECTION.PRICE,
-      };
-    }
-
-    if (
-      [
-        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
-        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
-        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-      ].includes(market.tradingMode)
-    ) {
-      return {
-        isDisabled: false,
-        message: t(
-          'Any orders placed now will not trade until the auction ends'
-        ),
-        section: DEAL_TICKET_SECTION.SUMMARY,
-      };
-    }
-
-    return {
-      isDisabled: false,
-      message: '',
-      section: '',
-    };
-  }, [
-    pubKey,
-    market,
-    fieldErrorChecking,
-    isInvalidOrderMargin,
-    order.type,
-    order.timeInForce,
-  ]);
-
-  return { message, isDisabled, section };
-};
@@ -0,0 +1,17 @@
+query DepositAssets {
+  assetsConnection {
+    edges {
+      node {
+        id
+        name
+        symbol
+        decimals
+        source {
+          ... on ERC20 {
+            contractAddress
+          }
+        }
+      }
+    }
+  }
+}
@@ -0,0 +1,75 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { AssetStatus } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL query operation: DepositAssets
+// ====================================================
+
+export interface DepositAssets_assetsConnection_edges_node_source_BuiltinAsset {
+  __typename: "BuiltinAsset";
+}
+
+export interface DepositAssets_assetsConnection_edges_node_source_ERC20 {
+  __typename: "ERC20";
+  /**
+   * The address of the ERC20 contract
+   */
+  contractAddress: string;
+}
+
+export type DepositAssets_assetsConnection_edges_node_source = DepositAssets_assetsConnection_edges_node_source_BuiltinAsset | DepositAssets_assetsConnection_edges_node_source_ERC20;
+
+export interface DepositAssets_assetsConnection_edges_node {
+  __typename: "Asset";
+  /**
+   * The ID of the asset
+   */
+  id: string;
+  /**
+   * The full name of the asset (e.g: Great British Pound)
+   */
+  name: string;
+  /**
+   * The symbol of the asset (e.g: GBP)
+   */
+  symbol: string;
+  /**
+   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
+   */
+  decimals: number;
+  /**
+   * The status of the asset in the Vega network
+   */
+  status: AssetStatus;
+  /**
+   * The origin source of the asset (e.g: an ERC20 asset)
+   */
+  source: DepositAssets_assetsConnection_edges_node_source;
+}
+
+export interface DepositAssets_assetsConnection_edges {
+  __typename: "AssetEdge";
+  /**
+   * The asset information
+   */
+  node: DepositAssets_assetsConnection_edges_node;
+}
+
+export interface DepositAssets_assetsConnection {
+  __typename: "AssetsConnection";
+  /**
+   * The assets
+   */
+  edges: (DepositAssets_assetsConnection_edges | null)[] | null;
+}
+
+export interface DepositAssets {
+  /**
+   * The list of all assets in use in the Vega network or the specified asset if ID is provided
+   */
+  assetsConnection: DepositAssets_assetsConnection | null;
+}
@@ -0,0 +1,57 @@
+import { Schema as Types } from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type DepositAssetsQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type DepositAssetsQuery = { __typename?: 'Query', assetsConnection?: { __typename?: 'AssetsConnection', edges?: Array<{ __typename?: 'AssetEdge', node: { __typename?: 'Asset', id: string, name: string, symbol: string, decimals: number, source: { __typename?: 'BuiltinAsset' } | { __typename?: 'ERC20', contractAddress: string } } } | null> | null } | null };
+
+
+export const DepositAssetsDocument = gql`
+    query DepositAssets {
+  assetsConnection {
+    edges {
+      node {
+        id
+        name
+        symbol
+        decimals
+        source {
+          ... on ERC20 {
+            contractAddress
+          }
+        }
+      }
+    }
+  }
+}
+    `;
+
+/**
+ * __useDepositAssetsQuery__
+ *
+ * To run a query within a React component, call `useDepositAssetsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useDepositAssetsQuery` 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 } = useDepositAssetsQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useDepositAssetsQuery(baseOptions?: Apollo.QueryHookOptions<DepositAssetsQuery, DepositAssetsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<DepositAssetsQuery, DepositAssetsQueryVariables>(DepositAssetsDocument, options);
+      }
+export function useDepositAssetsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<DepositAssetsQuery, DepositAssetsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<DepositAssetsQuery, DepositAssetsQueryVariables>(DepositAssetsDocument, options);
+        }
+export type DepositAssetsQueryHookResult = ReturnType<typeof useDepositAssetsQuery>;
+export type DepositAssetsLazyQueryHookResult = ReturnType<typeof useDepositAssetsLazyQuery>;
+export type DepositAssetsQueryResult = Apollo.QueryResult<DepositAssetsQuery, DepositAssetsQueryVariables>;
@@ -1,18 +1,40 @@
+import { useMemo } from 'react';
+import { DepositManager } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/react-helpers';
-import { Button } from '@vegaprotocol/ui-toolkit';
-import { DepositDialog, useDepositDialog } from '@vegaprotocol/deposits';
+import { enabledAssetsProvider } from '@vegaprotocol/assets';
+import { useDataProvider } from '@vegaprotocol/react-helpers';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { Web3Container } from '@vegaprotocol/web3';

 /**
 *  Fetches data required for the Deposit page
 */
 export const DepositContainer = () => {
-  const openDepositDialog = useDepositDialog((state) => state.open);
+  const { VEGA_ENV } = useEnvironment();
+  const { pubKey } = useVegaWallet();
+  const variables = useMemo(() => ({ partyId: pubKey }), [pubKey]);
+  const { data, loading, error } = useDataProvider({
+    dataProvider: enabledAssetsProvider,
+    variables,
+    skip: !pubKey,
+  });
+
  return (
-    <div>
-      <DepositDialog />
-      <Button size="sm" onClick={() => openDepositDialog()}>
-        {t('Make deposit')}
-      </Button>
-    </div>
+    <AsyncRenderer data={data} loading={loading} error={error}>
+      {data && data.length ? (
+        <Web3Container>
+          <DepositManager
+            assets={data}
+            isFaucetable={VEGA_ENV !== Networks.MAINNET}
+          />
+        </Web3Container>
+      ) : (
+        <Splash>
+          <p>{t('No assets on this network')}</p>
+        </Splash>
+      )}
+    </AsyncRenderer>
  );
 };
@@ -16,7 +16,7 @@ import { useAccountColumnDefinitions } from '.';

 const AccountsManager = () => {
  const { partyId = '' } = useOutletContext<{ partyId: string }>();
-  const { isOpen, id, setOpen } = useAssetDetailsDialogStore();
+  const { isOpen, symbol, setOpen } = useAssetDetailsDialogStore();
  const gridRef = useRef<AgGridReact | null>(null);
  const dataRef = useRef<AccountFields[] | null>(null);
  const variables = useMemo(() => ({ partyId }), [partyId]);
@@ -33,6 +33,9 @@ const AccountsManager = () => {
    update,
    variables,
  });
+  if (!dataRef.current && data) {
+    dataRef.current = data;
+  }
  const getRows = async ({
    successCallback,
    startRow,
@@ -45,13 +48,12 @@ const AccountsManager = () => {
    successCallback(rowsThisBlock, lastRow);
  };
  const { columnDefs, defaultColDef } = useAccountColumnDefinitions();
-  console.log(data, loading);
  return (
    <>
      <AsyncRenderer
        loading={loading}
        error={error}
-        data={data?.length ? data : null}
+        data={data}
        noDataMessage={NO_DATA_MESSAGE}
      >
        <ConsoleLiteGrid<AccountFields>
@@ -66,7 +68,7 @@ const AccountsManager = () => {
        />
      </AsyncRenderer>
      <AssetDetailsDialog
-        assetId={id}
+        assetSymbol={symbol}
        open={isOpen}
        onChange={(open) => setOpen(open)}
      />
@@ -15,14 +15,14 @@ const useAccountColumnDefinitions = () => {
        field: 'asset.symbol',
        headerClass: 'uppercase justify-start',
        cellClass: 'uppercase flex h-full items-center md:pl-4',
-        cellRenderer: ({ value, data }: GroupCellRendererParams) =>
+        cellRenderer: ({ value }: GroupCellRendererParams) =>
          value && value.length > 0 ? (
            <div className="md:pl-4 grid h-full items-center" title={value}>
              <div className="truncate min-w-0">
                <button
                  className="hover:underline"
                  onClick={() => {
-                    open(data.asset.id);
+                    open(value);
                  }}
                >
                  {value}
@@ -0,0 +1,58 @@
+import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import { useRef } from 'react';
+import type { AgGridReact } from 'ag-grid-react';
+import type { Position } from '@vegaprotocol/positions';
+import { PriceFlashCell, t } from '@vegaprotocol/react-helpers';
+import { AssetBalance } from '@vegaprotocol/accounts';
+import { usePositionsData } from '@vegaprotocol/positions';
+import { ConsoleLiteGrid } from '../../console-lite-grid';
+import useColumnDefinitions from './use-column-definitions';
+
+interface Props {
+  partyId: string;
+  assetSymbol: string;
+}
+
+const getRowId = ({ data }: { data: Position }) => data.marketId;
+
+const PositionsAsset = ({ partyId, assetSymbol }: Props) => {
+  const gridRef = useRef<AgGridReact | null>(null);
+  const { data, error, loading, getRows } = usePositionsData(
+    partyId,
+    gridRef,
+    assetSymbol
+  );
+  const { columnDefs, defaultColDef } = useColumnDefinitions();
+  return (
+    <AsyncRenderer loading={loading} error={error} data={data}>
+      <div
+        data-testid={`positions-asset-${assetSymbol}`}
+        className="flex justify-between items-center px-4 pt-3 pb-1"
+      >
+        <h4>
+          {assetSymbol} {t('markets')}
+        </h4>
+        <div className="text-sm text-neutral-500 dark:text-neutral-300">
+          {assetSymbol} {t('balance')}:
+          <span data-testid="balance" className="pl-1 font-mono">
+            <AssetBalance partyId={partyId} assetSymbol={assetSymbol} />
+          </span>
+        </div>
+      </div>
+      <ConsoleLiteGrid<Position & { id: undefined }>
+        ref={gridRef}
+        domLayout="autoHeight"
+        classNamesParam="h-auto"
+        columnDefs={columnDefs}
+        defaultColDef={defaultColDef}
+        getRowId={getRowId}
+        rowModelType={data?.length ? 'infinite' : 'clientSide'}
+        rowData={data?.length ? undefined : []}
+        datasource={{ getRows }}
+        components={{ PriceFlashCell }}
+      />
+    </AsyncRenderer>
+  );
+};
+
+export default PositionsAsset;
@@ -1,37 +1,26 @@
 import { useOutletContext } from 'react-router-dom';
-import { PriceFlashCell } from '@vegaprotocol/react-helpers';
-import { usePositionsData, getRowId } from '@vegaprotocol/positions';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { ConsoleLiteGrid } from '../../console-lite-grid';
-import { useRef } from 'react';
-import type { AgGridReact } from 'ag-grid-react';
-import type { Position } from '@vegaprotocol/positions';
-import { NO_DATA_MESSAGE } from '../../../constants';
-
-import useColumnDefinitions from './use-column-definitions';
+import { t } from '@vegaprotocol/react-helpers';
+import { usePositionsAssets } from '@vegaprotocol/positions';
+import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
+import PositionsAsset from './positions-asset';

 const Positions = () => {
-  const gridRef = useRef<AgGridReact | null>(null);
  const { partyId } = useOutletContext<{ partyId: string }>();
-  const { data, error, loading } = usePositionsData(partyId, gridRef);
-  const { columnDefs, defaultColDef } = useColumnDefinitions();
+  const { data, error, loading, assetSymbols } = usePositionsAssets(partyId);
  return (
-    <AsyncRenderer
-      loading={loading}
-      error={error}
-      data={data?.length ? data : null}
-      noDataMessage={NO_DATA_MESSAGE}
-    >
-      <ConsoleLiteGrid<Position>
-        ref={gridRef}
-        domLayout="autoHeight"
-        classNamesParam="h-auto"
-        columnDefs={columnDefs}
-        defaultColDef={defaultColDef}
-        getRowId={getRowId}
-        rowData={data || undefined}
-        components={{ PriceFlashCell }}
-      />
+    <AsyncRenderer loading={loading} error={error} data={data}>
+      {assetSymbols && assetSymbols.length > 0 && (
+        <div className="w-full, h-max">
+          {assetSymbols?.map((assetSymbol) => (
+            <PositionsAsset
+              key={assetSymbol}
+              partyId={partyId}
+              assetSymbol={assetSymbol}
+            />
+          ))}
+        </div>
+      )}
+      {assetSymbols?.length === 0 && <Splash>{t('No data to display')}</Splash>}
    </AsyncRenderer>
  );
 };
@@ -16,7 +16,7 @@ import type {
  GroupCellRendererParams,
  ColDef,
 } from 'ag-grid-community';
-import { Schema } from '@vegaprotocol/types';
+import { MarketTradingMode } from '@vegaprotocol/types';
 import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
 import { Intent, ProgressBarCell } from '@vegaprotocol/ui-toolkit';

@@ -109,7 +109,7 @@ const useColumnDefinitions = () => {
            value &&
            node?.rowPinned &&
            data.marketTradingMode ===
-              Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+              MarketTradingMode.TRADING_MODE_OPENING_AUCTION
          ) {
            return addDecimalsFormatNumber(
              value.toString(),
@@ -1,24 +1,21 @@
 import { t } from '@vegaprotocol/react-helpers';
 import { themelite as theme } from '@vegaprotocol/tailwindcss-config';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 import colors from 'tailwindcss/colors';
 import type { Market } from '@vegaprotocol/market-list';
 import { IS_MARKET_TRADABLE } from '../../constants';

 export const STATES_FILTER = [
  { value: 'all', text: t('All') },
-  { value: Schema.MarketState.STATE_ACTIVE, text: t('Active') },
-  { value: Schema.MarketState.STATE_CANCELLED, text: t('Cancelled') },
-  { value: Schema.MarketState.STATE_CLOSED, text: t('Closed') },
-  { value: Schema.MarketState.STATE_PENDING, text: t('Pending') },
-  { value: Schema.MarketState.STATE_PROPOSED, text: t('Proposed') },
-  { value: Schema.MarketState.STATE_REJECTED, text: t('Rejected') },
-  { value: Schema.MarketState.STATE_SETTLED, text: t('Settled') },
-  { value: Schema.MarketState.STATE_SUSPENDED, text: t('Suspended') },
-  {
-    value: Schema.MarketState.STATE_TRADING_TERMINATED,
-    text: t('TradingTerminated'),
-  },
+  { value: MarketState.STATE_ACTIVE, text: t('Active') },
+  { value: MarketState.STATE_CANCELLED, text: t('Cancelled') },
+  { value: MarketState.STATE_CLOSED, text: t('Closed') },
+  { value: MarketState.STATE_PENDING, text: t('Pending') },
+  { value: MarketState.STATE_PROPOSED, text: t('Proposed') },
+  { value: MarketState.STATE_REJECTED, text: t('Rejected') },
+  { value: MarketState.STATE_SETTLED, text: t('Settled') },
+  { value: MarketState.STATE_SUSPENDED, text: t('Suspended') },
+  { value: MarketState.STATE_TRADING_TERMINATED, text: t('TradingTerminated') },
 ];

 export const agGridLightVariables = `
@@ -9,7 +9,7 @@ import {
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
 import { BrowserRouter } from 'react-router-dom';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 import type { Market } from '@vegaprotocol/market-list';
 import SimpleMarketList from './simple-market-list';

@@ -26,7 +26,7 @@ jest.mock('./simple-market-percent-change', () => jest.fn());
 let marketsMock = [
  {
    id: 'MARKET_A',
-    state: Schema.MarketState.STATE_ACTIVE,
+    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
        product: {
@@ -42,7 +42,7 @@ let marketsMock = [
  },
  {
    id: 'MARKET_B',
-    state: Schema.MarketState.STATE_ACTIVE,
+    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
        product: {
@@ -121,7 +121,7 @@ describe('SimpleMarketList', () => {
      expect(mockIsTradable).toHaveBeenCalledWith(
        expect.objectContaining({
          id: marketsMock[0].id,
-          state: Schema.MarketState.STATE_ACTIVE,
+          state: MarketState.STATE_ACTIVE,
        })
      );
      expect(mockedNavigate).toHaveBeenCalledWith(
@@ -7,13 +7,14 @@ import {
  useYesterday,
 } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import type { MarketState } from '@vegaprotocol/types';
 import useMarketsFilterData from './use-markets-filter-data';
 import useColumnDefinitions from './use-column-definitions';
 import SimpleMarketToolbar from './simple-market-toolbar';
 import { IS_MARKET_TRADABLE } from '../../constants';
 import { ConsoleLiteGrid } from '../console-lite-grid';
 import type { Market } from '@vegaprotocol/market-list';
-import { Schema } from '@vegaprotocol/types';
+import { Interval } from '@vegaprotocol/types';
 import { marketsWithCandlesProvider } from '@vegaprotocol/market-list';

 export type MarketWithPercentChange = Market & {
@@ -30,20 +31,20 @@ const SimpleMarketList = () => {
  const { isMobile } = useScreenDimensions();
  const navigate = useNavigate();
  const params = useParams<RouterParams>();
-  const statusesRef = useRef<Record<string, Schema.MarketState | ''>>({});
+  const statusesRef = useRef<Record<string, MarketState | ''>>({});
  const gridRef = useRef<AgGridReact | null>(null);

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

@@ -52,7 +53,7 @@ const SimpleMarketList = () => {
  }, [gridRef]);

  useEffect(() => {
-    const statuses: Record<string, Schema.MarketState | ''> = {};
+    const statuses: Record<string, MarketState | ''> = {};
    data?.forEach((market) => {
      statuses[market.id] = market.state || '';
    });
@@ -4,7 +4,7 @@ import { InView } from 'react-intersection-observer';
 import { useDataProvider, useYesterday } from '@vegaprotocol/react-helpers';
 import type { Candle } from '@vegaprotocol/market-list';
 import { marketCandlesProvider } from '@vegaprotocol/market-list';
-import { Schema } from '@vegaprotocol/types';
+import { Interval } from '@vegaprotocol/types';

 interface Props {
  candles: (Candle | null)[] | null;
@@ -73,7 +73,7 @@ const SimpleMarketPercentChange = ({ candles, marketId, setValue }: Props) => {
    dataProvider: marketCandlesProvider,
    variables: {
      marketId,
-      interval: Schema.Interval.INTERVAL_I1D,
+      interval: Interval.INTERVAL_I1D,
      since: new Date(yesterday).toISOString(),
    },
  });
@@ -1,13 +1,13 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 import MarketNameRenderer from './simple-market-renderer';
 import type { Market } from '@vegaprotocol/market-list';

 describe('SimpleMarketRenderer', () => {
  const market = {
    id: 'MARKET_A',
-    state: Schema.MarketState.STATE_ACTIVE,
+    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
        code: 'MARKET_A_CODE',
@@ -14,7 +14,7 @@ import {
  getAllByText,
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 import type { Market } from '@vegaprotocol/market-list';
 import SimpleMarketToolbar from './simple-market-toolbar';
 import { markets as filterData } from './mocks/market-filters.json';
@@ -113,7 +113,7 @@ describe('SimpleMarketToolbar', () => {

    await waitFor(() => {
      expect(screen.getByTestId('location-display')).toHaveTextContent(
-        `/markets/${Schema.MarketState.STATE_ACTIVE}/Future`
+        `/markets/${MarketState.STATE_ACTIVE}/Future`
      );
    });

@@ -124,7 +124,7 @@ describe('SimpleMarketToolbar', () => {
    );
    await waitFor(() => {
      expect(screen.getByTestId('location-display')).toHaveTextContent(
-        `/markets/${Schema.MarketState.STATE_ACTIVE}/Future/tEURO`
+        `/markets/${MarketState.STATE_ACTIVE}/Future/tEURO`
      );
    });

@@ -139,7 +139,7 @@ describe('SimpleMarketToolbar', () => {
    });
    await waitFor(() => {
      expect(mockedNavigate).toHaveBeenCalledWith(
-        `/markets/${Schema.MarketState.STATE_PENDING}/Future/tEURO`
+        `/markets/${MarketState.STATE_PENDING}/Future/tEURO`
      );
    });
  });
@@ -165,7 +165,7 @@ describe('SimpleMarketToolbar', () => {
    fireEvent.click(suspended);

    expect(mockedNavigate).toHaveBeenCalledWith(
-      `/markets/${Schema.MarketState.STATE_SUSPENDED}/product1/asset1`
+      `/markets/${MarketState.STATE_SUSPENDED}/product1/asset1`
    );
  });

@@ -186,7 +186,7 @@ describe('SimpleMarketToolbar', () => {
    fireEvent.click(closed);

    expect(mockedNavigate).toHaveBeenCalledWith(
-      `/markets/${Schema.MarketState.STATE_CLOSED}`
+      `/markets/${MarketState.STATE_CLOSED}`
    );
  });

@@ -13,7 +13,7 @@ import {
  DropdownMenuItemIndicator,
  Icon,
 } from '@vegaprotocol/ui-toolkit';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 import type { Market } from '@vegaprotocol/market-list';
 import { HorizontalMenu } from '../horizontal-menu';
 import type { HorizontalMenuItem } from '../horizontal-menu';
@@ -36,7 +36,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
        params.asset && params.asset !== 'all' ? `/${params.asset}` : '';
      const product = params.product ? `/${params.product}` : '';
      const state =
-        activeState !== Schema.MarketState.STATE_ACTIVE || product
+        activeState !== MarketState.STATE_ACTIVE || product
          ? `/${activeState}`
          : '';
      navigate(`/markets${state}${product}${asset}`);
@@ -45,8 +45,8 @@ const SimpleMarketToolbar = ({ data }: Props) => {
  );

  const productItems = useMemo(() => {
-    const currentState = params.state || Schema.MarketState.STATE_ACTIVE;
-    const noStateSkip = currentState !== Schema.MarketState.STATE_ACTIVE;
+    const currentState = params.state || MarketState.STATE_ACTIVE;
+    const noStateSkip = currentState !== MarketState.STATE_ACTIVE;
    const items: HorizontalMenuItem[] = [
      {
        ...constants.ALL_PRODUCTS_ITEM,
@@ -83,8 +83,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
                {constants.STATES_FILTER.find(
                  (state) =>
                    state.value === params.state ||
-                    (!params.state &&
-                      state.value === Schema.MarketState.STATE_ACTIVE)
+                    (!params.state && state.value === MarketState.STATE_ACTIVE)
                )?.text || params.state}
                <Icon
                  name={IconNames.ARROW_DOWN}
@@ -104,7 +103,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
                  key={value}
                  checked={
                    value === params.state ||
-                    (!params.state && value === Schema.MarketState.STATE_ACTIVE)
+                    (!params.state && value === MarketState.STATE_ACTIVE)
                  }
                  onCheckedChange={() => onStateChange(value)}
                >
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 import type { MarketWithCandles } from '@vegaprotocol/market-list';
 import type { RouterParams } from './simple-market-list';

@@ -30,7 +30,7 @@ const useMarketsFilterData = (
            ? ''
            : params.state
            ? params.state
-            : Schema.MarketState.STATE_ACTIVE;
+            : MarketState.STATE_ACTIVE;
        if (state && state !== item.state) {
          return false;
        }
@@ -1,26 +1,26 @@
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/react-helpers';
 import type { Market } from '@vegaprotocol/market-list';

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

 export const TRADABLE_STATES = {
-  [Schema.MarketState.STATE_ACTIVE]: true,
+  [MarketState.STATE_ACTIVE]: true,
 };

 export const IS_MARKET_TRADABLE = (market: Market) =>
  Boolean((market.state ?? '') in TRADABLE_STATES && market?.id);

-export const MARKET_STATES_MAP: Record<Schema.MarketState | '', string> = {
-  [Schema.MarketState.STATE_ACTIVE]: t('Active'),
-  [Schema.MarketState.STATE_CANCELLED]: t('Cancelled'),
-  [Schema.MarketState.STATE_CLOSED]: t('Closed'),
-  [Schema.MarketState.STATE_PENDING]: t('Pending'),
-  [Schema.MarketState.STATE_PROPOSED]: t('Proposed'),
-  [Schema.MarketState.STATE_REJECTED]: t('Rejected'),
-  [Schema.MarketState.STATE_SETTLED]: t('Settled'),
-  [Schema.MarketState.STATE_SUSPENDED]: t('Suspended'),
-  [Schema.MarketState.STATE_TRADING_TERMINATED]: t('TradingTerminated'),
+export const MARKET_STATES_MAP: Record<MarketState | '', string> = {
+  [MarketState.STATE_ACTIVE]: t('Active'),
+  [MarketState.STATE_CANCELLED]: t('Cancelled'),
+  [MarketState.STATE_CLOSED]: t('Closed'),
+  [MarketState.STATE_PENDING]: t('Pending'),
+  [MarketState.STATE_PROPOSED]: t('Proposed'),
+  [MarketState.STATE_REJECTED]: t('Rejected'),
+  [MarketState.STATE_SETTLED]: t('Settled'),
+  [MarketState.STATE_SUSPENDED]: t('Suspended'),
+  [MarketState.STATE_TRADING_TERMINATED]: t('TradingTerminated'),
  '': t('Unknown'),
 };

@@ -0,0 +1,88 @@
+import {
+  ApolloClient,
+  from,
+  HttpLink,
+  InMemoryCache,
+  split,
+} from '@apollo/client';
+import { onError } from '@apollo/client/link/error';
+import { RetryLink } from '@apollo/client/link/retry';
+import { GraphQLWsLink } from '@apollo/client/link/subscriptions';
+import { createClient as createWSClient } from 'graphql-ws';
+import { getMainDefinition } from '@apollo/client/utilities';
+
+export function createClient(base?: string) {
+  if (!base) {
+    throw new Error('Base must be passed into createClient!');
+  }
+  const urlHTTP = new URL(base);
+  const urlWS = new URL(base);
+  // Replace http with ws, preserving if its a secure connection eg. https => wss
+  urlWS.protocol = urlWS.protocol.replace('http', 'ws');
+
+  const cache = new InMemoryCache({
+    typePolicies: {
+      Market: {
+        merge: true,
+      },
+      Party: {
+        merge: true,
+      },
+      Query: {},
+      Account: {
+        keyFields: false,
+        fields: {
+          balanceFormatted: {},
+        },
+      },
+      Node: {
+        keyFields: false,
+      },
+      Instrument: {
+        keyFields: false,
+      },
+    },
+  });
+
+  const retryLink = new RetryLink({
+    delay: {
+      initial: 300,
+      max: 10000,
+      jitter: true,
+    },
+  });
+
+  const httpLink = new HttpLink({
+    uri: urlHTTP.href,
+    credentials: 'same-origin',
+  });
+
+  const wsLink = new GraphQLWsLink(
+    createWSClient({
+      url: urlWS.href,
+    })
+  );
+
+  const splitLink = split(
+    ({ query }) => {
+      const definition = getMainDefinition(query);
+      return (
+        definition.kind === 'OperationDefinition' &&
+        definition.operation === 'subscription'
+      );
+    },
+    wsLink,
+    httpLink
+  );
+
+  const errorLink = onError(({ graphQLErrors, networkError }) => {
+    console.log(graphQLErrors);
+    console.log(networkError);
+  });
+
+  return new ApolloClient({
+    connectToDevTools: process.env['NODE_ENV'] === 'development',
+    link: from([errorLink, retryLink, splitLink]),
+    cache,
+  });
+}
@@ -1,9 +1,7 @@
-import { RestConnector, JsonRpcConnector } from '@vegaprotocol/wallet';
+import { RestConnector } from '@vegaprotocol/wallet';

 export const rest = new RestConnector();
-export const jsonRpc = new JsonRpcConnector();

 export const Connectors = {
  rest,
-  jsonRpc,
 };
@@ -12,6 +12,7 @@
    "noImplicitReturns": true,
    "noFallthroughCasesInSwitch": true
  },
+  "files": [],
  "include": [],
  "references": [
    {
@@ -0,0 +1,3 @@
+{
+    "stepDefinitions": "src/support/step_definitions"
+}
@@ -1,8 +1,8 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
-NX_VEGA_URL=https://api.stagnet3.vega.xyz/graphql
+NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
+NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3

 # App flags
@@ -87,7 +87,7 @@ context('Asset page', { tags: '@regression' }, function () {
      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
      const themeSwitcher = '[data-testid="theme-switcher"]';
@@ -18,21 +18,22 @@ context('Home Page', function () {
      const statTitles = {
        0: 'Status',
        1: 'Height',
-        2: 'Uptime',
-        3: 'Total nodes',
-        4: 'Inactive nodes',
-        5: 'Total staked',
-        6: 'Backlog',
-        7: 'Trades / second',
-        8: 'Orders / block',
-        9: 'Orders / second',
-        10: 'Transactions / block',
-        11: 'Block time',
-        12: 'Time',
-        13: 'App',
-        14: 'Tendermint',
-        15: 'Up since',
-        16: 'Chain ID',
+        2: 'Validating nodes',
+        3: 'Uptime',
+        4: 'Total nodes',
+        5: 'Inactive nodes',
+        6: 'Total staked',
+        7: 'Backlog',
+        8: 'Trades / second',
+        9: 'Orders / block',
+        10: 'Orders / second',
+        11: 'Transactions / block',
+        12: 'Block time',
+        13: 'Time',
+        14: 'App',
+        15: 'Tendermint',
+        16: 'Up since',
+        17: 'Chain ID',
      };

      cy.get('[data-testid="stats-title"]')
@@ -40,40 +41,41 @@ context('Home Page', function () {
          cy.wrap($list).should('have.text', statTitles[index]);
        })
        .then(($list) => {
-          cy.wrap($list).should('have.length', 17);
+          cy.wrap($list).should('have.length', 18);
        });

      cy.get(statsValue).eq(0).should('have.text', 'CONNECTED');
      cy.get(statsValue).eq(1).should('not.be.empty');
+      cy.get(statsValue).eq(2).should('have.text', '2');
      cy.get(statsValue)
-        .eq(2)
+        .eq(3)
        .invoke('text')
        .should('match', /\d+d \d+h \d+m \d+s/i);
-      cy.get(statsValue).eq(3).should('have.text', '2');
-      cy.get(statsValue).eq(4).should('have.text', '0');
+      cy.get(statsValue).eq(4).should('have.text', '2');
+      cy.get(statsValue).eq(5).should('have.text', '0');
      cy.get(statsValue)
-        .eq(5)
+        .eq(6)
        .invoke('text')
        .should('match', /\d+\.\d\d(?!\d)/i);
-      cy.get(statsValue).eq(6).should('have.text', '0');
      cy.get(statsValue).eq(7).should('have.text', '0');
      cy.get(statsValue).eq(8).should('have.text', '0');
      cy.get(statsValue).eq(9).should('have.text', '0');
-      cy.get(statsValue).eq(10).should('not.be.empty');
+      cy.get(statsValue).eq(10).should('have.text', '0');
      cy.get(statsValue).eq(11).should('not.be.empty');
      cy.get(statsValue).eq(12).should('not.be.empty');
+      cy.get(statsValue).eq(13).should('not.be.empty');
      if (Cypress.env('NIGHTLY_RUN') != true) {
        cy.get(statsValue)
-          .eq(13)
+          .eq(14)
          .invoke('text')
          .should('match', /v\d+\.\d+\.\d+/i);
      }
      cy.get(statsValue)
-        .eq(14)
+        .eq(15)
        .invoke('text')
        .should('match', /\d+\.\d+\.\d+/i);
-      cy.get(statsValue).eq(15).should('not.be.empty');
      cy.get(statsValue).eq(16).should('not.be.empty');
+      cy.get(statsValue).eq(17).should('not.be.empty');
    });

    it('Block height should be updating', function () {
@@ -148,7 +148,7 @@ context('Network parameters page', { tags: '@smoke' }, function () {
          const parameterName = network_parameter[0];
          const parameterValue = network_parameter[1];
          if (this.networkParameterFormat.fiveDecimal.includes(parameterName)) {
-            cy.convert_number_to_max_four_decimal(parameterValue)
+            cy.convert_number_to_four_decimal(parameterValue)
              .add_commas_to_number_if_large_enough()
              .then((parameterValueFormatted) => {
                cy.get(tableRows)
@@ -179,7 +179,7 @@ context('Network parameters page', { tags: '@smoke' }, function () {
          if (
            this.networkParameterFormat.eighteenDecimal.includes(parameterName)
          ) {
-            cy.convert_number_to_max_eighteen_decimal(parameterValue)
+            cy.convert_number_to_eighteen_decimal(parameterValue)
              .add_commas_to_number_if_large_enough()
              .then((parameterValueFormatted) => {
                cy.get(tableRows)
@@ -205,14 +205,14 @@ context('Network parameters page', { tags: '@smoke' }, function () {
      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
      const themeSwitcher = '[data-testid="theme-switcher"]';
      const jsonFields = '.hljs';
      const sideMenuBackground = '.absolute';

-      // Engage dark mode if not already set
+      // Engage dark mode if not allready set
      cy.get(sideMenuBackground)
        .should('have.css', 'background-color')
        .then((background_color) => {
@@ -16,6 +16,7 @@ const assetsInTest = Object.keys(assetData);

 context('Parties page', { tags: '@regression' }, function () {
  before('send-faucet assets to connected vega wallet', function () {
+    cy.vega_wallet_import();
    assetsInTest.forEach((asset) => {
      cy.vega_wallet_receive_fauceted_asset(
        assetData[asset].name,
@@ -49,9 +50,9 @@ context('Parties page', { tags: '@regression' }, function () {
    });

    it('should see party address id - having searched', function () {
-      cy.getByTestId('parties-header')
+      cy.contains('Address')
        .siblings()
-        .contains(vegaWalletPublicKey.substring(0, 14))
+        .contains(vegaWalletPublicKey)
        .should('be.visible');
    });

@@ -75,42 +76,28 @@ context('Parties page', { tags: '@regression' }, function () {
      });
    });

-    it(
-      'should be able to copy the party address id',
-      { browser: 'chrome' },
-      function () {
-        cy.monitor_clipboard().as('clipboard');
-        cy.getByTestId('parties-header')
-          .next()
-          .within(() => {
-            cy.get('button').click();
-          });
-        cy.get('@clipboard')
-          .get_copied_text_from_clipboard()
-          .should('equal', vegaWalletPublicKey);
-      }
-    );
+    it('should be able to copy the party address id', function () {
+      cy.monitor_clipboard().as('clipboard');
+      cy.contains('Address').siblings().last().click();
+      cy.get('@clipboard')
+        .get_copied_text_from_clipboard()
+        .should('equal', vegaWalletPublicKey);
+    });

-    it(
-      'should be able to copy an asset id',
-      { browser: 'chrome' },
-      function () {
-        cy.monitor_clipboard().as('clipboard');
+    it('should be able to copy an asset id', function () {
+      cy.monitor_clipboard().as('clipboard');

-        cy.contains(assetData.fDAI.name, txTimeout).should('be.visible');
-        cy.contains(assetData.fDAI.name)
-          .parent()
-          .parent()
-          .siblings()
-          .within(() => {
-            cy.get('[data-state="closed"]').last().click({ force: true });
-          });
+      cy.contains(assetData.fDAI.name, txTimeout).should('be.visible');
+      cy.contains(assetData.fDAI.name)
+        .siblings()
+        .within(() => {
+          cy.get('[data-state="closed"]').last().click({ force: true });
+        });

-        cy.get('@clipboard')
-          .get_copied_text_from_clipboard()
-          .should('equal', assetData.fDAI.id);
-      }
-    );
+      cy.get('@clipboard')
+        .get_copied_text_from_clipboard()
+        .should('equal', assetData.fDAI.id);
+    });

    it('should be able to see JSON of each asset containing correct balance and decimals', function () {
      cy.get(partiesJsonSection).should('be.visible');
@@ -160,7 +147,7 @@ context('Parties page', { tags: '@regression' }, function () {
      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
      const themeSwitcher = '[data-testid="theme-switcher"]';
@@ -202,6 +189,15 @@ context('Parties page', { tags: '@regression' }, function () {
        .and('include', darkThemeSideMenuBackgroundColor);
    });

+    after(
+      'teardown environment to prevent test data bleeding into other tests',
+      function () {
+        if (Cypress.env('TEARDOWN_NETWORK_AFTER_FLOWS')) {
+          cy.restart_vegacapsule_network();
+        }
+      }
+    );
+
    Cypress.Commands.add('get_asset_decimals', (assetID) => {
      cy.get_asset_information().then((assetsInfo) => {
        const assetDecimals = assetsInfo[assetData[assetID].name].decimals;
@@ -87,10 +87,7 @@ context('Validator page', { tags: '@smoke' }, function () {
        });
    });

-    // Test disabled 2022/11/15 during the 0.62.1 upgrade. The JSON structure changed, and
-    // this test failed. Rather than fix it, it will be replaced when the validator view displays
-    // something useful rather than just dumping out the JSON.
-    xit('should be able to see relevant node information in vega data section', function () {
+    it('should be able to see relevant node information in vega data section', function () {
      cy.get(vegaDataHeader)
        .contains('Vega data')
        .next()
@@ -100,7 +97,7 @@ context('Validator page', { tags: '@smoke' }, function () {
            .convert_string_json_to_js_object()
            .then((nodesInJson) => {
              this.nodes.forEach((node, index) => {
-                const nodeInJson = nodesInJson.edges[index].node;
+                const nodeInJson = nodesInJson.nodes[index];

                // Vegacapsule shows no info or null for following fields:
                // name, infoURL, avatarUrl, location, epoch data
@@ -219,7 +216,7 @@ context('Validator page', { tags: '@smoke' }, function () {
      const whiteThemeSelectedMenuOptionColor = 'rgb(255, 7, 127)';
      const whiteThemeJsonFieldBackColor = 'rgb(255, 255, 255)';
      const whiteThemeSideMenuBackgroundColor = 'rgb(255, 255, 255)';
-      const darkThemeSelectedMenuOptionColor = 'rgb(215, 251, 80)';
+      const darkThemeSelectedMenuOptionColor = 'rgb(223, 255, 11)';
      const darkThemeJsonFieldBackColor = 'rgb(38, 38, 38)';
      const darkThemeSideMenuBackgroundColor = 'rgb(0, 0, 0)';
      const themeSwitcher = '[data-testid="theme-switcher"]';
@@ -68,19 +68,12 @@ Cypress.Commands.add(
  }
 );

-Cypress.Commands.add('convert_number_to_max_eighteen_decimal', (number) => {
-  // this will take a number like this   : 700000000000000000001
-  // and convert it to a number like this: 700.000000000000000001
-  const value = BigNumber(number / 1000000000000000000).toString();
-  return parseFloat(value).toLocaleString(undefined, {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 18,
-  });
+Cypress.Commands.add('convert_number_to_eighteen_decimal', (number) => {
+  // this will take a number like this   : 700000000000000000000
+  // and convert it to a number like this: 700.000000000000000000
+  return BigNumber((number / 1000000000000000000).toString()).toFixed(18);
 });

-Cypress.Commands.add('convert_number_to_max_four_decimal', (number) => {
-  return parseFloat(number).toLocaleString(undefined, {
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 4,
-  });
+Cypress.Commands.add('convert_number_to_four_decimal', (number) => {
+  return parseFloat(number).toFixed(4);
 });
@@ -1,14 +1,12 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.be.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.stagnet3.vega.xyz/websocket
+NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
+NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_BLOCK_EXPLORER=

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -2,10 +2,10 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
+NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=CUSTOM
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -3,8 +3,8 @@ NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-exp
 NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
+NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=DEVNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=https://be.devnet1.vega.xyz/rest
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -1,10 +1,10 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://be.explorer.vega.xyz/websocket
-NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz
+NX_TENDERMINT_URL=https://mainnet-observer-proxy01.ops.vega.xyz/
+NX_TENDERMINT_WEBSOCKET_URL=wss://mainnet-observer-proxy01.ops.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
+NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=MAINNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://be.explorer.vega.xyz/rest/
-NX_ETHERSCAN_URL=https://etherscan.io
+NX_BLOCK_EXPLORER=
@@ -1,11 +1,11 @@
 # App configuration variables
+NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
 NX_VEGA_ENV=SANDBOX
 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_VEGA_DOCS_URL=https://docs.vega.xyz/docs/testnet
 NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_TENDERMINT_URL=https://tm.n01.sandbox.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.sandbox.vega.xyz/websocket
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -6,8 +6,8 @@ NX_VEGA_ENV=STAGNET1
 NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_TOKEN_URL=https://stagnet1.token.vega.xyz
+NX_VEGA_URL=https://api.n00.stagnet1.vega.xyz/graphql
 NX_VEGA_WALLET_URL=http://localhost:1789
-NX_TENDERMINT_URL=https://tm.be.stagnet1.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.stagnet1.vega.xyz/websocket
+NX_TENDERMINT_URL=https://tm.n01.stagnet1.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n01.stagnet1.vega.xyz/websocket
 NX_BLOCK_EXPLORER=https://be.stagnet1.vega.xyz/rest
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -1,8 +1,10 @@
+# App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.stagnet3.vega.xyz/websocket
+NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
+NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
+NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+NX_BLOCK_EXPLORER=https://blockexplorer.n01.stagnet3.vega.xyz/rest
@@ -1,13 +1,11 @@
 # App configuration variables
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
-NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.testnet.vega.xyz/websocket
+NX_TENDERMINT_URL=https://tm.n07.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n07.testnet.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=TESTNET
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n09.testnet.vega.xyz/graphql
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_NETWORKS={}
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -2,7 +2,7 @@
 NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26607/
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
+NX_VEGA_URL=http://localhost:3003/query
 NX_VEGA_ENV=CUSTOM
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_BLOCK_EXPLORER=
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
@@ -45,21 +45,22 @@ yarn nx run explorer:serve --env={env} # e.g. stagnet3

 There are a few different configuration options offered for this app:

-| **Flag**                         | **Purpose**                                                     |
-| -------------------------------- | --------------------------------------------------------------- | --- |
-| `NX_CHAIN_EXPLORER_URL`          | The URL of the chain explorer service for decoding transactions |
-| `NX_TENDERMINT_URL`              | The Tendermint REST URL for the Vega consesus engine            |
-| `NX_TENDERMINT_WEBSOCKET_URL`    | The Tendermint Websocket URL for the Vega consensus engine      |
-| `NX_VEGA_ENV`                    | The name of the currently connected vega environment            |     |
-| `NX_EXPLORER_ASSETS`             | Enable the assets page for the explorer                         |
-| `NX_EXPLORER_GENESIS`            | Enable the genesis page for the explorer                        |
-| `NX_EXPLORER_GOVERNANCE`         | Enable the governance page for the explorer                     |
-| `NX_EXPLORER_MARKETS`            | Enable the markets page for the explorer                        |
-| `NX_EXPLORER_ORACLES`            | Enable the oracles page for the explorer                        |
-| `NX_EXPLORER_TXS_LIST`           | Enable the transactions list page for the explorer              |
-| `NX_EXPLORER_NETWORK_PARAMETERS` | Enable the network parameters page for the explorer             |
-| `NX_EXPLORER_PARTIES`            | Enable the parties page for the explorer                        |
-| `NX_EXPLORER_VALIDATORS`         | Enable the validators page for the explorer                     |
+| **Flag**                         | **Purpose**                                                                                          |
+| -------------------------------- | ---------------------------------------------------------------------------------------------------- | --- |
+| `NX_CHAIN_EXPLORER_URL`          | The URL of the chain explorer service for decoding transactions                                      |
+| `NX_TENDERMINT_URL`              | The Tendermint REST URL for the Vega consesus engine                                                 |
+| `NX_TENDERMINT_WEBSOCKET_URL`    | The Tendermint Websocket URL for the Vega consensus engine                                           |
+| `NX_VEGA_URL`                    | The GraphQl query endpoint of a [Vega data node](https://github.com/vegaprotocol/networks#data-node) |
+| `NX_VEGA_ENV`                    | The name of the currently connected vega environment                                                 |     |
+| `NX_EXPLORER_ASSETS`             | Enable the assets page for the explorer                                                              |
+| `NX_EXPLORER_GENESIS`            | Enable the genesis page for the explorer                                                             |
+| `NX_EXPLORER_GOVERNANCE`         | Enable the governance page for the explorer                                                          |
+| `NX_EXPLORER_MARKETS`            | Enable the markets page for the explorer                                                             |
+| `NX_EXPLORER_ORACLES`            | Enable the oracles page for the explorer                                                             |
+| `NX_EXPLORER_TXS_LIST`           | Enable the transactions list page for the explorer                                                   |
+| `NX_EXPLORER_NETWORK_PARAMETERS` | Enable the network parameters page for the explorer                                                  |
+| `NX_EXPLORER_PARTIES`            | Enable the parties page for the explorer                                                             |
+| `NX_EXPLORER_VALIDATORS`         | Enable the validators page for the explorer                                                          |

 ## Testing

@@ -66,14 +66,6 @@
        "passWithNoTests": true
      }
    },
-    "generate-types": {
-      "executor": "@nrwl/workspace:run-commands",
-      "options": {
-        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.62.1/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
-        ]
-      }
-    },
    "build-netlify": {
      "executor": "@nrwl/workspace:run-commands",
      "options": {
@@ -1,4 +1,3 @@
-import classnames from 'classnames';
 import { useState, useEffect } from 'react';
 import * as Sentry from '@sentry/react';
 import { BrowserTracing } from '@sentry/tracing';
@@ -10,12 +9,12 @@ import {
  useEnvironment,
 } from '@vegaprotocol/environment';
 import { NetworkInfo } from '@vegaprotocol/network-info';
+import { createClient } from './lib/apollo-client';
 import { Nav } from './components/nav';
 import { Header } from './components/header';
 import { Main } from './components/main';
 import { TendermintWebsocketProvider } from './contexts/websocket/tendermint-websocket-provider';
 import { ENV } from './config/env';
-import type { InMemoryCacheConfig } from '@apollo/client';

 function App() {
  const { VEGA_ENV } = useEnvironment();
@@ -37,41 +36,28 @@ function App() {
    });
  }, [VEGA_ENV]);

-  const cacheConfig: InMemoryCacheConfig = {
-    typePolicies: {
-      Node: {
-        keyFields: false,
-      },
-    },
-  };
-
-  const layoutClasses = classnames(
-    'grid grid-rows-[auto_1fr_auto] grid-cols-[1fr] md:grid-rows-[auto_minmax(700px,_1fr)_auto] md:grid-cols-[300px_1fr]',
-    'min-h-[100vh] mx-auto my-0',
-    'border-neutral-700 dark:border-neutral-300 lg:border-l lg:border-r',
-    'bg-white dark:bg-black',
-    'antialiased text-black dark:text-white',
-    {
-      'h-[100vh] min-h-auto overflow-hidden': menuOpen,
-    }
-  );
-
  return (
    <ThemeContext.Provider value={theme}>
      <TendermintWebsocketProvider>
-        <NetworkLoader cache={cacheConfig}>
-          <div className={layoutClasses}>
-            <Header
-              theme={theme}
-              toggleTheme={toggleTheme}
-              menuOpen={menuOpen}
-              setMenuOpen={setMenuOpen}
-            />
-            <Nav menuOpen={menuOpen} />
-            <Main />
-            <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-sm md:text-md md:flex md:col-span-2 p-4 gap-4 border-t border-neutral-700 dark:border-neutral-300">
-              <NetworkInfo />
-            </footer>
+        <NetworkLoader createClient={createClient}>
+          <div
+            className={`${
+              menuOpen && 'h-[100vh] overflow-hidden'
+            } antialiased m-0 bg-white dark:bg-black text-black dark:text-white`}
+          >
+            <div className="grid grid-rows-[repeat(2,_auto)_1fr] grid-cols-[1fr] md:grid-rows-[auto_minmax(700px,_1fr)] md:grid-cols-[300px_1fr] border-neutral-700 dark:border-neutral-300 lg:border-l lg:border-r mx-auto">
+              <Header
+                theme={theme}
+                toggleTheme={toggleTheme}
+                menuOpen={menuOpen}
+                setMenuOpen={setMenuOpen}
+              />
+              <Nav menuOpen={menuOpen} />
+              <Main />
+              <footer className="grid grid-rows-2 grid-cols-[1fr_auto] text-sm md:text-md md:flex md:col-span-2 p-4 gap-4 border-t border-neutral-700 dark:border-neutral-300">
+                <NetworkInfo />
+              </footer>
+            </div>
          </div>
        </NetworkLoader>
      </TendermintWebsocketProvider>
@@ -1,8 +0,0 @@
-query ExplorerAsset($id: ID!) {
-  asset(id: $id) {
-    id
-    name
-    status
-    decimals
-  }
-}
@@ -1,51 +0,0 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerAssetQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerAssetQuery = { __typename?: 'Query', asset?: { __typename?: 'Asset', id: string, name: string, status: Types.AssetStatus, decimals: number } | null };
-
-
-export const ExplorerAssetDocument = gql`
-    query ExplorerAsset($id: ID!) {
-  asset(id: $id) {
-    id
-    name
-    status
-    decimals
-  }
-}
-    `;
-
-/**
- * __useExplorerAssetQuery__
- *
- * To run a query within a React component, call `useExplorerAssetQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerAssetQuery` 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 } = useExplorerAssetQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerAssetQuery(baseOptions: Apollo.QueryHookOptions<ExplorerAssetQuery, ExplorerAssetQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerAssetQuery, ExplorerAssetQueryVariables>(ExplorerAssetDocument, options);
-      }
-export function useExplorerAssetLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerAssetQuery, ExplorerAssetQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerAssetQuery, ExplorerAssetQueryVariables>(ExplorerAssetDocument, options);
-        }
-export type ExplorerAssetQueryHookResult = ReturnType<typeof useExplorerAssetQuery>;
-export type ExplorerAssetLazyQueryHookResult = ReturnType<typeof useExplorerAssetLazyQuery>;
-export type ExplorerAssetQueryResult = Apollo.QueryResult<ExplorerAssetQuery, ExplorerAssetQueryVariables>;
@@ -1,63 +0,0 @@
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import type { MockedResponse } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import AssetLink from './asset-link';
-import { ExplorerAssetDocument } from './__generated__/Asset';
-
-function renderComponent(id: string, mock: MockedResponse[]) {
-  return (
-    <MockedProvider mocks={mock}>
-      <MemoryRouter>
-        <AssetLink id={id} />
-      </MemoryRouter>
-    </MockedProvider>
-  );
-}
-
-describe('Asset link component', () => {
-  it('Renders the ID at first', () => {
-    const res = render(renderComponent('123', []));
-    expect(res.getByText('123')).toBeInTheDocument();
-  });
-
-  it('Renders the asset name when the query returns a result', async () => {
-    const mock = {
-      request: {
-        query: ExplorerAssetDocument,
-        variables: {
-          id: '123',
-        },
-      },
-      result: {
-        data: {
-          asset: {
-            id: '123',
-            name: 'test-label',
-            status: 'irrelevant-test-data',
-            decimals: 18,
-          },
-        },
-      },
-    };
-
-    const res = render(renderComponent('123', [mock]));
-    expect(res.getByText('123')).toBeInTheDocument();
-    expect(await res.findByText('test-label')).toBeInTheDocument();
-  });
-
-  it('Leaves the asset id when the asset is not found', async () => {
-    const mock = {
-      request: {
-        query: ExplorerAssetDocument,
-        variables: {
-          id: '123',
-        },
-      },
-      error: new Error('No such asset'),
-    };
-
-    const res = render(renderComponent('123', [mock]));
-    expect(await res.findByText('123')).toBeInTheDocument();
-  });
-});
@@ -1,35 +0,0 @@
-import React from 'react';
-import { Routes } from '../../../routes/route-names';
-import { useExplorerAssetQuery } from './__generated__/Asset';
-import { Link } from 'react-router-dom';
-
-import type { ComponentProps } from 'react';
-
-export type AssetLinkProps = Partial<ComponentProps<typeof Link>> & {
-  id: string;
-};
-
-/**
- * Given an asset ID, it will fetch the asset name and show that,
- * with a link to the assets list. If the name does not come back
- * it will use the ID instead.
- */
-const AssetLink = ({ id, ...props }: AssetLinkProps) => {
-  const { data } = useExplorerAssetQuery({
-    variables: { id },
-  });
-
-  let label: string = id;
-
-  if (data?.asset?.name) {
-    label = data.asset.name;
-  }
-
-  return (
-    <Link className="underline" {...props} to={`/${Routes.ASSETS}#${id}`}>
-      {label}
-    </Link>
-  );
-};
-
-export default AssetLink;
@@ -1,19 +0,0 @@
-import React from 'react';
-import { Routes } from '../../../routes/route-names';
-import { Link } from 'react-router-dom';
-
-import type { ComponentProps } from 'react';
-
-export type BlockLinkProps = Partial<ComponentProps<typeof Link>> & {
-  height: string;
-};
-
-const BlockLink = ({ height, ...props }: BlockLinkProps) => {
-  return (
-    <Link className="underline" {...props} to={`/${Routes.BLOCKS}/${height}`}>
-      {height}
-    </Link>
-  );
-};
-
-export default BlockLink;
@@ -1,33 +0,0 @@
-import React from 'react';
-
-import { DATA_SOURCES } from '../../../config';
-
-export enum EthExplorerLinkTypes {
-  block = 'block',
-  address = 'address',
-  tx = 'tx',
-}
-
-export type EthExplorerLinkProps = Partial<typeof HTMLAnchorElement> & {
-  id: string;
-  type: EthExplorerLinkTypes;
-};
-
-export const EthExplorerLink = ({
-  id,
-  type,
-  ...props
-}: EthExplorerLinkProps) => {
-  const link = `${DATA_SOURCES.ethExplorerUrl}/${type}/${id}`;
-  return (
-    <a
-      className="underline external"
-      target="_blank"
-      rel="noopener noreferrer"
-      {...props}
-      href={link}
-    >
-      {id}
-    </a>
-  );
-};
@@ -1,5 +0,0 @@
-export { default as BlockLink } from './block-link/block-link';
-export { default as PartyLink } from './party-link/party-link';
-export { default as NodeLink } from './node-link/node-link';
-export { default as MarketLink } from './market-link/market-link';
-export { default as AssetLink } from './asset-link/asset-link';
@@ -1,11 +0,0 @@
-query ExplorerMarket($id: ID!) {
-  market(id: $id) {
-    id
-    tradableInstrument {
-      instrument {
-        name
-      }
-    }
-    state
-  }
-}
@@ -1,54 +0,0 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type ExplorerMarketQueryVariables = Types.Exact<{
-  id: Types.Scalars['ID'];
-}>;
-
-
-export type ExplorerMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string } } } | null };
-
-
-export const ExplorerMarketDocument = gql`
-    query ExplorerMarket($id: ID!) {
-  market(id: $id) {
-    id
-    tradableInstrument {
-      instrument {
-        name
-      }
-    }
-    state
-  }
-}
-    `;
-
-/**
- * __useExplorerMarketQuery__
- *
- * To run a query within a React component, call `useExplorerMarketQuery` and pass it any options that fit your needs.
- * When your component renders, `useExplorerMarketQuery` 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 } = useExplorerMarketQuery({
- *   variables: {
- *      id: // value for 'id'
- *   },
- * });
- */
-export function useExplorerMarketQuery(baseOptions: Apollo.QueryHookOptions<ExplorerMarketQuery, ExplorerMarketQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<ExplorerMarketQuery, ExplorerMarketQueryVariables>(ExplorerMarketDocument, options);
-      }
-export function useExplorerMarketLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerMarketQuery, ExplorerMarketQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<ExplorerMarketQuery, ExplorerMarketQueryVariables>(ExplorerMarketDocument, options);
-        }
-export type ExplorerMarketQueryHookResult = ReturnType<typeof useExplorerMarketQuery>;
-export type ExplorerMarketLazyQueryHookResult = ReturnType<typeof useExplorerMarketLazyQuery>;
-export type ExplorerMarketQueryResult = Apollo.QueryResult<ExplorerMarketQuery, ExplorerMarketQueryVariables>;
@@ -1,66 +0,0 @@
-import { MemoryRouter } from 'react-router-dom';
-import { MockedProvider } from '@apollo/client/testing';
-import type { MockedResponse } from '@apollo/client/testing';
-import { render } from '@testing-library/react';
-import MarketLink from './market-link';
-import { ExplorerMarketDocument } from './__generated__/Market';
-
-function renderComponent(id: string, mock: MockedResponse[]) {
-  return (
-    <MockedProvider mocks={mock}>
-      <MemoryRouter>
-        <MarketLink id={id} />
-      </MemoryRouter>
-    </MockedProvider>
-  );
-}
-
-describe('Market link component', () => {
-  it('Renders the ID at first', () => {
-    const res = render(renderComponent('123', []));
-    expect(res.getByText('123')).toBeInTheDocument();
-  });
-
-  it('Renders the market name when the query returns a result', async () => {
-    const mock = {
-      request: {
-        query: ExplorerMarketDocument,
-        variables: {
-          id: '123',
-        },
-      },
-      result: {
-        data: {
-          market: {
-            id: '123',
-            state: 'irrelevant-test-data',
-            tradableInstrument: {
-              instrument: {
-                name: 'test-label',
-              },
-            },
-          },
-        },
-      },
-    };
-
-    const res = render(renderComponent('123', [mock]));
-    expect(res.getByText('123')).toBeInTheDocument();
-    expect(await res.findByText('test-label')).toBeInTheDocument();
-  });
-
-  it('Leaves the market id when the market is not found', async () => {
-    const mock = {
-      request: {
-        query: ExplorerMarketDocument,
-        variables: {
-          id: '123',
-        },
-      },
-      error: new Error('No such market'),
-    };
-
-    const res = render(renderComponent('123', [mock]));
-    expect(await res.findByText('123')).toBeInTheDocument();
-  });
-});
@@ -1,35 +0,0 @@
-import React from 'react';
-import { Routes } from '../../../routes/route-names';
-import { useExplorerMarketQuery } from './__generated__/Market';
-import { Link } from 'react-router-dom';
-
-import type { ComponentProps } from 'react';
-
-export type MarketLinkProps = Partial<ComponentProps<typeof Link>> & {
-  id: string;
-};
-
-/**
- * Given a market ID, it will fetch the market name and show that,
- * with a link to the markets list. If the name does not come back
- * it will use the ID instead
- */
-const MarketLink = ({ id, ...props }: MarketLinkProps) => {
-  const { data } = useExplorerMarketQuery({
-    variables: { id },
-  });
-
-  let label = id;
-
-  if (data?.market?.tradableInstrument.instrument.name) {
-    label = data.market.tradableInstrument.instrument.name;
-  }
-
-  return (
-    <Link className="underline" {...props} to={`/${Routes.MARKETS}#${id}`}>
-      {label}
-    </Link>
-  );
-};
-
-export default MarketLink;
@@ -1,7 +0,0 @@
-query ExplorerNode($id: ID!) {
-  node(id: $id) {
-    id
-    name
-    status
-  }
-}
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	f8e59a073a	fix: use n09 in .env.testnet	2022-11-01 17:32:43 +00:00
Madalina Raicu	4511474702	Merge branch 'release/testnet' of github.com:vegaprotocol/frontend-monorepo into release/testnet	2022-11-01 17:29:25 +00:00
Madalina Raicu	2402b339d0	fix: use n08 in .env.testnet	2022-10-27 11:21:08 +01:00
Madalina Raicu	600f1dc6aa	Merge branch 'release/testnet' of github.com:vegaprotocol/frontend-monorepo into release/testnet	2022-10-27 11:18:50 +01:00