fix: #1537 add 3 lp data providers

Merge branch 'chore/seoplia-migration' of github.com:vegaprotocol/frontend-monorepo into fix/1537-lp-view-data-provider
fix: remove trailing slash from etherscan urls
2022-10-04 17:25:05 +01:00 · 2022-10-04 17:13:27 +01:00 · 2022-10-04 08:32:59 -07:00 · 2022-10-04 08:32:59 -07:00 · 2022-10-04 15:30:21 +01:00 · 2022-10-04 15:11:05 +01:00
1095 changed files with 25557 additions and 49068 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 }}
@@ -5,7 +5,7 @@ inputs:
    description: 'Wallet password'
  capsule:
    description: 'Is Capsule network used'
-    default: 'false'
+    default: false
 runs:
  using: 'composite'
  steps:
@@ -19,29 +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
-      if: ${{ inputs.capsule=='false' }}
-      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
-      if: ${{ inputs.capsule=='false' }}
-      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
-      if: ${{ inputs.capsule=='false' }}
-      run: vega wallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks-internal/master/stagnet3/stagnet3.toml" --force --home ~/.vegacapsule/testnet/wallet
+      if: ${{ inputs.capsule==false }}
+      run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks/master/fairground/fairground.toml" --force --home ~/.vegacapsule/testnet/wallet

    - name: Start service using fairground network
      shell: bash
-      if: ${{ inputs.capsule=='false' }}
-      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 fairground --automatic-consent --home ~/.vegacapsule/testnet/wallet &

    - name: Start service using capsule network
      shell: bash
-      if: ${{ inputs.capsule=='true' }}
-      run: vegawallet-dummy service run --network DV --wallet capsule_wallet --passphrase-file ./passphrase --home ~/.vegacapsule/testnet/wallet &
+      if: ${{ inputs.capsule }}
+      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,52 +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.57.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}}
-      capsule-teardown: false
+      #######
+      ## 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: true
+
+      ######
+      ## 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,12 +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
-      capsule-teardown: false
+    name: Run Cypress tests -- nightly
+    runs-on: self-hosted
+    timeout-minutes: 60
+    env:
+      GO111MODULE: 'on'
+      GOBIN: /home/runner/go/bin
+      VEGA_VERSION: 'v0.57.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
+        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.57.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,86 +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 }}
-          capsule: false
-
-      # 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,118 +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
-      capsule-teardown:
-        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
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
-        with:
-          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
-          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          capsule: true
-
-      ######
-      ## 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_TEARDOWN_NETWORK_AFTER_FLOWS: ${{ inputs.capsule-teardown }}
-          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,31 +0,0 @@
-name: Cypress Console tests -- live environment
-
-# This workflow runs using provided url
-
-on:
-  workflow_dispatch:
-    inputs:
-      url:
-        description: 'Url'
-        required: true
-        type: string
-
-jobs:
-  cypress-run:
-    name: Run Cypress Trading tests -- live environment
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Run Cypress tests
-        uses: cypress-io/github-action@v4
-        with:
-          browser: chrome
-          record: true
-          project: ./apps/trading-e2e
-          config: baseUrl=${{ github.event.inputs.url }}
-          env: grepTags=@live
-        env:
-          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -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,113 +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
-      capsule-teardown:
-        required: false
-        type: boolean
-        default: false
-
-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
-        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
-        with:
-          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
-          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
-          capsule: true
-
-      ######
-      ## 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 }}
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: ${{ inputs.capsule-teardown }}
-
-      ######
-      ## 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,87 +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 }}
-          capsule: false
-
-      # 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 }}
@@ -3,7 +3,7 @@ name: Generate queries
 on:
  push:
    branches:
-      - develop
+      - master

 jobs:
  master:
@@ -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
@@ -42,5 +42,3 @@ jobs:
        run: yarn nx affected:test
      - name: Build affected
        run: yarn nx affected:build
-      - name: Build affected spec
-        run: yarn nx affected --target=build-spec
@@ -1,81 +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
-      capsule-teardown:
-        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 }}
-      capsule-teardown: ${{ inputs.capsule-teardown }}
-
-  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 }}
-      capsule-teardown: ${{ inputs.capsule-teardown }}
-
-  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,20 +0,0 @@
-@Library('vega-shared-library') _
-
-def commitHash = 'UNKNOWN'
-
-pipeline {
-  agent any
-  options {
-    skipDefaultCheckout true
-    parallelsAlwaysFailFast()
-  }
-  stages {
-    stage('approbation') {
-      steps {
-        sh 'printenv'
-        checkout scm
-        runApprobation ignoreFailure: false, frontendBranch: env.BRANCH_NAME, type: 'frontend'
-      }
-    }
-  }
-}
@@ -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,26 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
+# React Environment Variables
+
+# https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#expanding-environment-variables-in-env
+
+# Netlify Environment Variables
+
+# https://www.netlify.com/docs/continuous-deployment/#environment-variables
+
+NX_VERSION=$npm_package_version
+NX_REPOSITORY_URL=$REPOSITORY_URL
+NX_BRANCH=$BRANCH
+NX_PULL_REQUEST=$PULL_REQUEST
+NX_HEAD=$HEAD
+NX_COMMIT_REF=$COMMIT_REF
+NX_CONTEXT=$CONTEXT
+NX_REVIEW_ID=$REVIEW_ID
+NX_INCOMING_HOOK_TITLE=$INCOMING_HOOK_TITLE
+NX_INCOMING_HOOK_URL=$INCOMING_HOOK_URL
+NX_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY
+NX_URL=$URL
+NX_DEPLOY_URL=$DEPLOY_URL
+NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
+
+NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_ENV=TESTNET
 NX_VEGA_WALLET_URL=http://localhost:1789
-CYPRESS_VEGA_ENV=STAGNET3
@@ -1 +0,0 @@
-declare module '*.scss';
@@ -1,3 +1,4 @@
+import { connectVegaWallet } from '../support/connect-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generateMarketsCandles,
@@ -26,7 +27,7 @@ describe('market selector', { tags: '@smoke' }, () => {
      aliasQuery(req, 'MarketTags', generateMarketTags());
      aliasQuery(req, 'MarketPositions', generateMarketPositions());
      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
-      aliasQuery(req, 'PartyBalance', generatePartyBalance());
+      aliasQuery(req, 'PartyBalanceQuery', generatePartyBalance());
      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
      aliasQuery(req, 'MarketNames', generateMarketNames());
@@ -45,7 +46,7 @@ describe('market selector', { tags: '@smoke' }, () => {
  it('should be properly rendered', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('input[placeholder="Search"]').should(
        'have.value',
        markets[0].tradableInstrument.instrument.name
@@ -69,7 +70,7 @@ describe('market selector', { tags: '@smoke' }, () => {
  it('typing should change list', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('input[placeholder="Search"]').type('{backspace}');
      cy.getByTestId('market-pane')
        .children()
@@ -105,7 +106,7 @@ describe('market selector', { tags: '@smoke' }, () => {
  it.skip('keyboard navigation should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('input[placeholder="Search"]').type('{backspace}');
      cy.get('input[placeholder="Search"]').clear();
      cy.focused().realPress('ArrowDown');
@@ -127,7 +128,7 @@ describe('market selector', { tags: '@smoke' }, () => {
    if (markets?.length) {
      cy.viewport('iphone-xr');
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('[role="dialog"]').should('not.exist');
      cy.getByTestId('arrow-button').click();
      cy.get('[role="dialog"]').should('be.visible');
@@ -3,7 +3,6 @@ import {
  generateSimpleMarkets,
  generateMarketsCandles,
  generateMarketsData,
-  generateMarket,
 } from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
@@ -13,6 +12,7 @@ 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';

 describe('Market trade', { tags: '@smoke' }, () => {
@@ -27,11 +27,10 @@ describe('Market trade', { tags: '@smoke' }, () => {
      aliasQuery(req, 'MarketTags', generateMarketTags());
      aliasQuery(req, 'MarketPositions', generateMarketPositions());
      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
-      aliasQuery(req, 'PartyBalance', generatePartyBalance());
+      aliasQuery(req, 'PartyBalanceQuery', generatePartyBalance());
      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
      aliasQuery(req, 'MarketDepth', generateMarketDepth());
-      aliasQuery(req, 'Market', generateMarket());
    });
    cy.visit('/markets');
    cy.wait('@Markets').then((response) => {
@@ -58,7 +57,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('side selector should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').should(
        'have.text',
        'Long'
@@ -77,7 +76,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
    if (markets?.length) {
      cy.viewport('iphone-xr');
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.getByTestId('next-button').scrollIntoView().click();

      cy.get('button[aria-label="Open long position"]').should(
@@ -109,7 +108,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('size slider should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -131,7 +130,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('percentage selection should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -158,7 +157,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('size input should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -186,7 +185,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('slippage value should be displayed', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -202,7 +201,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('allow slippage value to be adjusted', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -230,7 +229,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('notional position size should be present', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -257,7 +256,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('total fees should be displayed', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -265,14 +264,17 @@ describe('Market trade', { tags: '@smoke' }, () => {
        .find('dt')
        .eq(3)
        .should('have.text', 'Est. Fees (tDAI)');
-      cy.get('#step-2-panel').find('dd').eq(3).should('have.text', '3 (3.03%)');
+      cy.get('#step-2-panel')
+        .find('dd')
+        .eq(3)
+        .should('have.text', '3.00000 (3.03%)');
    }
  });

  it('order review should display proper calculations', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-3-control').click();

      cy.getByTestId('review-trade')
@@ -287,11 +289,18 @@ describe('Market trade', { tags: '@smoke' }, () => {

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

-      cy.get('#step-3-panel').find('dd').eq(3).should('have.text', '3 (3.03%)');
+      cy.get('#step-3-panel')
+        .find('dd')
+        .eq(3)
+        .should('have.text', '3.00000 (3.03%)');

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

-      cy.getByTestId('place-order').should('be.enabled').click();
+      cy.getByTestId('place-order').click();
+      cy.getByTestId('dialog-title').should(
+        'have.text',
+        'Awaiting network confirmation'
+      );
    }
  });

@@ -299,7 +308,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
    if (markets?.length) {
      cy.viewport('iphone-xr');
      cy.visit(`/trading/${markets[0].id}`);
-      cy.connectVegaWallet();
+      connectVegaWallet();
      cy.get('#step-3-control').click();

      // Start from the bottom tooltip to ensure the tooltip above
@@ -1,11 +1,17 @@
+import {
+  connectVegaWallet,
+  disconnectVegaWallet,
+} from '../support/connect-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generatePositions,
  emptyPositions,
  generateMargins,
 } from '../support/mocks/generate-positions';
-import { generateAccounts } from '../support/mocks/generate-accounts';
-import { generateAssets } from '../support/mocks/generate-assets';
+import {
+  generateAccounts,
+  generateAssets,
+} from '../support/mocks/generate-accounts';
 import { generateOrders } from '../support/mocks/generate-orders';
 import { generateFills } from '../support/mocks/generate-fills';
 import {
@@ -14,31 +20,22 @@ import {
  generatePositionsMarkets,
 } from '../support/mocks/generate-markets';

-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();
    cy.getByTestId('trading-connect-wallet').should('be.visible');
-    cy.connectVegaWallet();
+    connectVegaWallet();
    cy.getByTestId('trading-connect-wallet').should('not.exist');
  });
-});
-
-describe('Portfolio page tabs', { tags: '@smoke' }, () => {
-  before(() => {
-    cy.mockGQL((req) => {
-      aliasQuery(req, 'Positions', generatePositions());
-      aliasQuery(req, 'Margins', generateMargins());
-      aliasQuery(req, 'Markets', generatePositionsMarkets());
-      aliasQuery(req, 'MarketsData', generateMarketsData());
-      aliasQuery(req, 'Accounts', generateAccounts());
-      aliasQuery(req, 'Assets', generateAssets());
-    });
-  });

  it('certain tabs should exist', () => {
    cy.visit('/portfolio');
-    cy.connectVegaWallet();
+    connectVegaWallet();

    cy.getByTestId('assets').click();
    cy.location('pathname').should('eq', '/portfolio/assets');
@@ -57,7 +54,7 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
  });

  describe('Assets view', () => {
-    before(() => {
+    beforeEach(() => {
      cy.mockGQL((req) => {
        aliasQuery(req, 'Positions', generatePositions());
        aliasQuery(req, 'Margins', generateMargins());
@@ -67,7 +64,7 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
        aliasQuery(req, 'Assets', generateAssets());
      });
      cy.visit('/portfolio/assets');
-      cy.connectVegaWallet();
+      connectVegaWallet();
    });

    it('data should be properly rendered', () => {
@@ -96,11 +93,12 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
        aliasQuery(req, 'Assets', generateAssets());
      });
      cy.visit('/portfolio/positions');
-      cy.connectVegaWallet();
+      connectVegaWallet();
    });

    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');
    });
  });

@@ -111,7 +109,7 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
        aliasQuery(req, 'Markets', generateFillsMarkets());
      });
      cy.visit('/portfolio/orders');
-      cy.connectVegaWallet();
+      connectVegaWallet();
    });

    it('data should be properly rendered', () => {
@@ -126,7 +124,7 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
        aliasQuery(req, 'Markets', generateFillsMarkets());
      });
      cy.visit('/portfolio/fills');
-      cy.connectVegaWallet();
+      connectVegaWallet();
    });

    it('data should be properly rendered', () => {
@@ -149,7 +147,7 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
        });
      });
      cy.visit('/portfolio');
-      cy.connectVegaWallet();
+      connectVegaWallet();
    });

    it('"No data to display" should be always displayed', () => {
@@ -0,0 +1,18 @@
+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"]')
+    .click();
+  cy.getByTestId(form).find('#wallet').click().type(walletName);
+  cy.getByTestId(form).find('#passphrase').click().type(walletPassphrase);
+  cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
+};
+
+export const disconnectVegaWallet = () => {
+  cy.getByTestId('connect-vega-wallet').click();
+  cy.getByTestId('disconnect').click();
+};
@@ -21,16 +21,11 @@ import registerCypressGrep from 'cypress-grep';
 import { aliasQuery } from '@vegaprotocol/cypress';
 registerCypressGrep();

-before(() => {
+beforeEach(() => {
  // Mock chainId fetch which happens on every page for wallet connection
  cy.mockGQL((req) => {
    aliasQuery(req, 'ChainId', {
-      statistics: {
-        __typename: 'Statistics',
-        chainId:
-          Cypress.env('VEGA_ENV').toLowerCase() ||
-          'vega-fairground-202210041151',
-      },
+      statistics: { __typename: 'Statistics', chainId: 'test-chain-id' },
    });
  });
 });
@@ -1,6 +1,5 @@
 import type { Market } from '@vegaprotocol/market-list';
-import { Schema } from '@vegaprotocol/types';
-import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';
+import { MarketState, MarketTradingMode } from '@vegaprotocol/types';

 export const protoCandles = [
  { open: '9556163', close: '9587028', __typename: 'Candle' },
@@ -79,8 +78,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: {
@@ -124,24 +123,3 @@ export const protoMarket: Market = {
  },
  __typename: 'Market',
 };
-
-export const singleMarket: SingleMarketFieldsFragment = {
-  ...protoMarket,
-  tradableInstrument: {
-    ...protoMarket.tradableInstrument,
-    instrument: {
-      ...protoMarket.tradableInstrument.instrument,
-      product: {
-        ...protoMarket.tradableInstrument.instrument.product,
-        settlementAsset: {
-          ...protoMarket.tradableInstrument.instrument.product.settlementAsset,
-          id: 'dai-id',
-          name: 'DAI Name',
-        },
-        dataSourceSpecForTradingTermination: {
-          id: 'oid',
-        },
-      },
-    },
-  },
-};
@@ -1,6 +1,6 @@
 import merge from 'lodash/merge';
-import type { AccountsQuery } from '@vegaprotocol/accounts';
-import { Schema as Types } from '@vegaprotocol/types';
+import type { AccountsQuery, AssetsQuery } from '@vegaprotocol/accounts';
+import { AccountType, Schema as Types } from '@vegaprotocol/types';
 import type { PartialDeep } from 'type-fest';

 export const generateAccounts = (
@@ -12,8 +12,8 @@ export const generateAccounts = (
      id: Cypress.env('VEGA_PUBLIC_KEY'),
      accounts: [
        {
-          __typename: 'AccountBalance',
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          __typename: 'Account',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
          balance: '100000000',
          market: null,
          asset: {
@@ -22,8 +22,8 @@ export const generateAccounts = (
          },
        },
        {
-          __typename: 'AccountBalance',
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          __typename: 'Account',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
          balance: '100000000',
          market: {
            id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
@@ -35,8 +35,8 @@ export const generateAccounts = (
          },
        },
        {
-          __typename: 'AccountBalance',
-          type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
+          __typename: 'Account',
+          type: AccountType.ACCOUNT_TYPE_MARGIN,
          balance: '1000',
          market: {
            __typename: 'Market',
@@ -48,8 +48,8 @@ export const generateAccounts = (
          },
        },
        {
-          __typename: 'AccountBalance',
-          type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
+          __typename: 'Account',
+          type: AccountType.ACCOUNT_TYPE_MARGIN,
          balance: '1000',
          market: {
            __typename: 'Market',
@@ -61,8 +61,8 @@ export const generateAccounts = (
          },
        },
        {
-          __typename: 'AccountBalance',
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          __typename: 'Account',
+          type: AccountType.ACCOUNT_TYPE_GENERAL,
          balance: '100000000',
          market: null,
          asset: {
@@ -75,3 +75,43 @@ export const generateAccounts = (
  };
  return merge(defaultAccounts, override);
 };
+
+export const generateAssets = (override?: PartialDeep<AssetsQuery>) => {
+  const defaultAssets: AssetsQuery = {
+    assetsConnection: {
+      edges: [
+        {
+          node: {
+            id: 'asset-id',
+            symbol: 'tEURO',
+            decimals: 5,
+            name: 'Euro',
+            quantum: '',
+            status: Types.AssetStatus.STATUS_ENABLED,
+          },
+        },
+        {
+          node: {
+            id: 'asset-id-2',
+            symbol: 'tDAI',
+            decimals: 5,
+            name: 'DAI',
+            quantum: '',
+            status: Types.AssetStatus.STATUS_ENABLED,
+          },
+        },
+        {
+          node: {
+            id: 'asset-0',
+            symbol: 'AST0',
+            decimals: 5,
+            name: 'Asto',
+            quantum: '',
+            status: Types.AssetStatus.STATUS_ENABLED,
+          },
+        },
+      ],
+    },
+  };
+  return merge(defaultAssets, override);
+};
@@ -1,120 +0,0 @@
-import merge from 'lodash/merge';
-import type { AssetsQuery } from '@vegaprotocol/assets';
-import { Schema as Types } from '@vegaprotocol/types';
-import type { PartialDeep } from 'type-fest';
-
-export const generateAssets = (override?: PartialDeep<AssetsQuery>) => {
-  const defaultAssets: AssetsQuery = {
-    assetsConnection: {
-      edges: [
-        {
-          node: {
-            id: 'asset-id',
-            symbol: 'tEURO',
-            decimals: 5,
-            name: 'Euro',
-            source: {
-              __typename: 'ERC20',
-              contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4',
-              lifetimeLimit: '1',
-              withdrawThreshold: '2',
-            },
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-            infrastructureFeeAccount: {
-              balance: '1',
-              __typename: 'AccountBalance',
-            },
-            globalRewardPoolAccount: {
-              balance: '2',
-              __typename: 'AccountBalance',
-            },
-            takerFeeRewardAccount: {
-              balance: '3',
-              __typename: 'AccountBalance',
-            },
-            makerFeeRewardAccount: {
-              balance: '4',
-              __typename: 'AccountBalance',
-            },
-            lpFeeRewardAccount: {
-              balance: '5',
-              __typename: 'AccountBalance',
-            },
-            marketProposerRewardAccount: {
-              balance: '6',
-              __typename: 'AccountBalance',
-            },
-            __typename: 'Asset',
-          },
-        },
-        {
-          node: {
-            id: 'asset-id-2',
-            symbol: 'tDAI',
-            decimals: 5,
-            name: 'DAI',
-            source: {
-              __typename: 'ERC20',
-              contractAddress: '0x0158031158Bb4dF2AD02eAA31e8963E84EA978a4',
-              lifetimeLimit: '1',
-              withdrawThreshold: '2',
-            },
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-            infrastructureFeeAccount: {
-              balance: '1',
-              __typename: 'AccountBalance',
-            },
-            globalRewardPoolAccount: {
-              balance: '2',
-              __typename: 'AccountBalance',
-            },
-            takerFeeRewardAccount: {
-              balance: '3',
-              __typename: 'AccountBalance',
-            },
-            makerFeeRewardAccount: {
-              balance: '4',
-              __typename: 'AccountBalance',
-            },
-            lpFeeRewardAccount: {
-              balance: '5',
-              __typename: 'AccountBalance',
-            },
-            marketProposerRewardAccount: {
-              balance: '6',
-              __typename: 'AccountBalance',
-            },
-            __typename: 'Asset',
-          },
-        },
-        {
-          node: {
-            id: 'asset-0',
-            symbol: 'AST0',
-            decimals: 5,
-            name: 'Asto',
-            source: {
-              __typename: 'BuiltinAsset',
-              maxFaucetAmountMint: '3',
-            },
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-            infrastructureFeeAccount: {
-              balance: '0',
-              __typename: 'AccountBalance',
-            },
-            globalRewardPoolAccount: null,
-            takerFeeRewardAccount: null,
-            makerFeeRewardAccount: null,
-            lpFeeRewardAccount: null,
-            marketProposerRewardAccount: null,
-            __typename: 'Asset',
-          },
-        },
-      ],
-    },
-  };
-  return merge(defaultAssets, override);
-};
@@ -1,21 +1,13 @@
-import type { DealTicketQuery } from '@vegaprotocol/deal-ticket';
-import { Schema } from '@vegaprotocol/types';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateDealTicket = (
-  override?: PartialDeep<DealTicketQuery>
-): DealTicketQuery => {
-  const defaultResult: DealTicketQuery = {
+export const generateDealTicket = () => {
+  return {
    market: {
      id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
      decimalPlaces: 5,
      positionDecimalPlaces: 0,
-      state: Schema.MarketState.STATE_ACTIVE,
-      tradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+      state: 'STATE_ACTIVE',
+      tradingMode: 'Continuous',
      tradableInstrument: {
        instrument: {
-          id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
          name: 'AAVEDAI Monthly (30 Jun 2022)',
          product: {
            quoteName: 'DAI',
@@ -23,7 +15,6 @@ export const generateDealTicket = (
              id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
              symbol: 'tDAI',
              name: 'tDAI TEST',
-              decimals: 5,
              __typename: 'Asset',
            },
            __typename: 'Future',
@@ -36,17 +27,7 @@ export const generateDealTicket = (
        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,5 +1,5 @@
 import type { FillsQuery, FillFieldsFragment } from '@vegaprotocol/fills';
-import { Schema } from '@vegaprotocol/types';
+import { Side } from '@vegaprotocol/types';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';

@@ -17,7 +17,7 @@ export const generateFills = (
      seller: {
        id: Cypress.env('VEGA_PUBLIC_KEY'),
      },
-      aggressor: Schema.Side.SIDE_SELL,
+      aggressor: Side.SIDE_SELL,
      buyerFee: {
        infrastructureFee: '5000',
      },
@@ -30,11 +30,11 @@ export const generateFills = (
      seller: {
        id: Cypress.env('VEGA_PUBLIC_KEY'),
      },
-      aggressor: Schema.Side.SIDE_BUY,
+      aggressor: Side.SIDE_BUY,
    }),
    generateFill({
      id: '3',
-      aggressor: Schema.Side.SIDE_SELL,
+      aggressor: Side.SIDE_SELL,
      market: {
        id: 'market-2',
      },
@@ -80,7 +80,7 @@ export const generateFill = (override?: PartialDeep<FillFieldsFragment>) => {
    size: '50000',
    buyOrder: 'buy-order',
    sellOrder: 'sell-order',
-    aggressor: Schema.Side.SIDE_BUY,
+    aggressor: Side.SIDE_BUY,
    buyer: {
      __typename: 'Party',
      id: 'buyer-id',
@@ -1,12 +1,12 @@
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
-import type { MarketDepthQuery } from '../../../../../libs/market-depth/src/lib/__generated___/MarketDepth';
+import type { MarketDepth } from '../../../../../libs/market-depth/src/lib/__generated__/MarketDepth';

 export const generateMarketDepth = (
-  override?: PartialDeep<MarketDepthQuery>
-): MarketDepthQuery => {
-  const defaultResult: MarketDepthQuery = {
+  override?: PartialDeep<MarketDepth>
+): MarketDepth => {
+  const defaultResult: MarketDepth = {
    market: {
      id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
      depth: {
@@ -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,
@@ -8,9 +12,8 @@ import type {
  MarketsDataQuery,
  MarketDataFieldsFragment,
 } from '@vegaprotocol/market-list';
-import { protoMarket, protoCandles, singleMarket } from './commons';
+import { protoMarket, protoCandles } from './commons';
 import type { PartialDeep } from 'type-fest';
-import type { MarketQuery } from '@vegaprotocol/market-list';

 export const generateSimpleMarkets = (): MarketsQuery => {
  const markets: Market[] = [
@@ -18,7 +21,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '57fbaa322e97cfc8bb5f1de048c37e033c41b1ac1906d3aed9960912a067ef5a',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -52,7 +55,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: 'ccf2f04865e5951ac3405da6e16b7cbdb535a0ad32df4df2dbed4262cf473255',
-      state: Schema.MarketState.STATE_SUSPENDED,
+      state: MarketState.STATE_SUSPENDED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -86,7 +89,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '6030e5b4e0ca3297a26081e5af4d453f97f96baab2d74bf56f84efcffc4c382f',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -121,7 +124,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: 'de74a5572045b300e8ec50d136896912ec76e7d7ec135bc305dfd4854d9363a4',
-      state: Schema.MarketState.STATE_PENDING,
+      state: MarketState.STATE_PENDING,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -155,7 +158,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '31ea96284611771e486c820acb26a325a99664f9854b5a7e7ad99023efa8f9e6',
-      state: Schema.MarketState.STATE_CLOSED,
+      state: MarketState.STATE_CLOSED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -188,7 +191,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '34cff959cdc2ffdb0f167820d701fe8b51cc6b8588e650d93369aaa22d6f8b74',
-      state: Schema.MarketState.STATE_SETTLED,
+      state: MarketState.STATE_SETTLED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -223,7 +226,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '87b0bbb3c171baa5d97dfc3852332829c91e5c5dc9f7c8fb584c6d8ac75aaaf2',
-      state: Schema.MarketState.STATE_SETTLED,
+      state: MarketState.STATE_SETTLED,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -257,7 +260,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '45266143c6e9b58f4cff9b8906e971c531bb29ea7af01066973f9b77e8134823',
-      state: Schema.MarketState.STATE_PENDING,
+      state: MarketState.STATE_PENDING,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -292,7 +295,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '65663ebdc96161162769c4d5c5508137416748178d7cb28e2cb0d07a151a2bc6',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -327,7 +330,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '234afabd27e3bce1a879039c041f9f00f915d98459935ddafd0169d38dd13850',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -363,7 +366,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '9f2a3c1caa67bb0773ec18d908d32b55b129b9ec2d106a8e9a87f6aa5c0375a6',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -399,7 +402,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '8a45ee934d3ddac4b036f9884df1064a5353c620a56f775ba36597d0edef9a7a',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -433,7 +436,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: 'aede7b9ac0c3b225004929c5455160a00f59864aad32ec366e8a2bff1b30fd0f',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -468,7 +471,7 @@ export const generateSimpleMarkets = (): MarketsQuery => {
    {
      ...protoMarket,
      id: '9398707e01daa1a1f1ca6ff87cf8d6c03fe7373ce31121ce81b99a129e6bda47',
-      state: Schema.MarketState.STATE_ACTIVE,
+      state: MarketState.STATE_ACTIVE,
      tradableInstrument: {
        instrument: {
          id: '',
@@ -1149,7 +1152,7 @@ export const generateMarketsData = (
          id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
          __typename: 'Market',
        },
-        marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+        marketTradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
        staticMidPrice: '0',
        indicativePrice: '0',
        bestStaticBidPrice: '0',
@@ -1158,7 +1161,7 @@ export const generateMarketsData = (
        bestBidPrice: '0',
        bestOfferPrice: '0',
        markPrice: '17588787',
-        trigger: Schema.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
+        trigger: AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
        __typename: 'MarketData',
      },
      __typename: 'Market',
@@ -1169,7 +1172,7 @@ export const generateMarketsData = (
          id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
          __typename: 'Market',
        },
-        marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+        marketTradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
        staticMidPrice: '0',
        indicativePrice: '0',
        bestStaticBidPrice: '0',
@@ -1178,7 +1181,7 @@ export const generateMarketsData = (
        bestBidPrice: '0',
        bestOfferPrice: '0',
        markPrice: '84377569',
-        trigger: Schema.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
+        trigger: AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
        __typename: 'MarketData',
      },
      __typename: 'Market',
@@ -1211,7 +1214,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',
@@ -1374,11 +1377,3 @@ export const generatePositionsMarkets = () => {
    },
  };
 };
-
-export const generateMarket = (): MarketQuery => {
-  return {
-    market: {
-      ...singleMarket,
-    },
-  };
-};
@@ -1,12 +1,18 @@
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
-import type { OrdersQuery, OrderFieldsFragment } from '@vegaprotocol/orders';
-import { Schema } from '@vegaprotocol/types';
+import type {
+  Orders,
+  Orders_party_ordersConnection_edges_node,
+} from '@vegaprotocol/orders';
+import {
+  OrderStatus,
+  OrderTimeInForce,
+  OrderType,
+  Side,
+} from '@vegaprotocol/types';

-export const generateOrders = (
-  override?: PartialDeep<OrdersQuery>
-): OrdersQuery => {
-  const orders: OrderFieldsFragment[] = [
+export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
+  const orders: Orders_party_ordersConnection_edges_node[] = [
    {
      __typename: 'Order',
      id: '066468C06549101DAF7BC51099E1412A0067DC08C246B7D8013C9D0CBF1E8EE7',
@@ -15,12 +21,12 @@ export const generateOrders = (
        id: 'market-0',
      },
      size: '10',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
+      type: OrderType.TYPE_LIMIT,
+      status: OrderStatus.STATUS_FILLED,
+      side: Side.SIDE_BUY,
      remaining: '0',
      price: '20000000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
      createdAt: new Date(2020, 1, 30).toISOString(),
      updatedAt: null,
      expiresAt: null,
@@ -36,12 +42,12 @@ export const generateOrders = (
        id: 'market-1',
      },
      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
+      type: OrderType.TYPE_LIMIT,
+      status: OrderStatus.STATUS_FILLED,
+      side: Side.SIDE_BUY,
      remaining: '0',
      price: '100',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
      createdAt: new Date(2020, 1, 29).toISOString(),
      updatedAt: null,
      expiresAt: null,
@@ -57,12 +63,12 @@ export const generateOrders = (
        id: 'market-2',
      },
      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
+      type: OrderType.TYPE_LIMIT,
+      status: OrderStatus.STATUS_FILLED,
+      side: Side.SIDE_BUY,
      remaining: '0',
      price: '20000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
      createdAt: new Date(2020, 1, 28).toISOString(),
      updatedAt: null,
      expiresAt: null,
@@ -78,12 +84,12 @@ export const generateOrders = (
        id: 'market-3',
      },
      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_ACTIVE,
-      side: Schema.Side.SIDE_BUY,
+      type: OrderType.TYPE_LIMIT,
+      status: OrderStatus.STATUS_ACTIVE,
+      side: Side.SIDE_BUY,
      remaining: '0',
      price: '100000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
      createdAt: new Date(2020, 1, 27).toISOString(),
      updatedAt: null,
      expiresAt: null,
@@ -99,12 +105,12 @@ export const generateOrders = (
        id: 'market-3',
      },
      size: '10',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_PARTIALLY_FILLED,
-      side: Schema.Side.SIDE_SELL,
+      type: OrderType.TYPE_LIMIT,
+      status: OrderStatus.STATUS_PARTIALLY_FILLED,
+      side: Side.SIDE_SELL,
      remaining: '3',
      price: '100000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+      timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
      createdAt: new Date(2020, 1, 27).toISOString(),
      updatedAt: null,
      expiresAt: null,
@@ -114,7 +120,7 @@ export const generateOrders = (
    },
  ];

-  const defaultResult: OrdersQuery = {
+  const defaultResult: Orders = {
    party: {
      id: Cypress.env('VEGA_PUBLIC_KEY'),
      ordersConnection: {
@@ -1,17 +1,10 @@
-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';
-
-export const generatePartyBalance = (
-  override?: PartialDeep<PartyBalanceQuery>
-): PartyBalanceQuery => {
-  const defaultResult: PartyBalanceQuery = {
+export const generatePartyBalance = () => {
+  return {
    party: {
      accounts: [
        {
          balance: '88474051',
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          type: 'ACCOUNT_TYPE_GENERAL',
          asset: {
            id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
            symbol: 'tDAI',
@@ -19,11 +12,11 @@ export const generatePartyBalance = (
            decimals: 5,
            __typename: 'Asset',
          },
-          __typename: 'AccountBalance',
+          __typename: 'Account',
        },
        {
          balance: '100000000',
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          type: 'ACCOUNT_TYPE_GENERAL',
          asset: {
            id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4',
            symbol: 'tEURO',
@@ -31,11 +24,11 @@ export const generatePartyBalance = (
            decimals: 5,
            __typename: 'Asset',
          },
-          __typename: 'AccountBalance',
+          __typename: 'Account',
        },
        {
          balance: '3412867',
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          type: 'ACCOUNT_TYPE_GENERAL',
          asset: {
            id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
            symbol: 'tDAI',
@@ -43,11 +36,11 @@ export const generatePartyBalance = (
            decimals: 5,
            __typename: 'Asset',
          },
-          __typename: 'AccountBalance',
+          __typename: 'Account',
        },
        {
          balance: '70007',
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          type: 'ACCOUNT_TYPE_GENERAL',
          asset: {
            id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
            symbol: 'tDAI',
@@ -55,12 +48,10 @@ export const generatePartyBalance = (
            decimals: 5,
            __typename: 'Asset',
          },
-          __typename: 'AccountBalance',
+          __typename: 'Account',
        },
      ],
      __typename: 'Party',
    },
  };
-
-  return merge(defaultResult, override);
 };
@@ -1,28 +1,14 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
 export const generatePartyMarketData = () => {
  return {
    party: {
      id: '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
      accounts: [
        {
-          type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
+          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: 'Account',
        },
      ],
      marginsConnection: { edges: null, __typename: 'MarginConnection' },
@@ -1,15 +1,14 @@
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 import type {
-  PositionsQuery,
-  PositionFieldsFragment,
-  MarginsQuery,
+  Positions,
+  Positions_party_positionsConnection_edges_node,
 } from '@vegaprotocol/positions';

 export const generatePositions = (
-  override?: PartialDeep<PositionsQuery>
-): PositionsQuery => {
-  const nodes: PositionFieldsFragment[] = [
+  override?: PartialDeep<Positions>
+): Positions => {
+  const nodes: Positions_party_positionsConnection_edges_node[] = [
    {
      __typename: 'Position',
      realisedPNL: '0',
@@ -48,7 +47,7 @@ export const generatePositions = (
    },
  ];

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

-export const emptyPositions = (): PositionsQuery => {
+export const emptyPositions = () => {
  return {
    party: {
      id: Cypress.env('VEGA_PUBLIC_KEY'),
@@ -77,7 +76,7 @@ export const emptyPositions = (): PositionsQuery => {
  };
 };

-export const generateMargins = (): MarginsQuery => {
+export const generateMargins = () => {
  return {
    party: {
      id: Cypress.env('VEGA_PUBLIC_KEY'),
@@ -120,7 +119,7 @@ export const generateMargins = (): MarginsQuery => {
          },
          {
            node: {
-              __typename: 'MarginLevels',
+              m_typename: 'MarginLevels',
              maintenanceLevel: '0',
              searchLevel: '0',
              initialLevel: '0',
@@ -9,5 +9,5 @@
    "allowJs": true,
    "types": ["cypress", "node", "cypress-real-events", "cypress-grep"]
  },
-  "include": ["src/**/*.ts", "src/**/*.js", "./declaration.d.ts"]
+  "include": ["src/**/*.ts", "src/**/*.js"]
 }
@@ -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.n01.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
@@ -1,7 +0,0 @@
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/sandbox-network.json
-NX_VEGA_URL=https://api.sandbox.vega.xyz/graphql
-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
@@ -1,10 +0,0 @@
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet1-network.json
-NX_VEGA_ENV=STAGNET1
-NX_VEGA_EXPLORER_URL=https://stagnet1.explorer.vega.xyz
-NX_VEGA_NETWORKS={\"TESTNET\":\"https://console.fairground.wtf\",\"STAGNET1\":\"https://stagnet1.console.vega.xyz\",\"STAGNET3\":\"https://stagnet3.console.vega.xyz\"}
-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
@@ -4,4 +4,4 @@ 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_EXPLORER_URL=https://staging2.explorer.vega.xyz
@@ -77,13 +77,6 @@
          "nx build console-lite"
        ]
      }
-    },
-    "build-spec": {
-      "executor": "@nrwl/workspace:run-commands",
-      "outputs": [],
-      "options": {
-        "command": "yarn tsc --project ./apps/console-lite/tsconfig.spec.json"
-      }
    }
  },
  "tags": []
@@ -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,41 +30,21 @@ 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>
                <div className="max-h-full min-h-full dark:bg-lite-black dark:text-neutral-200 bg-white text-neutral-800 grid grid-rows-[min-content,1fr]">
                  <Header />
                  <Main />
-                  <VegaConnectDialog connectors={Connectors} />
+                  <VegaConnectDialog
+                    connectors={Connectors}
+                    dialogOpen={vegaWalletDialog.connect}
+                    setDialogOpen={vegaWalletDialog.setConnect}
+                  />
                  <VegaManageDialog
                    dialogOpen={vegaWalletDialog.manage}
                    setDialogOpen={vegaWalletDialog.setManage}
@@ -0,0 +1,65 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { AccountType } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL query operation: PartyBalanceQuery
+// ====================================================
+
+export interface PartyBalanceQuery_party_accounts_asset {
+  __typename: "Asset";
+  /**
+   * The ID of the asset
+   */
+  id: string;
+  /**
+   * The symbol of the asset (e.g: GBP)
+   */
+  symbol: string;
+  /**
+   * The full name of the asset (e.g: Great British Pound)
+   */
+  name: 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;
+}
+
+export interface PartyBalanceQuery_party_accounts {
+  __typename: "Account";
+  /**
+   * Account type (General, Margin, etc)
+   */
+  type: AccountType;
+  /**
+   * Balance as string - current account balance (approx. as balances can be updated several times per second)
+   */
+  balance: string;
+  /**
+   * Asset, the 'currency'
+   */
+  asset: PartyBalanceQuery_party_accounts_asset;
+}
+
+export interface PartyBalanceQuery_party {
+  __typename: "Party";
+  /**
+   * Collateral accounts relating to a party
+   */
+  accounts: PartyBalanceQuery_party_accounts[] | null;
+}
+
+export interface PartyBalanceQuery {
+  /**
+   * An entity that is trading on the Vega network
+   */
+  party: PartyBalanceQuery_party | null;
+}
+
+export interface PartyBalanceQueryVariables {
+  partyId: string;
+}
@@ -8,7 +8,7 @@ export type PartyBalanceQueryQueryVariables = Types.Exact<{
 }>;


-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 type PartyBalanceQueryQuery = { __typename?: 'Query', party?: { __typename?: 'Party', accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } }> | null } | null };


 export const PartyBalanceQueryDocument = gql`
@@ -19,14 +19,3 @@ export const EST_FEES_TOOLTIP_TEXT = t(
 export const EST_SLIPPAGE = t(
  'When you execute a trade on Vega, the price obtained in the market may differ from the best available price displayed at the time of placing the trade. The estimated slippage shows the difference between the best available price and the estimated execution price, determined by market liquidity and your chosen order size.'
 );
-
-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_SIZE_DECIMAL = 'step';
@@ -1,25 +1,24 @@
 import React from 'react';
 import { render } from '@testing-library/react';
 import type {
-  AccountFragment,
-  DealTicketMarketFragment,
-} from '@vegaprotocol/deal-ticket';
+  PartyBalanceQuery_party_accounts,
+  PartyBalanceQuery_party_accounts_asset,
+} from './__generated__/PartyBalanceQuery';
 import { DealTicketBalance } from './deal-ticket-balance';
-import { Schema } from '@vegaprotocol/types';
+import { AccountType } from '@vegaprotocol/types';

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

-const accounts: AccountFragment[] = [
+const accounts: PartyBalanceQuery_party_accounts[] = [
  {
-    __typename: 'AccountBalance',
-    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
+    __typename: 'Account',
+    type: AccountType.ACCOUNT_TYPE_GENERAL,
    balance: '1000000',
    asset: tDAI,
  },
@@ -1,15 +1,14 @@
+import * as React from 'react';
 import classNames from 'classnames';
+import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
+import type { PartyBalanceQuery_party_accounts } from './__generated__/PartyBalanceQuery';
+import { useSettlementAccount } from '../../hooks/use-settlement-account';
 import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
-import { Schema } from '@vegaprotocol/types';
-import type {
-  AccountFragment,
-  DealTicketMarketFragment,
-} from '@vegaprotocol/deal-ticket';
-import { useSettlementAccount } from '@vegaprotocol/deal-ticket';
+import { AccountType } from '@vegaprotocol/types';

 interface DealTicketBalanceProps {
  settlementAsset: DealTicketMarketFragment['tradableInstrument']['instrument']['product']['settlementAsset'];
-  accounts: AccountFragment[];
+  accounts: PartyBalanceQuery_party_accounts[];
  isWalletConnected: boolean;
  className?: string;
 }
@@ -25,9 +24,9 @@ export const DealTicketBalance = ({
  const settlementAccount = useSettlementAccount(
    settlementAssetId,
    accounts,
-    Schema.AccountType.ACCOUNT_TYPE_GENERAL
+    AccountType.ACCOUNT_TYPE_GENERAL
  );
-  const formattedNumber =
+  const formatedNumber =
    settlementAccount?.balance &&
    settlementAccount.asset.decimals &&
    addDecimalsFormatNumber(
@@ -38,7 +37,7 @@ export const DealTicketBalance = ({
  const balance = (
    <p className="text-blue text-lg font-semibold">
      {settlementAccount
-        ? t(`${formattedNumber}`)
+        ? t(`${formatedNumber}`)
        : `No ${settlementAssetSymbol} left to trade`}
    </p>
  );
@@ -1,8 +1,9 @@
+import * as React from 'react';
 import { useParams } from 'react-router-dom';
+import { gql, useQuery } from '@apollo/client';
 import {
  DealTicketManager,
  DealTicketContainer as Container,
-  usePartyBalanceQuery,
 } from '@vegaprotocol/deal-ticket';
 import { Loader } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/react-helpers';
@@ -10,20 +11,41 @@ import { useVegaWallet } from '@vegaprotocol/wallet';
 import { DealTicketSteps } from './deal-ticket-steps';
 import { DealTicketBalance } from './deal-ticket-balance';
 import Baubles from './baubles-decor';
+import type { PartyBalanceQuery } from './__generated__/PartyBalanceQuery';
 import ConnectWallet from '../wallet-connector';

 const tempEmptyText = (
  <p>{t('Please select a market from the markets page')}</p>
 );

+const PARTY_BALANCE_QUERY = gql`
+  query PartyBalanceQuery($partyId: ID!) {
+    party(id: $partyId) {
+      accounts {
+        type
+        balance
+        asset {
+          id
+          symbol
+          name
+          decimals
+        }
+      }
+    }
+  }
+`;
+
 export const DealTicketContainer = () => {
  const { marketId } = useParams<{ marketId: string }>();
  const { pubKey } = useVegaWallet();

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

  const loader = <Loader />;

@@ -48,7 +70,7 @@ export const DealTicketContainer = () => {
        return (
          <DealTicketManager market={data.market}>
            {loading ? loader : balance}
-            <DealTicketSteps market={data.market} />
+            <DealTicketSteps market={data.market} partyData={partyData} />
          </DealTicketManager>
        );
      }}
@@ -1,9 +1,10 @@
 import React from 'react';
 import type { ReactNode } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
-import { Icon, Tooltip, TrafficLight } from '@vegaprotocol/ui-toolkit';
+import { Icon, Tooltip } from '@vegaprotocol/ui-toolkit';
 import { IconNames } from '@blueprintjs/icons';
 import * as constants from './constants';
+import { TrafficLight } from '../traffic-light';

 interface DealTicketEstimatesProps {
  quoteName?: string;
@@ -16,6 +17,45 @@ interface DealTicketEstimatesProps {
  slippage?: string;
 }

+interface DataTitleProps {
+  children: ReactNode;
+  quoteName?: string;
+}
+
+export const DataTitle = ({ children, quoteName = '' }: DataTitleProps) => (
+  <dt>
+    {children}
+    {quoteName && <small> ({quoteName})</small>}
+  </dt>
+);
+
+interface ValueTooltipProps {
+  value?: string;
+  children?: ReactNode;
+  description: string;
+  id?: string;
+}
+
+export const ValueTooltipRow = ({
+  value,
+  children,
+  description,
+  id,
+}: ValueTooltipProps) => (
+  <dd className="flex gap-x-2 items-center">
+    {value || children}
+    <Tooltip align="center" description={description}>
+      <div className="cursor-help" id={id || ''} tabIndex={-1}>
+        <Icon
+          name={IconNames.ISSUE}
+          className="block rotate-180"
+          ariaLabel={description}
+        />
+      </div>
+    </Tooltip>
+  </dd>
+);
+
 export const DealTicketEstimates = ({
  price,
  quoteName,
@@ -91,42 +131,3 @@ export const DealTicketEstimates = ({
    )}
  </dl>
 );
-
-interface DataTitleProps {
-  children: ReactNode;
-  quoteName?: string;
-}
-
-export const DataTitle = ({ children, quoteName = '' }: DataTitleProps) => (
-  <dt>
-    {children}
-    {quoteName && <small> ({quoteName})</small>}
-  </dt>
-);
-
-interface ValueTooltipProps {
-  value?: string;
-  children?: ReactNode;
-  description: string;
-  id?: string;
-}
-
-export const ValueTooltipRow = ({
-  value,
-  children,
-  description,
-  id,
-}: ValueTooltipProps) => (
-  <dd className="flex gap-x-2 items-center">
-    {value || children}
-    <Tooltip align="center" description={description}>
-      <div className="cursor-help" id={id || ''} tabIndex={-1}>
-        <Icon
-          name={IconNames.ISSUE}
-          className="block rotate-180"
-          ariaLabel={description}
-        />
-      </div>
-    </Tooltip>
-  </dd>
-);
@@ -1,4 +1,5 @@
-import { DealTicketEstimates } from '@vegaprotocol/deal-ticket';
+import React from 'react';
+import { DealTicketEstimates } from './deal-ticket-estimates';
 import { DealTicketSizeInput } from './deal-ticket-size-input';

 interface DealTicketSizeProps {
@@ -1,19 +1,11 @@
 import React, { useCallback, useState } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
-import {
-  Dialog,
-  Icon,
-  Intent,
-  Tooltip,
-  TrafficLight,
-} from '@vegaprotocol/ui-toolkit';
+import * as constants from './constants';
+import { TrafficLight } from '../traffic-light';
+import { Dialog, Icon, Intent, Tooltip } from '@vegaprotocol/ui-toolkit';
 import { InputSetter } from '../../components/input-setter';
 import { IconNames } from '@blueprintjs/icons';
-import {
-  DataTitle,
-  EST_SLIPPAGE,
-  ValueTooltipRow,
-} from '@vegaprotocol/deal-ticket';
+import { DataTitle, ValueTooltipRow } from './deal-ticket-estimates';

 interface DealTicketSlippageProps {
  step?: number;
@@ -48,12 +40,12 @@ export const DealTicketSlippage = ({
  const formLabel = (
    <label className="flex items-center mb-1">
      <span className="mr-1">{t('Adjust slippage tolerance')}</span>
-      <Tooltip align="center" description={EST_SLIPPAGE}>
+      <Tooltip align="center" description={constants.EST_SLIPPAGE}>
        <div className="cursor-help" tabIndex={-1}>
          <Icon
            name={IconNames.ISSUE}
            className="block rotate-180"
-            ariaLabel={EST_SLIPPAGE}
+            ariaLabel={constants.EST_SLIPPAGE}
          />
        </div>
      </Tooltip>
@@ -91,7 +83,7 @@ export const DealTicketSlippage = ({
          <DataTitle>{t('Est. Price Impact / Slippage')}</DataTitle>
          <div className="flex">
            <div className="mr-1">
-              <ValueTooltipRow description={EST_SLIPPAGE}>
+              <ValueTooltipRow description={constants.EST_SLIPPAGE}>
                <TrafficLight value={value} q1={1} q2={5}>
                  {value}%
                </TrafficLight>
@@ -3,13 +3,6 @@ import { useNavigate } from 'react-router-dom';
 import { useForm, Controller } from 'react-hook-form';
 import { Stepper } from '../stepper';
 import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
-import {
-  useOrderCloseOut,
-  useOrderMargin,
-  usePartyBalanceQuery,
-  useMaximumPositionSize,
-  useCalculateSlippage,
-} from '@vegaprotocol/deal-ticket';
 import {
  getDefaultOrder,
  useOrderValidation,
@@ -19,16 +12,12 @@ import { InputError } from '@vegaprotocol/ui-toolkit';
 import { BigNumber } from 'bignumber.js';
 import { MarketSelector } from '@vegaprotocol/deal-ticket';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
-import { useVegaWallet } from '@vegaprotocol/wallet';
-import { VegaTxStatus } from '@vegaprotocol/wallet';
+import { useVegaWallet, VegaTxStatus } from '@vegaprotocol/wallet';
 import {
  t,
+  addDecimalsFormatNumber,
  toDecimal,
  removeDecimal,
-  addDecimalsFormatNumber,
-  addDecimalsNormalizeNumber,
-  addDecimal,
-  formatNumber,
 } from '@vegaprotocol/react-helpers';
 import {
  useOrderSubmit,
@@ -41,14 +30,23 @@ import { DealTicketSize } from './deal-ticket-size';
 import MarketNameRenderer from '../simple-market-list/simple-market-renderer';
 import SideSelector, { SIDE_NAMES } from './side-selector';
 import ReviewTrade from './review-trade';
-import { Schema } from '@vegaprotocol/types';
+import type { PartyBalanceQuery } from './__generated__/PartyBalanceQuery';
+import useOrderCloseOut from '../../hooks/use-order-closeout';
+import useOrderMargin from '../../hooks/use-order-margin';
+import useMaximumPositionSize from '../../hooks/use-maximum-position-size';
+import useCalculateSlippage from '../../hooks/use-calculate-slippage';
+import { Side, OrderType } from '@vegaprotocol/types';
 import { DealTicketSlippage } from './deal-ticket-slippage';

 interface DealTicketMarketProps {
  market: DealTicketMarketFragment;
+  partyData?: PartyBalanceQuery;
 }

-export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
+export const DealTicketSteps = ({
+  market,
+  partyData,
+}: DealTicketMarketProps) => {
  const navigate = useNavigate();
  const setMarket = useCallback(
    (marketId: string) => {
@@ -70,30 +68,28 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {

  const emptyString = ' - ';
  const step = toDecimal(market.positionDecimalPlaces);
+  const orderType = watch('type');
+  const orderTimeInForce = watch('timeInForce');
+  const orderSide = watch('side');
+  const orderSize = watch('size');
  const order = watch();
+  const { message: invalidText, isDisabled } = useOrderValidation({
+    market,
+    orderType,
+    orderTimeInForce,
+    fieldErrors: errors,
+  });
+  const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();
  const { pubKey } = useVegaWallet();
  const estMargin = useOrderMargin({
    order,
    market,
    partyId: pubKey || '',
  });
-  const { message: invalidText, isDisabled } = useOrderValidation({
-    market,
-    orderType: order.type,
-    orderTimeInForce: order.timeInForce,
-    fieldErrors: errors,
-    estMargin,
-  });
-  const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();
-
-  const { data: partyBalance } = usePartyBalanceQuery({
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });

  const maxTrade = useMaximumPositionSize({
    partyId: pubKey || '',
-    accounts: partyBalance?.party?.accounts || [],
+    accounts: partyData?.party?.accounts || [],
    marketId: market.id,
    settlementAssetId:
      market.tradableInstrument.instrument.product.settlementAsset.id,
@@ -101,11 +97,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
    order,
  });

-  const estCloseOut = useOrderCloseOut({
-    order,
-    market,
-    partyData: partyBalance,
-  });
+  const estCloseOut = useOrderCloseOut({ order, market, partyData });
  const slippage = useCalculateSlippage({ marketId: market.id, order });
  const [slippageValue, setSlippageValue] = useState(
    slippage ? parseFloat(slippage) : 0
@@ -122,7 +114,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {

  const price = useMemo(() => {
    if (slippage && market?.depth?.lastTrade?.price) {
-      const isLong = order.side === Schema.Side.SIDE_BUY;
+      const isLong = order.side === Side.SIDE_BUY;
      const multiplier = new BigNumber(1)[isLong ? 'plus' : 'minus'](
        parseFloat(slippage) / 100
      );
@@ -138,32 +130,26 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {

  const notionalSize = useMemo(() => {
    if (price) {
-      const size = new BigNumber(price).multipliedBy(order.size).toNumber();
+      const size = new BigNumber(price).multipliedBy(orderSize).toNumber();

      return addDecimalsFormatNumber(size, market.decimalPlaces);
    }
    return null;
-  }, [market.decimalPlaces, order.size, price]);
-
-  const assetDecimals =
-    market.tradableInstrument.instrument.product.settlementAsset.decimals;
+  }, [market.decimalPlaces, orderSize, price]);

  const fees = useMemo(() => {
-    if (estMargin?.totalFees && notionalSize) {
-      const percentage = new BigNumber(estMargin?.totalFees)
+    if (estMargin?.fees && notionalSize) {
+      const percentage = new BigNumber(estMargin?.fees)
        .dividedBy(notionalSize)
        .multipliedBy(100)
        .decimalPlaces(2)
        .toString();

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

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

  const max = useMemo(() => {
    return new BigNumber(maxTrade)
@@ -171,10 +157,6 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
      .toNumber();
  }, [market.positionDecimalPlaces, maxTrade]);

-  useEffect(() => {
-    setSlippageValue(slippage ? parseFloat(slippage) : 0);
-  }, [slippage]);
-
  const onSizeChange = useCallback(
    (value: number) => {
      const newVal = new BigNumber(value)
@@ -192,7 +174,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
    (value: number) => {
      if (market?.depth?.lastTrade?.price) {
        if (value) {
-          const isLong = order.side === Schema.Side.SIDE_BUY;
+          const isLong = order.side === Side.SIDE_BUY;
          const multiplier = new BigNumber(1)[isLong ? 'plus' : 'minus'](
            value / 100
          );
@@ -203,11 +185,11 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {

          setValue('price', bestAskPrice);

-          if (order.type === Schema.OrderType.TYPE_MARKET) {
-            setValue('type', Schema.OrderType.TYPE_LIMIT);
+          if (orderType === OrderType.TYPE_MARKET) {
+            setValue('type', OrderType.TYPE_LIMIT);
          }
        } else {
-          setValue('type', Schema.OrderType.TYPE_MARKET);
+          setValue('type', OrderType.TYPE_MARKET);
          setValue('price', market?.depth?.lastTrade?.price);
        }
      }
@@ -217,8 +199,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
      market.decimalPlaces,
      market?.depth?.lastTrade?.price,
      order.side,
-      order.type,
-      setSlippageValue,
+      orderType,
      setValue,
    ]
  );
@@ -265,7 +246,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
          )}
        />
      ),
-      value: SIDE_NAMES[order.side] || '',
+      value: SIDE_NAMES[orderSide] || '',
    },
    {
      label: t('Choose Position Size'),
@@ -277,7 +258,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
              min={step}
              max={max}
              onSizeChange={onSizeChange}
-              size={new BigNumber(order.size).toNumber()}
+              size={new BigNumber(orderSize).toNumber()}
              name="size"
              price={formattedPrice || emptyString}
              positionDecimalPlaces={market.positionDecimalPlaces}
@@ -286,7 +267,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
                  .symbol
              }
              notionalSize={notionalSize || emptyString}
-              estCloseOut={estCloseOut || emptyString}
+              estCloseOut={estCloseOut}
              fees={fees || emptyString}
              estMargin={estMargin?.margin || emptyString}
            />
@@ -296,9 +277,9 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
            />
          </>
        ) : (
-          t('Loading...')
+          'loading...'
        ),
-      value: order.size,
+      value: orderSize,
    },
    {
      label: t('Review Trade'),
@@ -316,7 +297,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
            isDisabled={isDisabled}
            transactionStatus={transactionStatus}
            order={order}
-            estCloseOut={estCloseOut || emptyString}
+            estCloseOut={estCloseOut}
            estMargin={estMargin?.margin || emptyString}
            price={formattedPrice || emptyString}
            quoteName={
@@ -331,15 +312,9 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
            title={getOrderDialogTitle(finalizedOrder?.status)}
            intent={getOrderDialogIntent(finalizedOrder?.status)}
            icon={getOrderDialogIcon(finalizedOrder?.status)}
-            content={{
-              Complete: (
-                <OrderFeedback
-                  transaction={transaction}
-                  order={finalizedOrder}
-                />
-              ),
-            }}
-          />
+          >
+            <OrderFeedback transaction={transaction} order={finalizedOrder} />
+          </Dialog>
        </div>
      ),
      disabled: true,
@@ -4,18 +4,19 @@ import {
  KeyValueTable,
  KeyValueTableRow,
 } from '@vegaprotocol/ui-toolkit';
+import * as React from 'react';
 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 SimpleMarketExpires from '../simple-market-list/simple-market-expires';
 import { gql, useQuery } from '@apollo/client';
 import type {
  MarketTags,
  MarketTagsVariables,
 } from './__generated__/MarketTags';
-import { Schema } from '@vegaprotocol/types';
-import { MarketExpires } from '@vegaprotocol/market-info';
+import { DealTicketEstimates } from './deal-ticket-estimates';
+import { Side } from '@vegaprotocol/types';

 export const MARKET_TAGS_QUERY = gql`
  query MarketTags($marketId: ID!) {
@@ -72,10 +73,9 @@ export default ({
            <div
              className={classNames(
                {
-                  'buyButton dark:buyButtonDark':
-                    order.side === Schema.Side.SIDE_BUY,
+                  'buyButton dark:buyButtonDark': order.side === Side.SIDE_BUY,
                  'sellButton dark:sellButtonDark':
-                    order.side === Schema.Side.SIDE_SELL,
+                    order.side === Side.SIDE_SELL,
                },
                'px-2 py-1 inline text-ui-small'
              )}
@@ -86,7 +86,7 @@ export default ({
            <div>
              {tagsData?.market?.tradableInstrument.instrument.metadata
                .tags && (
-                <MarketExpires
+                <SimpleMarketExpires
                  tags={
                    tagsData?.market.tradableInstrument.instrument.metadata.tags
                  }
@@ -2,16 +2,16 @@ import React from 'react';
 import classNames from 'classnames';
 import { FormGroup } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/react-helpers';
-import { Schema } from '@vegaprotocol/types';
+import { Side } from '@vegaprotocol/types';

 interface SideSelectorProps {
-  value: Schema.Side;
-  onSelect: (side: Schema.Side) => void;
+  value: Side;
+  onSelect: (side: Side) => void;
 }

-export const SIDE_NAMES: Record<Schema.Side, string> = {
-  [Schema.Side.SIDE_BUY]: t('Long'),
-  [Schema.Side.SIDE_SELL]: t('Short'),
+export const SIDE_NAMES: Record<Side, string> = {
+  [Side.SIDE_BUY]: t('Long'),
+  [Side.SIDE_SELL]: t('Short'),
 };

 export default ({ value, onSelect }: SideSelectorProps) => {
@@ -31,9 +31,9 @@ export default ({ value, onSelect }: SideSelectorProps) => {
          className={classNames(
            'px-8 py-2',
            'buyButton hover:buyButton dark:buyButtonDark dark:hover:buyButtonDark',
-            { selected: value === Schema.Side.SIDE_BUY }
+            { selected: value === Side.SIDE_BUY }
          )}
-          onClick={() => onSelect(Schema.Side.SIDE_BUY)}
+          onClick={() => onSelect(Side.SIDE_BUY)}
        >
          {t('Long')}
        </button>
@@ -43,9 +43,9 @@ export default ({ value, onSelect }: SideSelectorProps) => {
          className={classNames(
            'px-8 py-2',
            'sellButton hover:sellButton dark:sellButtonDark dark:hover:sellButtonDark',
-            { selected: value === Schema.Side.SIDE_SELL }
+            { selected: value === Side.SIDE_SELL }
          )}
-          onClick={() => onSelect(Schema.Side.SIDE_SELL)}
+          onClick={() => onSelect(Side.SIDE_SELL)}
        >
          {t('Short')}
        </button>
@@ -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,22 +1,61 @@
-import { useState } from 'react';
-import { t } from '@vegaprotocol/react-helpers';
-import { Button } from '@vegaprotocol/ui-toolkit';
-import { DepositDialog } from '@vegaprotocol/deposits';
+import { gql, useQuery } from '@apollo/client';
+import { DepositManager } from '@vegaprotocol/deposits';
+import { getEnabledAssets, t } from '@vegaprotocol/react-helpers';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
+import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
+import { useVegaWallet } from '@vegaprotocol/wallet';
+import { Web3Container } from '@vegaprotocol/web3';
+import type { DepositAssets } from './__generated__/DepositAssets';
+
+const DEPOSITS_QUERY = gql`
+  query DepositAssets {
+    assetsConnection {
+      edges {
+        node {
+          id
+          name
+          symbol
+          decimals
+          status
+          source {
+            ... on ERC20 {
+              contractAddress
+            }
+          }
+        }
+      }
+    }
+  }
+`;

 /**
 *  Fetches data required for the Deposit page
 */
 export const DepositContainer = () => {
-  const [depositDialog, setDepositDialog] = useState(false);
+  const { VEGA_ENV } = useEnvironment();
+  const { pubKey } = useVegaWallet();
+
+  const { data, loading, error } = useQuery<DepositAssets>(DEPOSITS_QUERY, {
+    variables: { partyId: pubKey },
+    skip: !pubKey,
+  });
+
+  const assets = getEnabledAssets(data);
+
  return (
-    <div>
-      <DepositDialog
-        depositDialog={depositDialog}
-        setDepositDialog={setDepositDialog}
-      />
-      <Button size="sm" onClick={() => setDepositDialog(true)}>
-        {t('Make deposit')}
-      </Button>
-    </div>
+    <AsyncRenderer<DepositAssets> data={data} loading={loading} error={error}>
+      {assets.length ? (
+        <Web3Container>
+          <DepositManager
+            assets={assets}
+            isFaucetable={VEGA_ENV !== Networks.MAINNET}
+          />
+        </Web3Container>
+      ) : (
+        <Splash>
+          <p>{t('No assets on this network')}</p>
+        </Splash>
+      )}
+    </AsyncRenderer>
  );
 };
@@ -1,16 +1,12 @@
 import React, { useContext } from 'react';
 import { ThemeSwitcher } from '@vegaprotocol/ui-toolkit';
-import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import Logo from './logo';
 import { VegaWalletConnectButton } from '../vega-wallet-connect-button';
 import LocalContext from '../../context/local-context';

 const Header = () => {
-  const { updateVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
-    updateVegaWalletDialog: store.updateVegaWalletDialog,
-  }));
  const {
-    vegaWalletDialog: { setManage },
+    vegaWalletDialog: { setConnect, setManage },
    theme,
    toggleTheme,
  } = useContext(LocalContext);
@@ -22,7 +18,7 @@ const Header = () => {
      <Logo />
      <div className="flex items-center gap-2 ml-auto relative z-10">
        <VegaWalletConnectButton
-          setConnectDialog={updateVegaWalletDialog}
+          setConnectDialog={setConnect}
          setManageDialog={setManage}
        />
        <ThemeSwitcher theme={theme} onToggle={toggleTheme} className="-my-4" />
@@ -22,9 +22,15 @@ const AccountsManager = () => {
  const variables = useMemo(() => ({ partyId }), [partyId]);
  const update = useCallback(
    ({ data }: { data: AccountFields[] | null }) => {
-      dataRef.current = data;
-      gridRef.current?.api?.refreshInfiniteCache();
-      return true;
+      if (!gridRef.current?.api) {
+        return false;
+      }
+      if (dataRef.current?.length) {
+        dataRef.current = data;
+        gridRef.current.api.refreshInfiniteCache();
+        return true;
+      }
+      return false;
    },
    [gridRef]
  );
@@ -33,6 +39,7 @@ const AccountsManager = () => {
    update,
    variables,
  });
+  dataRef.current = data;
  const getRows = async ({
    successCallback,
    startRow,
@@ -12,7 +12,7 @@ import {
  t,
 } from '@vegaprotocol/react-helpers';
 import BigNumber from 'bignumber.js';
-import { Schema } from '@vegaprotocol/types';
+import { Side } from '@vegaprotocol/types';

 interface Props {
  partyId: string;
@@ -118,13 +118,13 @@ const useColumnDefinitions = ({ partyId }: Props) => {
            const taker = t('Taker');
            const maker = t('Maker');
            if (data?.buyer.id === partyId) {
-              if (value === Schema.Side.SIDE_BUY) {
+              if (value === Side.SIDE_BUY) {
                return taker;
              } else {
                return maker;
              }
            } else if (data?.seller.id === partyId) {
-              if (value === Schema.Side.SIDE_SELL) {
+              if (value === Side.SIDE_SELL) {
                return taker;
              } else {
                return maker;
@@ -65,28 +65,22 @@ const OrdersManager = () => {
        defaultColDef={defaultColDef}
      />
      <orderCancel.Dialog
-        title={getCancelDialogTitle(orderCancel)}
-        intent={getCancelDialogIntent(orderCancel)}
-        content={{
-          Complete: (
-            <OrderFeedback
-              transaction={orderCancel.transaction}
-              order={orderCancel.cancelledOrder}
-            />
-          ),
-        }}
-      />
+        title={getCancelDialogTitle(orderCancel.cancelledOrder?.status)}
+        intent={getCancelDialogIntent(orderCancel.cancelledOrder?.status)}
+      >
+        <OrderFeedback
+          transaction={orderCancel.transaction}
+          order={orderCancel.cancelledOrder}
+        />
+      </orderCancel.Dialog>
      <orderEdit.Dialog
        title={getEditDialogTitle(orderEdit.updatedOrder?.status)}
-        content={{
-          Complete: (
-            <OrderFeedback
-              transaction={orderEdit.transaction}
-              order={orderEdit.updatedOrder}
-            />
-          ),
-        }}
-      />
+      >
+        <OrderFeedback
+          transaction={orderEdit.transaction}
+          order={orderEdit.updatedOrder}
+        />
+      </orderEdit.Dialog>
      {editOrder && (
        <OrderEditDialog
          isOpen={Boolean(editOrder)}
@@ -96,7 +90,7 @@ const OrdersManager = () => {
          order={editOrder}
          onSubmit={(fields) => {
            setEditOrder(null);
-            orderEdit.edit({ price: fields.limitPrice });
+            orderEdit.edit({ price: fields.entryPrice });
          }}
        />
      )}
@@ -11,14 +11,20 @@ import {
  positiveClassNames,
  t,
 } from '@vegaprotocol/react-helpers';
-import type { OrderFieldsFragment, Order } from '@vegaprotocol/orders';
-import type { OrderCancellationBody } from '@vegaprotocol/wallet';
+import type {
+  Orders_party_ordersConnection_edges_node,
+  Order,
+  CancelOrderArgs,
+} from '@vegaprotocol/orders';
 import { isOrderActive } from '@vegaprotocol/orders';
 import {
  OrderRejectionReasonMapping,
+  OrderStatus,
+  OrderType,
  OrderStatusMapping,
  OrderTypeMapping,
-  Schema,
+  Side,
+  OrderTimeInForce,
  OrderTimeInForceMapping,
 } from '@vegaprotocol/types';

@@ -31,7 +37,7 @@ type OrderTimeKey = keyof typeof OrderTimeInForceMapping;
 interface Props {
  setEditOrder: (order: Order) => void;
  orderCancel: {
-    cancel: (args: OrderCancellationBody['orderCancellation']) => void;
+    cancel: (args: CancelOrderArgs) => void;
    [key: string]: unknown;
  };
 }
@@ -54,15 +60,21 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
        cellClass: 'font-mono !flex h-full items-center',
        width: 80,
        cellClassRules: {
-          [positiveClassNames]: ({ data }: { data: OrderFieldsFragment }) =>
-            data?.side === Schema.Side.SIDE_BUY,
-          [negativeClassNames]: ({ data }: { data: OrderFieldsFragment }) =>
-            data?.side === Schema.Side.SIDE_SELL,
+          [positiveClassNames]: ({
+            data,
+          }: {
+            data: Orders_party_ordersConnection_edges_node;
+          }) => data?.side === Side.SIDE_BUY,
+          [negativeClassNames]: ({
+            data,
+          }: {
+            data: Orders_party_ordersConnection_edges_node;
+          }) => data?.side === Side.SIDE_SELL,
        },
        valueFormatter: ({ value, data }: ValueFormatterParams) => {
          if (value && data && data.market) {
            const prefix = data
-              ? data.side === Schema.Side.SIDE_BUY
+              ? data.side === Side.SIDE_BUY
                ? '+'
                : '-'
              : '';
@@ -80,8 +92,8 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
        valueFormatter: ({
          value,
        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['type'];
-        }) => OrderTypeMapping[value as Schema.OrderType],
+          value?: Orders_party_ordersConnection_edges_node['type'];
+        }) => OrderTypeMapping[value as OrderType],
      },
      {
        colId: 'status',
@@ -94,7 +106,7 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
          value?: StatusKey;
        }) => {
          if (value && data && data.market) {
-            if (value === Schema.OrderStatus.STATUS_REJECTED) {
+            if (value === OrderStatus.STATUS_REJECTED) {
              return `${OrderStatusMapping[value as StatusKey]}: ${
                data.rejectionReason &&
                OrderRejectionReasonMapping[
@@ -118,7 +130,7 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
          data,
          value,
        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['remaining'];
+          value?: Orders_party_ordersConnection_edges_node['remaining'];
        }) => {
          if (value && data && data.market) {
            const dps = data.market.positionDecimalPlaces;
@@ -144,13 +156,13 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
          value,
          data,
        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['price'];
+          value?: Orders_party_ordersConnection_edges_node['price'];
        }) => {
          if (
            value === undefined ||
            !data ||
            !data.market ||
-            data.type === Schema.OrderType.TYPE_MARKET
+            data.type === OrderType.TYPE_MARKET
          ) {
            return '-';
          }
@@ -169,7 +181,7 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
        }) => {
          if (value && data?.market) {
            if (
-              value === Schema.OrderTimeInForce.TIME_IN_FORCE_GTT &&
+              value === OrderTimeInForce.TIME_IN_FORCE_GTT &&
              data.expiresAt
            ) {
              const expiry = getDateTimeFormat().format(
@@ -191,7 +203,7 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
        valueFormatter: ({
          value,
        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['createdAt'];
+          value?: Orders_party_ordersConnection_edges_node['createdAt'];
        }) => {
          return value ? getDateTimeFormat().format(new Date(value)) : value;
        },
@@ -203,7 +215,7 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
        valueFormatter: ({
          value,
        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['updatedAt'];
+          value?: Orders_party_ordersConnection_edges_node['updatedAt'];
        }) => {
          return value ? getDateTimeFormat().format(new Date(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>
  );
 };
@@ -7,7 +7,10 @@ import {
  signedNumberCssClassRules,
  t,
 } from '@vegaprotocol/react-helpers';
-import type { Position } from '@vegaprotocol/positions';
+import type {
+  PositionsTableValueFormatterParams,
+  Position,
+} from '@vegaprotocol/positions';
 import { AmountCell } from '@vegaprotocol/positions';
 import type {
  CellRendererSelectorResult,
@@ -16,8 +19,7 @@ import type {
  GroupCellRendererParams,
  ColDef,
 } from 'ag-grid-community';
-import { Schema } from '@vegaprotocol/types';
-import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
+import { MarketTradingMode } from '@vegaprotocol/types';
 import { Intent, ProgressBarCell } from '@vegaprotocol/ui-toolkit';

 const EmptyCell = () => '';
@@ -75,7 +77,9 @@ const useColumnDefinitions = () => {
          value,
          data,
          node,
-        }: VegaValueFormatterParams<Position, 'openVolume'>) => {
+        }: PositionsTableValueFormatterParams & {
+          value: Position['openVolume'];
+        }) => {
          let ret;
          if (value && data) {
            ret = node?.rowPinned
@@ -103,13 +107,15 @@ const useColumnDefinitions = () => {
          value,
          data,
          node,
-        }: VegaValueFormatterParams<Position, 'markPrice'>) => {
+        }: PositionsTableValueFormatterParams & {
+          value: Position['markPrice'];
+        }) => {
          if (
            data &&
            value &&
            node?.rowPinned &&
            data.marketTradingMode ===
-              Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION
+              MarketTradingMode.TRADING_MODE_OPENING_AUCTION
          ) {
            return addDecimalsFormatNumber(
              value.toString(),
@@ -180,8 +186,9 @@ const useColumnDefinitions = () => {
        valueFormatter: ({
          value,
          node,
-        }: VegaValueFormatterParams<Position, 'currentLeverage'>) =>
-          value === undefined ? '' : formatNumber(value.toString(), 1),
+        }: PositionsTableValueFormatterParams & {
+          value: Position['currentLeverage'];
+        }) => (value === undefined ? '' : formatNumber(value.toString(), 1)),
      },
      {
        colId: 'marginallocated',
@@ -222,8 +229,10 @@ const useColumnDefinitions = () => {
        valueFormatter: ({
          value,
          data,
-        }: VegaValueFormatterParams<Position, 'realisedPNL'>) =>
-          value === undefined || data === undefined
+        }: PositionsTableValueFormatterParams & {
+          value: Position['realisedPNL'];
+        }) =>
+          value === undefined
            ? ''
            : addDecimalsFormatNumber(value.toString(), data.decimals),
        cellRenderer: 'PriceFlashCell',
@@ -240,8 +249,10 @@ const useColumnDefinitions = () => {
        valueFormatter: ({
          value,
          data,
-        }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
-          value === undefined || data === undefined
+        }: PositionsTableValueFormatterParams & {
+          value: Position['unrealisedPNL'];
+        }) =>
+          value === undefined
            ? ''
            : addDecimalsFormatNumber(value.toString(), data.decimals),
        cellRenderer: 'PriceFlashCell',
@@ -255,7 +266,9 @@ const useColumnDefinitions = () => {
        type: 'rightAligned',
        valueFormatter: ({
          value,
-        }: VegaValueFormatterParams<Position, 'updatedAt'>) => {
+        }: PositionsTableValueFormatterParams & {
+          value: Position['updatedAt'];
+        }) => {
          if (!value) {
            return '';
          }
@@ -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 = `
@@ -1,22 +1,8 @@
-import { render, screen } from '@testing-library/react';
 import React from 'react';
+import { render, screen } from '@testing-library/react';
+import SimpleMarketExpires from './simple-market-expires';

-import { MarketExpires } from './market-expires';
-
-jest.mock('@vegaprotocol/react-helpers', () => ({
-  t: jest.fn().mockImplementation((text) => text),
-  getDateTimeFormat: () =>
-    Intl.DateTimeFormat('en-GB', {
-      year: 'numeric',
-      month: 'numeric',
-      day: 'numeric',
-      hour: 'numeric',
-      minute: 'numeric',
-      second: 'numeric',
-    }),
-}));
-
-describe('MarketExpires', () => {
+describe('SimpleMarketExpires', () => {
  describe('should properly parse different tags', () => {
    it('settlement:date', () => {
      const tags = [
@@ -26,8 +12,8 @@ describe('MarketExpires', () => {
        'settlement:notadate',
        'settlement:20220525T1200',
      ];
-      render(<MarketExpires tags={tags} />);
-      expect(screen.getByText('25/05/2022, 12:00:00')).toBeInTheDocument();
+      render(<SimpleMarketExpires tags={tags} />);
+      expect(screen.getByText('May 25')).toBeInTheDocument();
    });

    it('settlement-date:date', () => {
@@ -36,8 +22,8 @@ describe('MarketExpires', () => {
        'settlement:20220525T1200',
        'settlement-date:2022-04-25T1200',
      ];
-      render(<MarketExpires tags={tags} />);
-      expect(screen.getByText('25/04/2022, 12:00:00')).toBeInTheDocument();
+      render(<SimpleMarketExpires tags={tags} />);
+      expect(screen.getByText('Apr 25')).toBeInTheDocument();
    });

    it('last one proper tag should matter', () => {
@@ -46,8 +32,8 @@ describe('MarketExpires', () => {
        'settlement-date:20220525T1200',
        'settlement-expiry-date:2022-03-25T12:00:00',
      ];
-      render(<MarketExpires tags={tags} />);
-      expect(screen.getByText('25/03/2022, 12:00:00')).toBeInTheDocument();
+      render(<SimpleMarketExpires tags={tags} />);
+      expect(screen.getByText('Mar 25')).toBeInTheDocument();
    });

    it('when no proper tag nor date should be null', () => {
@@ -56,7 +42,7 @@ describe('MarketExpires', () => {
        'settlemenz:20220525T1200',
        'settlemenx-date:20220425T1200',
      ];
-      const { container } = render(<MarketExpires tags={tags} />);
+      const { container } = render(<SimpleMarketExpires tags={tags} />);
      expect(container.firstChild).toBeNull();
    });
  });
@@ -0,0 +1,34 @@
+import React from 'react';
+import { format, isValid, parseISO } from 'date-fns';
+import { EXPIRE_DATE_FORMAT } from '../../constants';
+
+const SimpleMarketExpires = ({
+  tags,
+}: {
+  tags?: ReadonlyArray<string> | null;
+}) => {
+  if (tags) {
+    const dateFound = tags.reduce<Date | null>((agg, tag) => {
+      const parsed = parseISO(
+        (tag.match(/^settlement.*:/) &&
+          tag
+            .split(':')
+            .filter((item, i) => i)
+            .join(':')) as string
+      );
+      if (isValid(parsed)) {
+        agg = parsed;
+      }
+      return agg;
+    }, null);
+    return dateFound ? (
+      <div className="p-2 text-ui-small border border-pink text-pink inline-block">{`${format(
+        dateFound as Date,
+        EXPIRE_DATE_FORMAT
+      )}`}</div>
+    ) : null;
+  }
+  return null;
+};
+
+export default SimpleMarketExpires;
@@ -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(
@@ -4,16 +4,16 @@ import type { AgGridReact } from 'ag-grid-react';
 import {
  useScreenDimensions,
  useDataProvider,
-  useYesterday,
 } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import type { MarketState } from '@vegaprotocol/types';
 import useMarketsFilterData from './use-markets-filter-data';
 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 +30,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(() => {
+    const yesterday = Math.round(new Date().getTime() / 1000) - 24 * 3600;
    return {
-      since: new Date(yesterday).toISOString(),
-      interval: Schema.Interval.INTERVAL_I1H,
+      since: new Date(yesterday * 1000).toISOString(),
+      interval: Interval.INTERVAL_I1H,
    };
-  }, [yesterday]);
+  }, []);
  const { data, error, loading } = useDataProvider({
    dataProvider: marketsWithCandlesProvider,
    variables,
-    skipUpdates: true,
+    noUpdate: true,
  });
  const localData = useMarketsFilterData(data, params);

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

  useEffect(() => {
-    const statuses: Record<string, Schema.MarketState | ''> = {};
+    const statuses: Record<string, MarketState | ''> = {};
    data?.forEach((market) => {
      statuses[market.id] = market.state || '';
    });
@@ -1,10 +1,10 @@
 import { useEffect, useState } from 'react';
 import classNames from 'classnames';
 import { InView } from 'react-intersection-observer';
-import { useDataProvider, useYesterday } from '@vegaprotocol/react-helpers';
+import { useDataProvider } 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;
@@ -68,13 +68,13 @@ const SimpleMarketPercentChangeWrapper = (props: Props) => {
 };

 const SimpleMarketPercentChange = ({ candles, marketId, setValue }: Props) => {
-  const yesterday = useYesterday();
+  const yesterday = Math.round(new Date().getTime() / 1000) - 24 * 3600;
  const { data } = useDataProvider({
    dataProvider: marketCandlesProvider,
    variables: {
      marketId,
-      interval: Schema.Interval.INTERVAL_I1D,
-      since: new Date(yesterday).toISOString(),
+      interval: Interval.INTERVAL_I1D,
+      since: new Date(yesterday * 1000).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',
@@ -1,6 +1,6 @@
 import classNames from 'classnames';
+import SimpleMarketExpires from './simple-market-expires';
 import type { Market } from '@vegaprotocol/market-list';
-import { MarketExpires } from '@vegaprotocol/market-info';

 interface Props {
  market: Market;
@@ -19,7 +19,7 @@ const MarketNameRenderer = ({ market, isMobile }: Props) => {
        {isMobile
          ? market.tradableInstrument.instrument.code
          : market.tradableInstrument.instrument.name}{' '}
-        <MarketExpires
+        <SimpleMarketExpires
          tags={market.tradableInstrument.instrument.metadata.tags}
        />
      </div>
@@ -14,9 +14,9 @@ import {
  getAllByText,
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
-import { Schema } from '@vegaprotocol/types';
-import type { Market } from '@vegaprotocol/market-list';
+import { MarketState } from '@vegaprotocol/types';
 import SimpleMarketToolbar from './simple-market-toolbar';
+import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
 import { markets as filterData } from './mocks/market-filters.json';

 const mockedNavigate = jest.fn();
@@ -35,23 +35,35 @@ describe('SimpleMarketToolbar', () => {
    const routes = useRoutes([
      {
        path: '/',
-        element: <SimpleMarketToolbar data={filterData as Market[]} />,
+        element: (
+          <SimpleMarketToolbar data={filterData as SimpleMarkets_markets[]} />
+        ),
      },
      {
        path: 'markets',
        children: [
          {
            path: `:state`,
-            element: <SimpleMarketToolbar data={filterData as Market[]} />,
+            element: (
+              <SimpleMarketToolbar
+                data={filterData as SimpleMarkets_markets[]}
+              />
+            ),
            children: [
              {
                path: `:product`,
-                element: <SimpleMarketToolbar data={filterData as Market[]} />,
+                element: (
+                  <SimpleMarketToolbar
+                    data={filterData as SimpleMarkets_markets[]}
+                  />
+                ),
                children: [
                  {
                    path: `:asset`,
                    element: (
-                      <SimpleMarketToolbar data={filterData as Market[]} />
+                      <SimpleMarketToolbar
+                        data={filterData as SimpleMarkets_markets[]}
+                      />
                    ),
                  },
                ],
@@ -59,7 +71,9 @@ describe('SimpleMarketToolbar', () => {
            ],
          },
        ],
-        element: <SimpleMarketToolbar data={filterData as Market[]} />,
+        element: (
+          <SimpleMarketToolbar data={filterData as SimpleMarkets_markets[]} />
+        ),
      },
    ]);
    const location = useLocation();
@@ -113,7 +127,7 @@ describe('SimpleMarketToolbar', () => {

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

@@ -124,7 +138,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 +153,7 @@ describe('SimpleMarketToolbar', () => {
    });
    await waitFor(() => {
      expect(mockedNavigate).toHaveBeenCalledWith(
-        `/markets/${Schema.MarketState.STATE_PENDING}/Future/tEURO`
+        `/markets/${MarketState.STATE_PENDING}/Future/tEURO`
      );
    });
  });
@@ -152,7 +166,7 @@ describe('SimpleMarketToolbar', () => {
    }));
    render(
      <MockedProvider mocks={[]} addTypename={false}>
-        <SimpleMarketToolbar data={filterData as Market[]} />
+        <SimpleMarketToolbar data={filterData as SimpleMarkets_markets[]} />
      </MockedProvider>,
      { wrapper: BrowserRouter }
    );
@@ -165,7 +179,7 @@ describe('SimpleMarketToolbar', () => {
    fireEvent.click(suspended);

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

@@ -173,7 +187,7 @@ describe('SimpleMarketToolbar', () => {
    (useParams as jest.Mock).mockImplementation(() => ({}));
    render(
      <MockedProvider mocks={[]} addTypename={false}>
-        <SimpleMarketToolbar data={filterData as Market[]} />
+        <SimpleMarketToolbar data={filterData as SimpleMarkets_markets[]} />
      </MockedProvider>,
      { wrapper: BrowserRouter }
    );
@@ -186,7 +200,7 @@ describe('SimpleMarketToolbar', () => {
    fireEvent.click(closed);

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

@@ -197,7 +211,7 @@ describe('SimpleMarketToolbar', () => {
    }));
    render(
      <MockedProvider mocks={[]} addTypename={false}>
-        <SimpleMarketToolbar data={filterData as Market[]} />
+        <SimpleMarketToolbar data={filterData as SimpleMarkets_markets[]} />
      </MockedProvider>,
      { wrapper: BrowserRouter }
    );
@@ -1,4 +1,4 @@
-import { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import { useNavigate, useParams, Link } from 'react-router-dom';
 import {
@@ -13,12 +13,12 @@ import {
  DropdownMenuItemIndicator,
  Icon,
 } from '@vegaprotocol/ui-toolkit';
-import { Schema } from '@vegaprotocol/types';
+import { MarketState } from '@vegaprotocol/types';
+import useMarketFiltersData from '../../hooks/use-markets-filter';
 import type { Market } from '@vegaprotocol/market-list';
 import { HorizontalMenu } from '../horizontal-menu';
 import type { HorizontalMenuItem } from '../horizontal-menu';
 import * as constants from './constants';
-import { useMarketFilters } from '../../hooks/use-markets-filter';

 interface Props {
  data: Market[];
@@ -27,7 +27,7 @@ interface Props {
 const SimpleMarketToolbar = ({ data }: Props) => {
  const navigate = useNavigate();
  const params = useParams();
-  const { products, assetsPerProduct } = useMarketFilters(data);
+  const { products, assetsPerProduct } = useMarketFiltersData(data);
  const [isOpen, setOpen] = useState(false);

  const onStateChange = useCallback(
@@ -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,3 +1,4 @@
+import React from 'react';
 import type { ReactNode } from 'react';
 import classNames from 'classnames';

@@ -1,12 +1,13 @@
-import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { t } from '@vegaprotocol/react-helpers';
 import { Button } from '@vegaprotocol/ui-toolkit';
 import * as React from 'react';
+import { useContext } from 'react';
+import LocalContext from '../../context/local-context';

 const ConnectWallet = () => {
-  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
-    openVegaWalletDialog: store.openVegaWalletDialog,
-  }));
+  const {
+    vegaWalletDialog: { setConnect },
+  } = useContext(LocalContext);
  return (
    <section
      className="p-8 bg-white-normal dark:bg-offBlack"
@@ -16,7 +17,7 @@ const ConnectWallet = () => {
        {t('Please connect your Vega wallet to make a trade')}
      </h3>
      <div className="mb-4">
-        <Button variant="primary" onClick={openVegaWalletDialog} size="lg">
+        <Button variant="primary" onClick={() => setConnect(true)} size="lg">
          {t('Connect Vega wallet')}
        </Button>
      </div>
@@ -1,26 +1,27 @@
-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 EXPIRE_DATE_FORMAT = 'MMM dd';

 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'),
 };

@@ -1,7 +1,9 @@
 import { createContext } from 'react';

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

@@ -26,6 +26,5 @@ query EstimateOrder(
    marginLevels {
      initialLevel
    }
-    totalFeeAmount
  }
 }
@@ -3,9 +3,6 @@ query MarketMarkPrice($marketId: ID!) {
    decimalPlaces
    data {
      markPrice
-      market {
-        id
-      }
    }
  }
 }
@@ -0,0 +1,52 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+// ====================================================
+// GraphQL query operation: MarketMarkPrice
+// ====================================================
+
+export interface MarketMarkPrice_market_data {
+  __typename: "MarketData";
+  /**
+   * The mark price (an unsigned integer)
+   */
+  markPrice: string;
+}
+
+export interface MarketMarkPrice_market {
+  __typename: "Market";
+  /**
+   * The number of decimal places that an integer must be shifted by in order to get a correct
+   * number denominated in the currency of the market. (uint64)
+   * 
+   * Examples:
+   * Currency     Balance  decimalPlaces  Real Balance
+   * GBP              100              0       GBP 100
+   * GBP              100              2       GBP   1.00
+   * GBP              100              4       GBP   0.01
+   * GBP                1              4       GBP   0.0001   (  0.01p  )
+   * 
+   * GBX (pence)      100              0       GBP   1.00     (100p     )
+   * GBX (pence)      100              2       GBP   0.01     (  1p     )
+   * GBX (pence)      100              4       GBP   0.0001   (  0.01p  )
+   * GBX (pence)        1              4       GBP   0.000001 (  0.0001p)
+   */
+  decimalPlaces: number;
+  /**
+   * marketData for the given market
+   */
+  data: MarketMarkPrice_market_data | null;
+}
+
+export interface MarketMarkPrice {
+  /**
+   * An instrument that is trading on the Vega network
+   */
+  market: MarketMarkPrice_market | null;
+}
+
+export interface MarketMarkPriceVariables {
+  marketId: string;
+}
@@ -0,0 +1,118 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { AccountType } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL query operation: PartyMarketData
+// ====================================================
+
+export interface PartyMarketData_party_accounts_asset {
+  __typename: "Asset";
+  /**
+   * The ID of the asset
+   */
+  id: 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;
+}
+
+export interface PartyMarketData_party_accounts_market {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+}
+
+export interface PartyMarketData_party_accounts {
+  __typename: "Account";
+  /**
+   * Account type (General, Margin, etc)
+   */
+  type: AccountType;
+  /**
+   * Balance as string - current account balance (approx. as balances can be updated several times per second)
+   */
+  balance: string;
+  /**
+   * Asset, the 'currency'
+   */
+  asset: PartyMarketData_party_accounts_asset;
+  /**
+   * Market (only relevant to margin accounts)
+   */
+  market: PartyMarketData_party_accounts_market | null;
+}
+
+export interface PartyMarketData_party_marginsConnection_edges_node_market {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+}
+
+export interface PartyMarketData_party_marginsConnection_edges_node {
+  __typename: "MarginLevels";
+  /**
+   * Market in which the margin is required for this party
+   */
+  market: PartyMarketData_party_marginsConnection_edges_node_market;
+  /**
+   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   */
+  initialLevel: string;
+  /**
+   * Minimal margin for the position to be maintained in the network (unsigned integer)
+   */
+  maintenanceLevel: string;
+  /**
+   * If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
+   */
+  searchLevel: string;
+}
+
+export interface PartyMarketData_party_marginsConnection_edges {
+  __typename: "MarginEdge";
+  node: PartyMarketData_party_marginsConnection_edges_node;
+}
+
+export interface PartyMarketData_party_marginsConnection {
+  __typename: "MarginConnection";
+  /**
+   * The margin levels in this connection
+   */
+  edges: PartyMarketData_party_marginsConnection_edges[] | null;
+}
+
+export interface PartyMarketData_party {
+  __typename: "Party";
+  /**
+   * Party identifier
+   */
+  id: string;
+  /**
+   * Collateral accounts relating to a party
+   */
+  accounts: PartyMarketData_party_accounts[] | null;
+  /**
+   * Margin levels for a market
+   */
+  marginsConnection: PartyMarketData_party_marginsConnection | null;
+}
+
+export interface PartyMarketData {
+  /**
+   * An entity that is trading on the Vega network
+   */
+  party: PartyMarketData_party | null;
+}
+
+export interface PartyMarketDataVariables {
+  partyId: string;
+}
@@ -0,0 +1,64 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { Side, OrderTimeInForce, OrderType } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL query operation: EstimateOrder
+// ====================================================
+
+export interface EstimateOrder_estimateOrder_fee {
+  __typename: "TradeFee";
+  /**
+   * The maker fee, paid by the aggressive party to the other party (the one who had an order in the book)
+   */
+  makerFee: string;
+  /**
+   * The infrastructure fee, a fee paid to the validators to maintain the Vega network
+   */
+  infrastructureFee: string;
+  /**
+   * The fee paid to the liquidity providers that committed liquidity to the market
+   */
+  liquidityFee: string;
+}
+
+export interface EstimateOrder_estimateOrder_marginLevels {
+  __typename: "MarginLevels";
+  /**
+   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   */
+  initialLevel: string;
+}
+
+export interface EstimateOrder_estimateOrder {
+  __typename: "OrderEstimate";
+  /**
+   * The estimated fee if the order was to trade
+   */
+  fee: EstimateOrder_estimateOrder_fee;
+  /**
+   * The margin requirement for this order
+   */
+  marginLevels: EstimateOrder_estimateOrder_marginLevels;
+}
+
+export interface EstimateOrder {
+  /**
+   * Return an estimation of the potential cost for a new order
+   */
+  estimateOrder: EstimateOrder_estimateOrder;
+}
+
+export interface EstimateOrderVariables {
+  marketId: string;
+  partyId: string;
+  price?: string | null;
+  size: string;
+  side: Side;
+  timeInForce: OrderTimeInForce;
+  expiration?: string | null;
+  type: OrderType;
+}
@@ -0,0 +1,109 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { AccountType } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL query operation: MarketPositions
+// ====================================================
+
+export interface MarketPositions_party_accounts_asset {
+  __typename: "Asset";
+  /**
+   * 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;
+}
+
+export interface MarketPositions_party_accounts_market {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+}
+
+export interface MarketPositions_party_accounts {
+  __typename: "Account";
+  /**
+   * Account type (General, Margin, etc)
+   */
+  type: AccountType;
+  /**
+   * Balance as string - current account balance (approx. as balances can be updated several times per second)
+   */
+  balance: string;
+  /**
+   * Asset, the 'currency'
+   */
+  asset: MarketPositions_party_accounts_asset;
+  /**
+   * Market (only relevant to margin accounts)
+   */
+  market: MarketPositions_party_accounts_market | null;
+}
+
+export interface MarketPositions_party_positionsConnection_edges_node_market {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+}
+
+export interface MarketPositions_party_positionsConnection_edges_node {
+  __typename: "Position";
+  /**
+   * Open volume (uint64)
+   */
+  openVolume: string;
+  /**
+   * Market relating to this position
+   */
+  market: MarketPositions_party_positionsConnection_edges_node_market;
+}
+
+export interface MarketPositions_party_positionsConnection_edges {
+  __typename: "PositionEdge";
+  /**
+   * The position
+   */
+  node: MarketPositions_party_positionsConnection_edges_node;
+}
+
+export interface MarketPositions_party_positionsConnection {
+  __typename: "PositionConnection";
+  /**
+   * The positions in this connection
+   */
+  edges: MarketPositions_party_positionsConnection_edges[] | null;
+}
+
+export interface MarketPositions_party {
+  __typename: "Party";
+  /**
+   * Party identifier
+   */
+  id: string;
+  /**
+   * Collateral accounts relating to a party
+   */
+  accounts: MarketPositions_party_accounts[] | null;
+  /**
+   * Trading positions relating to a party
+   */
+  positionsConnection: MarketPositions_party_positionsConnection | null;
+}
+
+export interface MarketPositions {
+  /**
+   * An entity that is trading on the Vega network
+   */
+  party: MarketPositions_party | null;
+}
+
+export interface MarketPositionsVariables {
+  partyId: string;
+}
@@ -15,7 +15,7 @@ export type EstimateOrderQueryVariables = Types.Exact<{
 }>;


-export type EstimateOrderQuery = { __typename?: 'Query', estimateOrder: { __typename?: 'OrderEstimate', totalFeeAmount: string, fee: { __typename?: 'TradeFee', makerFee: string, infrastructureFee: string, liquidityFee: string }, marginLevels: { __typename?: 'MarginLevels', initialLevel: string } } };
+export type EstimateOrderQuery = { __typename?: 'Query', estimateOrder: { __typename?: 'OrderEstimate', fee: { __typename?: 'TradeFee', makerFee: string, infrastructureFee: string, liquidityFee: string }, marginLevels: { __typename?: 'MarginLevels', initialLevel: string } } };


 export const EstimateOrderDocument = gql`
@@ -38,7 +38,6 @@ export const EstimateOrderDocument = gql`
    marginLevels {
      initialLevel
    }
-    totalFeeAmount
  }
 }
    `;
@@ -8,7 +8,7 @@ export type MarketMarkPriceQueryVariables = Types.Exact<{
 }>;


-export type MarketMarkPriceQuery = { __typename?: 'Query', market?: { __typename?: 'Market', decimalPlaces: number, data?: { __typename?: 'MarketData', markPrice: string, market: { __typename?: 'Market', id: string } } | null } | null };
+export type MarketMarkPriceQuery = { __typename?: 'Query', market?: { __typename?: 'Market', decimalPlaces: number, data?: { __typename?: 'MarketData', markPrice: string } | null } | null };


 export const MarketMarkPriceDocument = gql`
@@ -17,9 +17,6 @@ export const MarketMarkPriceDocument = gql`
    decimalPlaces
    data {
      markPrice
-      market {
-        id
-      }
    }
  }
 }
@@ -8,7 +8,7 @@ export type MarketPositionsQueryVariables = Types.Exact<{
 }>;


-export type MarketPositionsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, positionsConnection?: { __typename?: 'PositionConnection', edges?: Array<{ __typename?: 'PositionEdge', node: { __typename?: 'Position', openVolume: string, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };
+export type MarketPositionsQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, positionsConnection?: { __typename?: 'PositionConnection', edges?: Array<{ __typename?: 'PositionEdge', node: { __typename?: 'Position', openVolume: string, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };


 export const MarketPositionsDocument = gql`
@@ -8,7 +8,7 @@ export type PartyMarketDataQueryVariables = Types.Exact<{
 }>;


-export type PartyMarketDataQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, marginsConnection?: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', initialLevel: string, maintenanceLevel: string, searchLevel: string, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };
+export type PartyMarketDataQuery = { __typename?: 'Query', party?: { __typename?: 'Party', id: string, accounts?: Array<{ __typename?: 'Account', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, decimals: number }, market?: { __typename?: 'Market', id: string } | null }> | null, marginsConnection?: { __typename?: 'MarginConnection', edges?: Array<{ __typename?: 'MarginEdge', node: { __typename?: 'MarginLevels', initialLevel: string, maintenanceLevel: string, searchLevel: string, market: { __typename?: 'Market', id: string } } }> | null } | null } | null };


 export const PartyMarketDataDocument = gql`
@@ -1,8 +1,8 @@
 import { MockedProvider } from '@apollo/client/testing';
 import { renderHook } from '@testing-library/react';
-import { Schema } from '@vegaprotocol/types';
+import { Side } from '@vegaprotocol/types';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
-import { useCalculateSlippage } from './use-calculate-slippage';
+import useCalculateSlippage from './use-calculate-slippage';

 const mockData = {
  decimalPlaces: 0,
@@ -59,6 +59,11 @@ let mockOrderBookData = {
  data: mockData,
 };

+jest.mock('@vegaprotocol/market-depth', () => ({
+  ...jest.requireActual('@vegaprotocol/market-depth'),
+  useOrderBookData: jest.fn(() => mockOrderBookData),
+}));
+
 jest.mock('@vegaprotocol/react-helpers', () => ({
  ...jest.requireActual('@vegaprotocol/react-helpers'),
  useDataProvider: jest.fn(() => ({
@@ -66,7 +71,6 @@ jest.mock('@vegaprotocol/react-helpers', () => ({
      marketsConnection: [],
    },
  })),
-  useThrottledDataProvider: jest.fn(() => mockOrderBookData),
 }));

 describe('useCalculateSlippage Hook', () => {
@@ -82,7 +86,7 @@ describe('useCalculateSlippage Hook', () => {
            marketId: 'marketId',
            order: {
              size: '10',
-              side: Schema.Side.SIDE_BUY,
+              side: Side.SIDE_BUY,
            } as OrderSubmissionBody['orderSubmission'],
          }),
        {
@@ -99,7 +103,7 @@ describe('useCalculateSlippage Hook', () => {
            marketId: 'marketId',
            order: {
              size: '10',
-              side: Schema.Side.SIDE_SELL,
+              side: Side.SIDE_SELL,
            } as OrderSubmissionBody['orderSubmission'],
          }),
        {
@@ -125,7 +129,7 @@ describe('useCalculateSlippage Hook', () => {
            marketId: 'marketId',
            order: {
              size: '10',
-              side: Schema.Side.SIDE_SELL,
+              side: Side.SIDE_SELL,
            } as OrderSubmissionBody['orderSubmission'],
          }),
        {
@@ -1,15 +1,14 @@
 import { useMemo } from 'react';
-import { marketDepthProvider } from '@vegaprotocol/market-depth';
-import { Schema } from '@vegaprotocol/types';
+import { Side } from '@vegaprotocol/types';
+import { useOrderBookData } from '@vegaprotocol/market-depth';
 import { marketProvider } from '@vegaprotocol/market-list';
-import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';
+import type { Market } from '@vegaprotocol/market-list';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { BigNumber } from 'bignumber.js';
 import {
  formatNumber,
  toBigNum,
  useDataProvider,
-  useThrottledDataProvider,
 } from '@vegaprotocol/react-helpers';

 interface Props {
@@ -17,22 +16,19 @@ interface Props {
  order: OrderSubmissionBody['orderSubmission'];
 }

-export const useCalculateSlippage = ({ marketId, order }: Props) => {
+const useCalculateSlippage = ({ marketId, order }: Props) => {
  const variables = useMemo(() => ({ marketId }), [marketId]);
-  const { data } = useThrottledDataProvider(
-    {
-      dataProvider: marketDepthProvider,
-      variables,
-    },
-    5000
-  );
-  const { data: market } = useDataProvider<SingleMarketFieldsFragment, never>({
+  const { data } = useOrderBookData({
+    variables,
+    throttleMilliseconds: 5000,
+  });
+  const { data: market } = useDataProvider<Market, never>({
    dataProvider: marketProvider,
-    skipUpdates: true,
+    noUpdate: true,
    variables,
  });
  const volPriceArr =
-    data?.depth[order.side === Schema.Side.SIDE_BUY ? 'sell' : 'buy'] || [];
+    data?.depth[order.side === Side.SIDE_BUY ? 'sell' : 'buy'] || [];
  if (volPriceArr.length && market) {
    const decimals = market.decimalPlaces ?? 0;
    const positionDecimals = market.positionDecimalPlaces ?? 0;
@@ -73,3 +69,5 @@ export const useCalculateSlippage = ({ marketId, order }: Props) => {
  }
  return null;
 };
+
+export default useCalculateSlippage;
@@ -7,9 +7,12 @@ describe('local values hook', () => {
    const { result } = renderHook(() => useLocalValues('light', setTheme));
    expect(result.current.vegaWalletDialog).toBeDefined();
    expect(result.current.vegaWalletDialog.manage).toBe(false);
+    expect(result.current.vegaWalletDialog.connect).toBe(false);
    act(() => {
+      result.current.vegaWalletDialog.setConnect(true);
      result.current.vegaWalletDialog.setManage(true);
    });
    expect(result.current.vegaWalletDialog.manage).toBe(true);
+    expect(result.current.vegaWalletDialog.connect).toBe(true);
  });
 });
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Madalina Raicu	c325becce1	fix: #1537 add 3 lp data providers	2022-10-04 17:25:05 +01:00
Madalina Raicu	4bd905d083	Merge branch 'chore/seoplia-migration' of github.com:vegaprotocol/frontend-monorepo into fix/1537-lp-view-data-provider	2022-10-04 17:13:27 +01:00
Matthew Russell	9816f2cf0e	fix: remove trailing slash from etherscan urls	2022-10-04 08:32:59 -07:00
Dexter	7cd53cb1f9	chore: seoplia migration	2022-10-04 08:32:59 -07:00
Madalina Raicu	5672725754	fix: #1537 fix generated types in LP and deposits	2022-10-04 15:30:21 +01:00
Madalina Raicu	a59fab616f	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/1537-lp-view-data-provider	2022-10-04 15:11:05 +01:00
Madalina Raicu	479c7e5664	fix: #1567 initial update for liquidity provision need to match with fee share	2022-10-03 22:35:18 +01:00
Madalina Raicu	29ba732986	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into fix/1537-lp-view-data-provider	2022-10-03 18:30:53 +01:00
Madalina Raicu	2fb8c9d36b	fix: #1537 remove old market liquidity query	2022-10-03 15:35:02 +01:00