test: lint

test: speculitive fix for ci
test: lint
2022-09-09 12:07:09 +01:00 · 2022-09-09 12:06:43 +01:00 · 2022-09-09 11:37:12 +01:00 · 2022-09-09 11:36:47 +01:00 · 2022-09-09 11:33:49 +01:00
1331 changed files with 29136 additions and 69493 deletions
@@ -51,7 +51,8 @@
            "ul": ["list"],
            "ol": ["list"]
          }
-        ]
+        ],
+        "curly": "warn"
      }
    },
    {
@@ -74,8 +75,7 @@
            "prefer": "type-imports",
            "disallowTypeAnnotations": true
          }
-        ],
-        "curly": ["error", "multi-line"]
+        ]
      }
    },
    {
@@ -1,45 +0,0 @@
---
-name: "\U0001F41B Bug"
-about: Create a report to help us improve
-title: ''
-labels: "\U0001F41B bug"
-assignees: ''
---
-
-## Description
-
-A clear and concise description of what the bug is.
-
-## Steps to Reproduce
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-## Expected behavior
-
-A clear and concise description of what you expected to happen.
-
-## Screenshots
-
-If applicable, add screenshots to help explain your problem.
-
-## Device details
-
-**Desktop (please complete the following information):**
-
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
-
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]
-
-## Additional context
-
-Add any other context about the problem here.
@@ -1,21 +0,0 @@
---
-name: Chore
-about:
-  A template to capture non feature / enhancement work we need to do like work
-  to support other functions or housekeeping etc.
-title: ''
-labels: chore
-assignees: ''
---
-
-## The Chore
-
-What we need to achieve and who for
-
-## Tasks
-
- [ ] What do we need to do first
- [ ] and then what?
- [ ] Etc.
-
-## Additional details / background info
@@ -1,33 +0,0 @@
---
-name: User Story
-about:
-  A template to describe a features or enhancements we want to make from a users
-  perspective to ensure we understand what is needed and the value it would add
-title: ''
-labels: feature
-assignees: ''
---
-
-## Story
-
-As a
-I want
-So that
-
-## Acceptance Criteria
-
- [ ] I can
- [ ] I can
- [ ] I can
-
-## Tasks
-
- [ ] Explore and sketch
- [ ] Team and stakeholder review
- [ ] Visual Design
- [ ] Team review
- [ ] Etc.
-
-## Sketch
-
-## Additional details / background info
@@ -1,31 +0,0 @@
-inputs:
-  all:
-    description: 'Install all binaries'
-    default: false
-  version:
-    description: 'Vega version'
-  gobin:
-    description: 'GOBIN path'
-    default: '/home/runner/go/bin'
-runs:
-  using: 'composite'
-  steps:
-    - name: Install Vega binaries
-      if: ${{ inputs.all }}
-      shell: bash
-      run: |
-        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vega-linux-amd64.zip' -q
-        unzip vega-linux-amd64.zip -d ${{ inputs.gobin }}
-
-    - name: Install date-node binaries
-      if: ${{ inputs.all  }}
-      shell: bash
-      run: |
-        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/data-node-linux-amd64.zip' -q
-        unzip data-node-linux-amd64.zip -d ${{ inputs.gobin }}
-
-    - name: Install Vega wallet binaries
-      shell: bash
-      run: |
-        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ env.VEGA_VERSION }}/vegawallet-linux-amd64.zip' -q
-        unzip vegawallet-linux-amd64.zip -d ${{ inputs.gobin }}
@@ -1,30 +0,0 @@
-inputs:
-  github-token:
-    description: 'github token'
-runs:
-  using: 'composite'
-  steps:
-    - name: Checkout capsule
-      uses: actions/checkout@v2
-      with:
-        repository: vegaprotocol/vegacapsule
-        ref: main
-        token: ${{ inputs.github-token }}
-        path: './capsule'
-
-    - name: Build capsule
-      run: go install
-      shell: bash
-      working-directory: capsule
-
-    - name: Login to docker
-      shell: bash
-      run: echo -n ${{ inputs.github-token }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
-
-    - name: Start nomad
-      shell: bash
-      run: vegacapsule nomad &
-
-    - name: Bootstrap network
-      shell: bash
-      run: vegacapsule network bootstrap --config-path=./frontend-monorepo/vegacapsule/config.hcl --force
@@ -1,45 +0,0 @@
-inputs:
-  recovery:
-    description: 'Recovery phrase'
-  passphrase:
-    description: 'Wallet password'
-  capsule:
-    description: 'Is Capsule network used'
-    default: false
-runs:
-  using: 'composite'
-  steps:
-    - name: Create passphrase
-      shell: bash
-      run: echo "${{ inputs.passphrase }}" > ./passphrase
-
-    - name: Create recovery
-      shell: bash
-      run: echo "${{ inputs.recovery }}" > ./recovery
-
-    - name: Initialize wallet
-      shell: bash
-      run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
-
-    - name: Import wallet
-      shell: bash
-      run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-    - name: Create public key 2
-      shell: bash
-      run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
-
-    - name: Import fairground network
-      shell: bash
-      if: ${{ inputs.capsule==false }}
-      run: vegawallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks-internal/master/stagnet3/stagnet3.toml" --force --home ~/.vegacapsule/testnet/wallet
-
-    - name: Start service using fairground network
-      shell: bash
-      if: ${{ inputs.capsule==false }}
-      run: vegawallet service run --network stagnet3 --automatic-consent --no-version-check --home ~/.vegacapsule/testnet/wallet &
-
-    - name: Start service using capsule network
-      shell: bash
-      if: ${{ inputs.capsule==true }}
-      run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &
@@ -1,4 +1,4 @@
-name: Cypress tests -- manual trigger
+name: Capsule tests -- manual trigger

 # This workflow runs the frontend tests against chosen branch

@@ -15,43 +15,20 @@ on:
          - stats-e2e
          - token-e2e
          - trading-e2e
-      smokeOnly:
-        description: 'Run only smoke tests?'
+      includeFlows:
+        description: 'Include long flows (if any)?'
        required: true
        type: boolean
-        default: false
-      skip-nx-cache:
-        description: 'Add --skip-nx-cache to cypress test'
-        required: false
-        type: boolean
-        default: false
+        default: true

 jobs:
  manual:
-    name: Run Cypress tests -- manual trigger
-    runs-on: self-hosted
+    name: Run capsule tests -- manual trigger
+    runs-on: ubuntu-latest
    env:
      GO111MODULE: 'on'
-      GOBIN: /home/runner/go/bin
-      VEGA_VERSION: 'v0.58.0'
+      GOPROXY: ${{ secrets.GO_PROXY }}
    steps:
-      #######
-      ## Setup flags
-      #######
-
-      - name: Set smoke tag
-        if: ${{ github.event.inputs.smokeOnly == 'true' }}
-        run: echo TAGS="--env.grepTags @smoke" >> $GITHUB_ENV
-
-      - name: Set --skip-nx-cache flag
-        if: ${{ github.event.inputs.skip-nx-cache == 'true' }}
-        run: echo SKIP_NX_CACHE="--skip-nx-cache" >> $GITHUB_ENV
-
-      # See if we capsule is needed for this project
-      - name: Set capsule flag
-        if: ${{  github.event.inputs.project == 'explorer-e2e' || github.event.inputs.project == 'token-e2e'}}
-        run: echo RUN_CAPSULE=true >> $GITHUB_ENV
-
      #######
      ## Setup langs
      #######
@@ -60,7 +37,6 @@ jobs:
        id: go
        with:
          go-version: 1.19
-
      - name: Set up Node 16
        uses: actions/setup-node@v2
        id: npm
@@ -68,92 +44,109 @@ jobs:
          node-version: 16

      #######
-      ## Install Yarn
-      #######
-      - name: Setup yarn
-        run: npm install -g yarn
-
-      #######
-      ## Checkout repos
+      ## Checkout capsule
      #######

-      # Checkout front ends
-      - name: Checkout frontend mono repo
+      # Checkout capsule to build local network
+      - name: Checkout capsule
        uses: actions/checkout@v2
        with:
-          fetch-depth: 0
-          path: './frontend-monorepo'
+          repository: vegaprotocol/vegacapsule
+          ref: main
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          path: './capsule'

-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
+      #######
+      ## Build binaries
+      #######
+      - name: Build capsule
+        run: go install
+        working-directory: capsule
+
+      - name: Set GOBIN
+        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV
+
+      - name: Checkout Vega
+        uses: actions/checkout@v2
        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
-      #######
+          repository: vegaprotocol/vega
+          ref: develop
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          path: './vega'

      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          all: ${{ env.RUN_CAPSULE }}
-          version: ${{ env.VEGA_VERSION }}
-          gobin: ${{ env.GOBIN }}
+        run: go install -v ./cmd/vega
+        working-directory: vega

-      - 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 }}
+      - name: Install Vega wallet binaries
+        run: go install ./cmd/vegawallet
+        working-directory: vega
+
+      - name: Install date-node binaries
+        run: go install ./cmd/data-node
+        working-directory: vega
+
+      ######
+      ## Start capsule
+      ######
+      - name: Login to docker
+        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
+
+      - name: Start nomad
+        run: vegacapsule nomad &
+
+      - name: Bootstrap network
+        run: vegacapsule network bootstrap --config-path=./net_confs/config.hcl --force
+        working-directory: capsule

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

-      - name: 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 }}
+      - name: Initialize wallet
+        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
+      - name: Import wallet
+        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      - name: Create public key 2
+        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      - name: Start service
+        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &

      ######
      ## 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
+      # Checkout front ends
+      - name: Checkout frontend mono repo
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
+
+      - name: Install root dependencies
+        run: yarn install

      - 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
+        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        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
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_INCLUDE_FLOWS: ${{ github.event.inputs.includeFlows }}

      ######
      ## Upload logs
      ######

      - name: Logs
-        if: ${{ env.RUN_CAPSULE }}
+        if: ${{ always() }}
        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,22 +1,17 @@
-name: Cypress tests -- night run
+name: Capsule tests -- night run

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

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

 jobs:
  nightly:
-    name: Run Cypress tests -- nightly
-    runs-on: self-hosted
-    timeout-minutes: 60
+    name: Run capsule tests -- nightly
+    runs-on: ubuntu-latest
    env:
      GO111MODULE: 'on'
-      GOBIN: /home/runner/go/bin
-      VEGA_VERSION: 'v0.58.0'
-      RUN_CAPSULE: true
    steps:
      #######
      ## Setup langs
@@ -33,88 +28,107 @@ jobs:
          node-version: 16

      #######
-      ## Install Yarn
-      #######
-      - name: Setup yarn
-        run: npm install -g yarn
-
-      #######
-      ## Checkout repos
+      ## Checkout capsule
      #######

-      # Checkout front ends
-      - name: Checkout frontend mono repo
+      # Checkout capsule to build local network
+      - name: Checkout capsule
        uses: actions/checkout@v2
        with:
-          fetch-depth: 0
-          path: './frontend-monorepo'
+          repository: vegaprotocol/vegacapsule
+          ref: main
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          path: './capsule'

-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
+      #######
+      ## Build binaries
+      #######
+      - name: Build capsule
+        run: go install
+        working-directory: capsule
+
+      - name: Set GOBIN
+        run: echo GOBIN=$(go env GOPATH)/bin >> $GITHUB_ENV
+
+      - name: Checkout Vega
+        uses: actions/checkout@v2
        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
-      #######
+          repository: vegaprotocol/vega
+          ref: develop
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          path: './vega'

      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          all: ${{ env.RUN_CAPSULE }}
-          version: ${{ env.VEGA_VERSION }}
-          gobin: ${{ env.GOBIN }}
+        run: go install -v ./cmd/vega
+        working-directory: vega

-      - 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 }}
+      - name: Install Vega wallet binaries
+        run: go install ./cmd/vegawallet
+        working-directory: vega
+
+      - name: Install date-node binaries
+        run: go install ./cmd/data-node
+        working-directory: vega
+
+      ######
+      ## Start capsule
+      ######
+      - name: Login to docker
+        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
+
+      - name: Start nomad
+        run: vegacapsule nomad &
+
+      - name: Bootstrap network
+        run: vegacapsule network bootstrap --config-path=./net_confs/config.hcl --force
+        working-directory: capsule

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

-      - name: 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 }}
+      - name: Initialize wallet
+        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
+      - name: Import wallet
+        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      - name: Create public key 2
+        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      - name: Start service
+        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &

      ######
      ## 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
+      # Checkout front ends
+      - name: Checkout frontend mono repo
+        uses: actions/checkout@v2
+        with:
+          ref: master
+          fetch-depth: 0
+
+      - name: Install root dependencies
+        run: yarn install

      - name: Run Cypress tests
-        run: yarn nx run-many --skip-nx-cache --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome --parallel=1
-        working-directory: frontend-monorepo
+        run: yarn nx run-many --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        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_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_NIGHTLY_RUN: true
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
+          CYPRESS_INCLUDE_FLOWS: true

      ######
      ## Upload logs
      ######

      - name: Logs
+        if: ${{ always() }}
        run: vegacapsule network logs > vega-capsule-logs.txt

      - uses: actions/upload-artifact@v2
@@ -1,10 +1,10 @@
-name: Cypress tests
+name: Capsule tests

 on:
  push:
    branches:
+      - master
      - develop
-      - main
  pull_request:
    types:
      - opened
@@ -14,13 +14,11 @@ on:

 jobs:
  pr:
-    name: Run Cypress tests - PR
-    runs-on: self-hosted
-    timeout-minutes: 30
+    name: Run capsule tests - PR
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'pull_request' && github.event.pull_request.draft == false }}
    env:
      GO111MODULE: 'on'
-      GOBIN: /home/runner/go/bin
-      VEGA_VERSION: 'v0.58.0'
    steps:
      #######
      ## Setup langs
@@ -30,7 +28,6 @@ jobs:
        id: go
        with:
          go-version: 1.19
-
      - name: Set up Node 16
        uses: actions/setup-node@v2
        id: npm
@@ -38,109 +35,115 @@ jobs:
          node-version: 16

      #######
-      ## Install Yarn
-      #######
-      - name: Setup yarn
-        run: npm install -g yarn
-
-      #######
-      ## Checkout repos
+      ## Checkout capsule
      #######

-      # Checkout front ends
-      - name: Checkout frontend mono repo
+      # Checkout capsule to build local network
+      - name: Checkout capsule
        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
-
-      # Check SHAs
-      - name: Derive appropriate SHAs for base and head for `nx affected` commands
-        uses: nrwl/nx-set-shas@v2
-        with:
-          working-directory: frontend-monorepo
-          main-branch-name: ${{ github.base_ref || github.ref_name }}
-          set-environment-variables-for-job: true
-
-      # See if we capsule is needed for this project
-      - name: See affected apps
-        run: echo AFFECTED=$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects) >> $GITHUB_ENV
-        working-directory: frontend-monorepo
-
-      - name: See if capsule is necessary
-        if: ${{ contains(env.AFFECTED, 'token') || contains(env.AFFECTED, 'token-e2e') || contains(env.AFFECTED, 'explorer') || contains(env.AFFECTED, 'explorer-e2e') }}
-        run: echo RUN_CAPSULE=true >> $GITHUB_ENV
+          repository: vegaprotocol/vegacapsule
+          ref: main
+          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
+          path: './capsule'

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

      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          all: ${{ env.RUN_CAPSULE }}
-          version: ${{ env.VEGA_VERSION }}
-          gobin: ${{ env.GOBIN }}
+        run: go install -v ./cmd/vega
+        working-directory: vega

-      - 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 }}
+      - name: Install Vega wallet binaries
+        run: go install ./cmd/vegawallet
+        working-directory: vega
+
+      - name: Install date-node binaries
+        run: go install ./cmd/data-node
+        working-directory: vega
+
+      ######
+      ## Start capsule
+      ######
+      - name: Login to docker
+        run: echo -n ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }} | docker login https://ghcr.io -u vega-ci-bot --password-stdin
+
+      - name: Start nomad
+        run: vegacapsule nomad &
+
+      - name: Bootstrap network
+        run: vegacapsule network bootstrap --config-path=./net_confs/config.hcl --force
+        working-directory: capsule

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

-      - name: 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 }}
+      - name: Initialize wallet
+        run: vegawallet init -f --home ~/.vegacapsule/testnet/wallet
+      - name: Import wallet
+        run: vegawallet import -w UI_Trading_Test --recovery-phrase-file ./recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      - name: Create public key 2
+        run: vegawallet key generate -w UI_Trading_Test -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+      - name: Start service
+        run: vegawallet service run --network DV --automatic-consent  --home ~/.vegacapsule/testnet/wallet &

      ######
      ## 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
+      # Checkout front ends
+      - name: Checkout frontend mono repo
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
+
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
+        with:
+          main-branch-name: master
+
+      - name: Install root dependencies
+        run: yarn install

      - name: Run Cypress tests
-        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke' --browser chrome
-        working-directory: frontend-monorepo
+        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        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
+          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_INCLUDE_FLOWS: false

      ######
      ## Upload logs
      ######

      - name: Logs
-        if: ${{ env.RUN_CAPSULE }}
+        if: ${{ always() }}
        run: vegacapsule network logs > vega-capsule-logs.txt

      - uses: actions/upload-artifact@v2
-        if: ${{ env.RUN_CAPSULE }}
+        if: ${{ always() }}
        with:
          name: logs
          path: ./vega-capsule-logs.txt
@@ -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 }}
@@ -3,7 +3,7 @@ name: Generate queries
 on:
  push:
    branches:
-      - develop
+      - master

 jobs:
  master:
@@ -0,0 +1,32 @@
+---
+name: Deploy affected projects to IPFS
+
+'on':
+  # Triggers the workflow on push to main branch
+  push:
+    branches: [master]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch: null
+
+jobs:
+  master:
+    name: Publish NX Affected
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.pull_request.head.ref }}
+          fetch-depth: 0
+      - name: Use Node.js 16
+        id: Node
+        uses: actions/setup-node@v2
+        with:
+          node-version: 16.14.0
+      - name: Install root dependencies
+        run: yarn install
+      - name: Run deploy for affected sites
+        env:
+          FLEEK_API_KEY: ${{ secrets.FLEEK_API_KEY }}
+        run: ./tools/ipfs-deploy.js
@@ -3,37 +3,66 @@ name: Unit tests & build
 on:
  push:
    branches:
+      - master
      - develop
-      - main
  pull_request:
+
 jobs:
-  pr:
-    name: Test and lint - PR
+  master:
+    name: Test and lint - main
    runs-on: ubuntu-latest
    permissions:
      contents: 'read'
      actions: 'read'
+    if: ${{ github.event_name != 'pull_request' }}
    steps:
      - name: Checkout
        uses: actions/checkout@v3
        with:
+          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
      - name: Derive appropriate SHAs for base and head for `nx affected` commands
        uses: nrwl/nx-set-shas@v2
        with:
-          main-branch-name: ${{ github.base_ref }}
+          main-branch-name: master
      - name: Use Node.js 16
        id: Node
        uses: actions/setup-node@v3
        with:
          node-version: 16.14.0
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
-        with:
-          path: '**/node_modules'
-          key: node_modules-${{ hashFiles('**/yarn.lock') }}
      - name: Install root dependencies
-        run: yarn install --frozen-lockfile
+        run: yarn install
+      - name: Check formatting
+        run: yarn nx format:check
+      - name: Lint affected
+        run: yarn nx affected:lint --max-warnings=0
+      - name: Test affected
+        run: yarn nx affected:test
+      - name: Build affected
+        run: yarn nx affected:build
+  pr:
+    name: Test and lint - PR
+    runs-on: ubuntu-latest
+    permissions:
+      contents: 'read'
+      actions: 'read'
+    if: ${{ github.event_name == 'pull_request' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v2
+        with:
+          main-branch-name: master
+      - name: Use Node.js 16
+        id: Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.14.0
+      - name: Install root dependencies
+        run: yarn install
      - name: Check formatting
        run: yarn nx format:check
      - name: Lint affected
@@ -42,5 +71,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
@@ -6,3 +6,7 @@ yarn commitlint --edit "${1}"

 # Lint all staged files
 yarn lint-staged
+
+# Build & test affected apps
+yarn nx affected:build --uncommitted
+yarn nx affected:test --uncommitted
@@ -3,7 +3,6 @@
 /dist
 /coverage
 __generated__
-__generated___

 apps/static/src/assets/devnet-tranches.json
 apps/static/src/assets/mainnet-tranches.json
@@ -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'
-      }
-    }
-  }
-}
@@ -30,10 +30,6 @@ An application for the status of the Vega network. Showing block height and othe

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

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

 ### [UI toolkit](./libs/ui-toolkit)
@@ -73,10 +69,10 @@ Run `nx serve my-app` for a dev server. Navigate to the port specified in `app/<

 ### Using Apollo GraphQL and Generate Types

-In order to generate the schemas for your GraphQL queries, you can run `GRAPHQL_SCHEMA_PATH=[YOUR SCHEMA FILE / API URL HERE] nx run types:generate`.
+In order to generate the schemas for your GraphQL queries, you can run `NX_VEGA_URL=[YOUR URL HERE] nx run types:generate`.

 ```bash
-export  GRAPHQL_SCHEMA_PATH=https://api.n11.testnet.vega.xyz/graphql
+export  NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 yarn nx run types:generate
 ```

@@ -144,17 +140,6 @@ Coming soon! You will be able to run the containers within Vega Capsule.

 You can run against a local instance of Vega Capsule today by using the .env.capsule present in the apps.

-If you wish to run E2E tests for Token and Block Explorer (other areas to be added soon)
-
- Vegacapsule must be used in order for these tests to succeed, the vegacapsule repo README.md file contains the steps required to set this up, it must be installed globally.
- However we start the capsule network a little differently to how it is laid out in those instructions:
-
-In order to run the bootstrap command to generate and start a new network, we must do so using the following:
-
-```bash
-vegacapsule network bootstrap --config-path=../frontend-monorepo/vegacapsule/config.hcl
-```
-
 # 📑 License

 [MIT](./LICENSE)
@@ -1,8 +1,27 @@
-# App configuration variables
-NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
-NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
-NX_VEGA_ENV=STAGNET3
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
-NX_VEGA_WALLET_URL=http://localhost:1789
+# React Environment Variables
+
+# https://facebook.github.io/create-react-app/docs/adding-custom-environment-variables#expanding-environment-variables-in-env
+
+# Netlify Environment Variables
+
+# https://www.netlify.com/docs/continuous-deployment/#environment-variables
+
+NX_VERSION=$npm_package_version
+NX_REPOSITORY_URL=$REPOSITORY_URL
+NX_BRANCH=$BRANCH
+NX_PULL_REQUEST=$PULL_REQUEST
+NX_HEAD=$HEAD
+NX_COMMIT_REF=$COMMIT_REF
+NX_CONTEXT=$CONTEXT
+NX_REVIEW_ID=$REVIEW_ID
+NX_INCOMING_HOOK_TITLE=$INCOMING_HOOK_TITLE
+NX_INCOMING_HOOK_URL=$INCOMING_HOOK_URL
+NX_INCOMING_HOOK_BODY=$INCOMING_HOOK_BODY
+NX_URL=$URL
+NX_DEPLOY_URL=$DEPLOY_URL
+NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
+
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
+NX_VEGA_ENV=TESTNET
+NX_VEGA_REST=https://api.n11.testnet.vega.xyz
+NX_VEGA_WALLET_URL=http://localhost:1789/api/v1
@@ -3,18 +3,14 @@ module.exports = defineConfig({
  projectId: 'et4snf',

  e2e: {
-    setupNodeEvents(on, config) {
-      require('cypress-grep/src/plugin')(config);
-      return config;
-    },
    baseUrl: 'http://localhost:4200',
    fileServerFolder: '.',
    fixturesFolder: false,
    specPattern: './src/integration/*.ts',
    excludeSpecPattern: '**/*.js',
    modifyObstructiveCode: false,
-    supportFile: './src/support/index.js',
-    video: false,
+    supportFile: './src/support/index.ts',
+    video: true,
    videoUploadOnPasses: false,
    videosFolder: '../../dist/cypress/apps/console-lite-e2e/videos',
    screenshotsFolder: '../../dist/cypress/apps/console-lite-e2e/screenshots',
@@ -25,7 +21,7 @@ module.exports = defineConfig({
  env: {
    TRADING_TEST_VEGA_WALLET_NAME: 'UI_Trading_Test',
    ETHEREUM_PROVIDER_URL:
-      'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
+      'https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
    VEGA_PUBLIC_KEY:
      '47836c253520d2661bf5bed6339c0de08fd02cf5d4db0efee3b4373f20c7d278',
    VEGA_PUBLIC_KEY2:
@@ -33,14 +29,11 @@ module.exports = defineConfig({
    TRUNCATED_VEGA_PUBLIC_KEY: '47836c…c7d278',
    TRUNCATED_VEGA_PUBLIC_KEY2: '1a18cd…0cf2e4',
    ETHEREUM_WALLET_ADDRESS: '0x265Cc6d39a1B53d0d92068443009eE7410807158',
-    ETHERSCAN_URL: 'https://sepolia.etherscan.io',
+    ETHERSCAN_URL: 'https://ropsten.etherscan.io',
    tsConfig: 'tsconfig.json',
    TAGS: 'not @todo and not @ignore and not @manual',
    TRADING_TEST_VEGA_WALLET_PASSPHRASE: '123',
    ETH_WALLET_MNEMONIC:
      'ugly gallery notice network true range brave clarify flat logic someone chunk',
-    grepTags: '@regression @smoke @slow',
-    grepFilterSpecs: true,
-    grepOmitFiltered: true,
  },
 });
@@ -1 +0,0 @@
-declare module '*.scss';
@@ -1,17 +1,5 @@
-import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateSimpleMarkets,
-  generateMarketsCandles,
-} from '../support/mocks/generate-markets';
-
-describe('simple trading app', { tags: '@smoke' }, () => {
-  beforeEach(() => {
-    cy.mockGQL((req) => {
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-    });
-    cy.visit('/');
-  });
+describe('simple trading app', () => {
+  beforeEach(() => cy.visit('/'));

  it('render', () => {
    cy.get('#root').should('exist');
@@ -1,4 +1,4 @@
-describe('console lite header', { tags: '@smoke' }, () => {
+describe('console lite header', () => {
  beforeEach(() => {
    window.localStorage.setItem('theme', 'dark');
    cy.visit('/');
@@ -1,17 +1,14 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
-import type { MarketsQuery } from '@vegaprotocol/market-list';
 import {
  generateLongListMarkets,
  generateSimpleMarkets,
-  generateMarketsCandles,
 } from '../support/mocks/generate-markets';

-describe('market list', { tags: '@smoke' }, () => {
+describe('market list', () => {
  describe('simple url', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
+        aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
      });
      cy.visit('/markets');
    });
@@ -65,8 +62,7 @@ describe('market list', { tags: '@smoke' }, () => {
  describe('url params should select filters', () => {
    beforeEach(() => {
      cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateSimpleMarkets());
-        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
+        aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
      });
    });

@@ -77,11 +73,10 @@ describe('market list', { tags: '@smoke' }, () => {

    it('last asset (if exists)', () => {
      cy.visit('/markets');
-      cy.wait('@Markets').then((filters) => {
-        const data: MarketsQuery | undefined = filters?.response?.body?.data;
-        if (data?.marketsConnection?.edges.length) {
+      cy.wait('@SimpleMarkets').then((filters) => {
+        if (filters?.response?.body?.data?.markets?.length) {
          const asset =
-            data?.marketsConnection?.edges[0].node.tradableInstrument.instrument
+            filters.response.body.data.markets[0].tradableInstrument.instrument
              .product.settlementAsset.symbol;
          cy.visit(`/markets/Suspended/Future/${asset}`);
          cy.getByTestId('market-assets-menu')
@@ -103,8 +98,7 @@ describe('market list', { tags: '@smoke' }, () => {
    it('handles 1000 markets', () => {
      cy.viewport(1440, 900);
      cy.mockGQL((req) => {
-        aliasQuery(req, 'Markets', generateLongListMarkets(1000));
-        aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
+        aliasQuery(req, 'SimpleMarkets', generateLongListMarkets(1000));
      });
      performance.mark('start-1k');
      cy.visit('/markets');
@@ -1,10 +1,6 @@
 import { connectVegaWallet } from '../support/connect-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateMarketsCandles,
-  generateMarketsData,
-  generateSimpleMarkets,
-} from '../support/mocks/generate-markets';
+import { generateSimpleMarkets } from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
@@ -13,32 +9,26 @@ 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 { generateMarketNames } from '../support/mocks/generate-market-names';
-import { generateMarketDepth } from '../support/mocks/generate-market-depth';
-import type { Market, MarketsQuery } from '@vegaprotocol/market-list';

-describe('market selector', { tags: '@smoke' }, () => {
-  let markets: Market[];
+describe('market selector', () => {
+  let markets;
  beforeEach(() => {
    cy.mockGQL((req) => {
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-      aliasQuery(req, 'MarketsData', generateMarketsData());
-      aliasQuery(req, 'DealTicket', generateDealTicket());
+      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
+      aliasQuery(req, 'DealTicketQuery', generateDealTicket());
      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());
-      aliasQuery(req, 'MarketDepth', generateMarketDepth());
    });

    cy.visit('/markets');
-    cy.wait('@Markets').then((response) => {
-      const data: MarketsQuery | undefined = response?.response?.body?.data;
-      if (data?.marketsConnection?.edges.length) {
-        markets = data?.marketsConnection?.edges.map((edge) => edge.node);
+    cy.wait('@SimpleMarkets').then((response) => {
+      if (response.response.body.data?.markets?.length) {
+        markets = response.response.body.data.markets;
      }
    });
  });
@@ -49,7 +39,7 @@ describe('market selector', { tags: '@smoke' }, () => {
      connectVegaWallet();
      cy.get('input[placeholder="Search"]').should(
        'have.value',
-        markets[0].tradableInstrument.instrument.name
+        markets[0].name
      );
      cy.getByTestId('arrow-button').click();
      cy.getByTestId('market-pane').should('be.visible');
@@ -57,7 +47,7 @@ describe('market selector', { tags: '@smoke' }, () => {
        .children()
        .find('[role="button"]')
        .first()
-        .should('contain.text', markets[0].tradableInstrument.instrument.name);
+        .should('contain.text', markets[0].name);
      cy.getByTestId('market-pane')
        .children()
        .find('[role="button"]')
@@ -80,8 +70,8 @@ describe('market selector', { tags: '@smoke' }, () => {
      cy.get('input[placeholder="Search"]').type('aa');
      const filtered = markets.filter(
        (market) =>
-          market.state === 'STATE_ACTIVE' &&
-          market.tradableInstrument.instrument.name.match(/aa/i)
+          market.data.market.state === 'STATE_ACTIVE' &&
+          market.name.match(/aa/i)
      );
      cy.getByTestId('market-pane')
        .children()
@@ -98,7 +88,7 @@ describe('market selector', { tags: '@smoke' }, () => {
      );
      cy.get('input[placeholder="Search"]').should(
        'have.value',
-        filtered[filtered.length - 1].tradableInstrument.instrument.name
+        filtered[filtered.length - 1].name
      );
    }
  });
@@ -136,12 +126,12 @@ describe('market selector', { tags: '@smoke' }, () => {
      cy.getByTestId('market-pane')
        .children()
        .find('[role="button"]')
-        .should('have.length', 9);
+        .should('have.length', 3);
      cy.get('div[role="dialog"]').should('have.class', 'w-screen');
      cy.getByTestId('dialog-close').click();
      cy.get('input[placeholder="Search"]').should(
        'have.value',
-        markets[0].tradableInstrument.instrument.name
+        markets[0].name
      );
    }
  });
@@ -1,10 +1,5 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateSimpleMarkets,
-  generateMarketsCandles,
-  generateMarketsData,
-  generateMarket,
-} from '../support/mocks/generate-markets';
+import { generateSimpleMarkets } from '../support/mocks/generate-markets';
 import { generateDealTicket } from '../support/mocks/generate-deal-ticket';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
 import { generateMarketPositions } from '../support/mocks/generate-market-positions';
@@ -14,31 +9,25 @@ import { generatePartyMarketData } from '../support/mocks/generate-party-market-
 import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
 import { connectVegaWallet } from '../support/connect-wallet';
-import type { MarketsQuery, Market } from '@vegaprotocol/market-list';

-describe('Market trade', { tags: '@smoke' }, () => {
-  let markets: Market[];
+describe('Market trade', () => {
+  let markets;
  beforeEach(() => {
    cy.mockGQL((req) => {
-      aliasQuery(req, 'Markets', generateSimpleMarkets());
-      aliasQuery(req, 'MarketsCandles', generateMarketsCandles());
-      aliasQuery(req, 'MarketsData', generateMarketsData());
      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
-      aliasQuery(req, 'DealTicket', generateDealTicket());
+      aliasQuery(req, 'DealTicketQuery', generateDealTicket());
      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) => {
-      const data: MarketsQuery | undefined = response?.response?.body?.data;
-      if (data?.marketsConnection?.edges.length) {
-        markets = data?.marketsConnection?.edges.map((edge) => edge.node);
+    cy.wait('@SimpleMarkets').then((response) => {
+      if (response.response.body.data?.markets?.length) {
+        markets = response.response.body.data.markets;
      }
    });
  });
@@ -181,50 +170,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
        .find('button')
        .should('have.text', '2');
      cy.get('button').contains('Max').click();
-    }
-  });
-
-  it('slippage value should be displayed', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      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();
-      cy.get('button').contains('Max').click();
-      cy.get('#step-2-panel')
-        .find('dl')
-        .eq(2)
-        .find('dd')
-        .should('have.text', '0.02%');
-    }
-  });
-
-  it('allow slippage value to be adjusted', () => {
-    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      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();
-      cy.get('button').contains('Max').click();
-      cy.get('#step-2-panel')
-        .find('dl')
-        .eq(2)
-        .find('dd')
-        .should('have.text', '0.02%');
-      cy.get('#step-2-panel').find('dl').eq(2).find('button').click();
-      cy.get('#input-order-slippage')
-        .focus()
-        .type('{backspace}{backspace}{backspace}1');
-
-      cy.getByTestId('slippage-dialog').find('button').click();
-
-      cy.get('#step-2-panel')
-        .find('dl')
-        .eq(2)
-        .find('dd')
-        .should('have.text', '1%');
+      cy.getByTestId('price-slippage-value').should('have.text', '0.02%');
    }
  });

@@ -249,9 +195,9 @@ describe('Market trade', { tags: '@smoke' }, () => {
      cy.get('#step-2-panel').find('dd').eq(0).find('button').click();
      cy.get('#step-2-panel')
        .find('dt')
-        .eq(2)
+        .eq(3)
        .should('have.text', 'Est. Position Size (tDAI)');
-      cy.get('#step-2-panel').find('dd').eq(2).should('have.text', '197.86012');
+      cy.get('#step-2-panel').find('dd').eq(3).should('have.text', '197.86012');
    }
  });

@@ -264,11 +210,11 @@ describe('Market trade', { tags: '@smoke' }, () => {
      cy.get('#step-2-control').click();
      cy.get('#step-2-panel')
        .find('dt')
-        .eq(3)
+        .eq(4)
        .should('have.text', 'Est. Fees (tDAI)');
      cy.get('#step-2-panel')
        .find('dd')
-        .eq(3)
+        .eq(4)
        .should('have.text', '3.00000 (3.03%)');
    }
  });
@@ -298,7 +244,11 @@ describe('Market trade', { tags: '@smoke' }, () => {

      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',
+        'Confirm transaction in wallet'
+      );
    }
  });

@@ -2,23 +2,8 @@ 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 { generateOrders } from '../support/mocks/generate-orders';
-import { generateFills } from '../support/mocks/generate-fills';
-import {
-  generateFillsMarkets,
-  generateMarketsData,
-  generatePositionsMarkets,
-} from '../support/mocks/generate-markets';

-describe('Portfolio page', { tags: '@smoke' }, () => {
+describe('Portfolio page', () => {
  afterEach(() => {
    disconnectVegaWallet();
  });
@@ -34,144 +19,19 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
  it('certain tabs should exist', () => {
    cy.visit('/portfolio');
    connectVegaWallet();
+    cy.getByTestId('Assets').should('exist');
+    cy.getByTestId('tab-assets').should('exist');

-    cy.getByTestId('assets').click();
-    cy.location('pathname').should('eq', '/portfolio/assets');
+    cy.getByTestId('Positions').click();
+    cy.getByTestId('tab-positions').should('exist');

-    cy.getByTestId('positions').click();
-    cy.location('pathname').should('eq', '/portfolio/positions');
+    cy.getByTestId('Orders').click();
+    cy.getByTestId('tab-orders').should('exist');

-    cy.getByTestId('orders').click();
-    cy.location('pathname').should('eq', '/portfolio/orders');
+    cy.getByTestId('Fills').click();
+    cy.getByTestId('tab-fills').should('exist');

-    cy.getByTestId('fills').click();
-    cy.location('pathname').should('eq', '/portfolio/fills');
-
-    cy.getByTestId('deposits').click();
-    cy.location('pathname').should('eq', '/portfolio/deposits');
-  });
-
-  describe('Assets view', () => {
-    beforeEach(() => {
-      cy.mockGQL((req) => {
-        aliasQuery(req, 'Positions', generatePositions());
-        aliasQuery(req, 'Margins', generateMargins());
-        aliasQuery(req, 'Markets', generatePositionsMarkets());
-        aliasQuery(req, 'MarketsData', generateMarketsData());
-        aliasQuery(req, 'Accounts', generateAccounts());
-        aliasQuery(req, 'Assets', generateAssets());
-      });
-      cy.visit('/portfolio/assets');
-      connectVegaWallet();
-    });
-
-    it('data should be properly rendered', () => {
-      cy.get('.ag-center-cols-container .ag-row').should('have.length', 3);
-      cy.get(
-        '.ag-center-cols-container [row-id="ACCOUNT_TYPE_GENERAL-asset-id-null"]'
-      )
-        .find('button')
-        .click();
-      cy.getByTestId('dialog-title').should(
-        'have.text',
-        'Asset details - tEURO'
-      );
-      cy.getByTestId('dialog-close').click();
-    });
-  });
-
-  describe('Positions view', () => {
-    beforeEach(() => {
-      cy.mockGQL((req) => {
-        aliasQuery(req, 'Positions', generatePositions());
-        aliasQuery(req, 'Accounts', generateAccounts());
-        aliasQuery(req, 'Margins', generateMargins());
-        aliasQuery(req, 'Markets', generatePositionsMarkets());
-        aliasQuery(req, 'MarketsData', generateMarketsData());
-        aliasQuery(req, 'Assets', generateAssets());
-      });
-      cy.visit('/portfolio/positions');
-      connectVegaWallet();
-    });
-
-    it('data should be properly rendered', () => {
-      cy.getByTestId('positions-asset-tDAI').should('exist');
-      cy.getByTestId('positions-asset-tEURO').should('exist');
-    });
-  });
-
-  describe('Orders view', () => {
-    beforeEach(() => {
-      cy.mockGQL((req) => {
-        aliasQuery(req, 'Orders', generateOrders());
-        aliasQuery(req, 'Markets', generateFillsMarkets());
-      });
-      cy.visit('/portfolio/orders');
-      connectVegaWallet();
-    });
-
-    it('data should be properly rendered', () => {
-      cy.get('.ag-center-cols-container .ag-row').should('have.length', 5);
-    });
-  });
-
-  describe('Fills view', () => {
-    beforeEach(() => {
-      cy.mockGQL((req) => {
-        aliasQuery(req, 'Fills', generateFills());
-        aliasQuery(req, 'Markets', generateFillsMarkets());
-      });
-      cy.visit('/portfolio/fills');
-      connectVegaWallet();
-    });
-
-    it('data should be properly rendered', () => {
-      cy.get('.ag-center-cols-container .ag-row').should('have.length', 4);
-    });
-  });
-
-  describe('Empty views', () => {
-    beforeEach(() => {
-      cy.mockGQL((req) => {
-        aliasQuery(req, 'Positions', emptyPositions());
-        aliasQuery(req, 'Accounts', { party: null });
-        aliasQuery(req, 'Orders', { party: null });
-        aliasQuery(req, 'Fills', { party: null });
-        aliasQuery(req, 'Markets', {
-          marketsConnection: { edges: [], __typename: 'MarketConnection' },
-        });
-        aliasQuery(req, 'Assets', {
-          assetsConnection: { edges: null, __typename: 'AssetsConnection' },
-        });
-      });
-      cy.visit('/portfolio');
-      connectVegaWallet();
-    });
-
-    it('"No data to display" should be always displayed', () => {
-      cy.getByTestId('assets').click();
-      cy.get('div.flex.items-center.justify-center').should(
-        'contain.text',
-        'No data to display'
-      );
-
-      cy.getByTestId('positions').click();
-      cy.get('div.flex.items-center.justify-center').should(
-        'contain.text',
-        'No data to display'
-      );
-
-      cy.getByTestId('orders').click();
-      cy.get('div.flex.items-center.justify-center').should(
-        'contain.text',
-        'No data to display'
-      );
-
-      cy.getByTestId('fills').click();
-      cy.get('div.flex.items-center.justify-center').should(
-        'contain.text',
-        'No data to display'
-      );
-    });
+    cy.getByTestId('Deposits').click();
+    cy.getByTestId('tab-deposits').should('exist');
  });
 });
@@ -4,9 +4,7 @@ export const connectVegaWallet = () => {
  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('connectors-list').find('button').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();
@@ -1,34 +0,0 @@
-// ***********************************************************
-// This example support/index.js is processed and
-// loaded automatically before your test files.
-//
-// This is a great place to put global configuration and
-// behavior that modifies Cypress.
-//
-// You can change the location of this file or turn off
-// automatically serving support files with the
-// 'supportFile' configuration option.
-//
-// You can read more here:
-// https://on.cypress.io/configuration
-// ***********************************************************
-
-import '@vegaprotocol/cypress';
-import 'cypress-real-events/support';
-// Import commands.js using ES2015 syntax:
-import './commands';
-import registerCypressGrep from 'cypress-grep';
-import { aliasQuery } from '@vegaprotocol/cypress';
-registerCypressGrep();
-
-before(() => {
-  // Mock chainId fetch which happens on every page for wallet connection
-  cy.mockGQL((req) => {
-    aliasQuery(req, 'ChainId', {
-      statistics: {
-        __typename: 'Statistics',
-        chainId: 'vega-fairground-202210041151',
-      },
-    });
-  });
-});
@@ -1,8 +1,4 @@
-import type { Market } from '@vegaprotocol/market-list';
-import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
-import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';
-
-export const protoCandles = [
+const protoCandles = [
  { open: '9556163', close: '9587028', __typename: 'Candle' },
  {
    open: '9587028',
@@ -77,31 +73,20 @@ export const protoCandles = [
  },
 ];

-export const protoMarket: Market = {
-  id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-  tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
-  state: MarketState.STATE_ACTIVE,
-  decimalPlaces: 5,
-  positionDecimalPlaces: 0,
-  marketTimestamps: {
-    __typename: 'MarketTimestamps',
-    close: '',
-    open: '',
-  },
-  fees: {
-    __typename: 'Fees',
-    factors: {
-      __typename: 'FeeFactors',
-      makerFee: '',
-      infrastructureFee: '',
-      liquidityFee: '',
+export const protoMarket = {
+  id: 'first-btcusd-id',
+  name: 'AAVEDAI Monthly (30 Jun 2022)',
+  data: {
+    market: {
+      id: 'first-btcusd-id',
+      state: 'STATE_ACTIVE',
+      __typename: 'Market',
    },
+    __typename: 'MarketData',
  },
  tradableInstrument: {
    instrument: {
-      id: '',
      code: 'AAVEDAI.MF21',
-      name: 'AAVEDAI Monthly (30 Jun 2022)',
      metadata: {
        tags: [
          'formerly:2839D9B2329C9E70',
@@ -116,32 +101,12 @@ export const protoMarket: Market = {
      product: {
        __typename: 'Future',
        quoteName: 'DAI',
-        settlementAsset: { symbol: 'tDAI', __typename: 'Asset', decimals: 5 },
+        settlementAsset: { symbol: 'tDAI', __typename: 'Asset' },
      },
      __typename: 'Instrument',
    },
    __typename: 'TradableInstrument',
  },
+  candles: protoCandles,
  __typename: 'Market',
 };
-
-export const singleMarket: SingleMarketFieldsFragment = {
-  ...protoMarket,
-  tradableInstrument: {
-    ...protoMarket.tradableInstrument,
-    instrument: {
-      ...protoMarket.tradableInstrument.instrument,
-      product: {
-        ...protoMarket.tradableInstrument.instrument.product,
-        settlementAsset: {
-          ...protoMarket.tradableInstrument.instrument.product.settlementAsset,
-          id: 'dai-id',
-          name: 'DAI Name',
-        },
-        oracleSpecForTradingTermination: {
-          id: 'oid',
-        },
-      },
-    },
-  },
-};
@@ -1,77 +0,0 @@
-import merge from 'lodash/merge';
-import type { AccountsQuery } from '@vegaprotocol/accounts';
-import { AccountType } from '@vegaprotocol/types';
-import type { PartialDeep } from 'type-fest';
-
-export const generateAccounts = (
-  override?: PartialDeep<AccountsQuery>
-): AccountsQuery => {
-  const defaultAccounts: AccountsQuery = {
-    party: {
-      __typename: 'Party',
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      accounts: [
-        {
-          __typename: 'AccountBalance',
-          type: AccountType.ACCOUNT_TYPE_GENERAL,
-          balance: '100000000',
-          market: null,
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id',
-          },
-        },
-        {
-          __typename: 'AccountBalance',
-          type: AccountType.ACCOUNT_TYPE_GENERAL,
-          balance: '100000000',
-          market: {
-            id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-            __typename: 'Market',
-          },
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id-2',
-          },
-        },
-        {
-          __typename: 'AccountBalance',
-          type: AccountType.ACCOUNT_TYPE_MARGIN,
-          balance: '1000',
-          market: {
-            __typename: 'Market',
-            id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-          },
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id',
-          },
-        },
-        {
-          __typename: 'AccountBalance',
-          type: AccountType.ACCOUNT_TYPE_MARGIN,
-          balance: '1000',
-          market: {
-            __typename: 'Market',
-            id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-          },
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id-2',
-          },
-        },
-        {
-          __typename: 'AccountBalance',
-          type: AccountType.ACCOUNT_TYPE_GENERAL,
-          balance: '100000000',
-          market: null,
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-0',
-          },
-        },
-      ],
-    },
-  };
-  return merge(defaultAccounts, override);
-};
@@ -1,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,29 +1,20 @@
-import type { DealTicketQuery } from '@vegaprotocol/deal-ticket';
-import { MarketTradingMode, MarketState } from '@vegaprotocol/types';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateDealTicket = (
-  override?: PartialDeep<DealTicketQuery>
-): DealTicketQuery => {
-  const defaultResult: DealTicketQuery = {
+export const generateDealTicket = () => {
+  return {
    market: {
-      id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
+      id: 'first-btcusd-id',
+      name: 'AAVEDAI Monthly (30 Jun 2022)',
      decimalPlaces: 5,
      positionDecimalPlaces: 0,
-      state: MarketState.STATE_ACTIVE,
-      tradingMode: MarketTradingMode.TRADING_MODE_CONTINUOUS,
+      state: 'STATE_ACTIVE',
+      tradingMode: 'Continuous',
      tradableInstrument: {
        instrument: {
-          id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-          name: 'AAVEDAI Monthly (30 Jun 2022)',
          product: {
            quoteName: 'DAI',
            settlementAsset: {
              id: '6d9d35f657589e40ddfb448b7ad4a7463b66efb307527fedd2aa7df1bbd5ea61',
              symbol: 'tDAI',
              name: 'tDAI TEST',
-              decimals: 5,
              __typename: 'Asset',
            },
            __typename: 'Future',
@@ -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,111 +0,0 @@
-import type { FillsQuery, FillFieldsFragment } from '@vegaprotocol/fills';
-import { Schema } from '@vegaprotocol/types';
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-
-export const generateFills = (
-  override?: PartialDeep<FillsQuery>
-): FillsQuery => {
-  const fills: FillFieldsFragment[] = [
-    generateFill({
-      buyer: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-    }),
-    generateFill({
-      id: '1',
-      seller: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-      aggressor: Schema.Side.SIDE_SELL,
-      buyerFee: {
-        infrastructureFee: '5000',
-      },
-      market: {
-        id: 'market-1',
-      },
-    }),
-    generateFill({
-      id: '2',
-      seller: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-      aggressor: Schema.Side.SIDE_BUY,
-    }),
-    generateFill({
-      id: '3',
-      aggressor: Schema.Side.SIDE_SELL,
-      market: {
-        id: 'market-2',
-      },
-      buyer: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-    }),
-  ];
-
-  const defaultResult: FillsQuery = {
-    party: {
-      id: 'buyer-id',
-      tradesConnection: {
-        __typename: 'TradeConnection',
-        edges: fills.map((f) => {
-          return {
-            __typename: 'TradeEdge',
-            node: f,
-            cursor: '3',
-          };
-        }),
-        pageInfo: {
-          __typename: 'PageInfo',
-          startCursor: '1',
-          endCursor: '2',
-          hasNextPage: false,
-          hasPreviousPage: false,
-        },
-      },
-      __typename: 'Party',
-    },
-  };
-
-  return merge(defaultResult, override);
-};
-
-export const generateFill = (override?: PartialDeep<FillFieldsFragment>) => {
-  const defaultFill: FillFieldsFragment = {
-    __typename: 'Trade',
-    id: '0',
-    createdAt: new Date().toISOString(),
-    price: '10000000',
-    size: '50000',
-    buyOrder: 'buy-order',
-    sellOrder: 'sell-order',
-    aggressor: Schema.Side.SIDE_BUY,
-    buyer: {
-      __typename: 'Party',
-      id: 'buyer-id',
-    },
-    seller: {
-      __typename: 'Party',
-      id: 'seller-id',
-    },
-    buyerFee: {
-      __typename: 'TradeFee',
-      makerFee: '100',
-      infrastructureFee: '100',
-      liquidityFee: '100',
-    },
-    sellerFee: {
-      __typename: 'TradeFee',
-      makerFee: '200',
-      infrastructureFee: '200',
-      liquidityFee: '200',
-    },
-    market: {
-      __typename: 'Market',
-      id: 'market-0',
-    },
-  };
-
-  return merge(defaultFill, override);
-};
@@ -1,15 +1,24 @@
-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';
-
-export const generateMarketDepth = (
-  override?: PartialDeep<MarketDepthQuery>
-): MarketDepthQuery => {
-  const defaultResult: MarketDepthQuery = {
+export const generateMarketDepth = () => {
+  return {
    market: {
      id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
+      decimalPlaces: 5,
+      positionDecimalPlaces: 0,
+      data: {
+        staticMidPrice: '9893006',
+        marketTradingMode: 'TRADING_MODE_CONTINUOUS',
+        indicativeVolume: '0',
+        indicativePrice: '0',
+        bestStaticBidPrice: '9893006',
+        bestStaticOfferPrice: '9893006',
+        market: {
+          id: 'a46bd7e5277087723b7ab835844dec3cef8b4445738101269624bf5537d5d423',
+          __typename: 'Market',
+        },
+        __typename: 'MarketData',
+      },
      depth: {
+        lastTrade: { price: '9893006', __typename: 'Trade' },
        sell: [
          {
            price: '9893007',
@@ -206,5 +215,4 @@ export const generateMarketDepth = (
      __typename: 'Market',
    },
  };
-  return merge(defaultResult, override);
 };
@@ -6,11 +6,11 @@ export const generateMarketNames = () => {
      { ...protoMarket },
      {
        id: '1d7ddf67dac4924db03f5bf58571a7bcb1908d70c66580467717aabc5345b68a',
+        name: 'Apple Monthly (30 Jun 2022)',
        state: 'STATE_SUSPENDED',
        tradableInstrument: {
          instrument: {
            code: 'AAPL.MF21',
-            name: 'Apple Monthly (30 Jun 2022)',
            metadata: {
              tags: [
                'formerly:4899E01009F1A721',
@@ -32,11 +32,11 @@ export const generateMarketNames = () => {
      },
      {
        id: '87ae87cd3244fc1fab4b0e2dad2437879864192bb969f3109b69293421644c8b',
+        name: 'Tesla Quarterly (30 Jun 2022)',
        state: 'STATE_SUSPENDED',
        tradableInstrument: {
          instrument: {
            code: 'TSLA.QM21',
-            name: 'Tesla Quarterly (30 Jun 2022)',
            metadata: {
              tags: [
                'formerly:5A86B190C384997F',
@@ -58,11 +58,11 @@ export const generateMarketNames = () => {
      },
      {
        id: '69205712a854f1bbfb69fa3d11b60e01a1e249bafb5ece88115e7451e8ef07b3',
+        name: 'BTCUSD Monthly (30 Jun 2022)',
        state: 'STATE_SUSPENDED',
        tradableInstrument: {
          instrument: {
            code: 'BTCUSD.MF21',
-            name: 'BTCUSD Monthly (30 Jun 2022)',
            metadata: {
              tags: [
                'formerly:076BB86A5AA41E3E',
@@ -83,11 +83,11 @@ export const generateMarketNames = () => {
      },
      {
        id: 'ethbtc-quaterly',
+        name: 'ETHBTC Quarterly (30 Jun 2022)',
        state: 'STATE_ACTIVE',
        tradableInstrument: {
          instrument: {
            code: 'ETHBTC.QM21',
-            name: 'ETHBTC Quarterly (30 Jun 2022)',
            metadata: {
              tags: [
                'formerly:1F0BB6EB5703B099',
@@ -108,11 +108,11 @@ export const generateMarketNames = () => {
      },
      {
        id: '3c62b2714c4332d1a689a5352bff090e6aabccfd6bd87ce018936b38372530c9',
+        name: 'UNIDAI Monthly (30 Jun 2022)',
        state: 'STATE_ACTIVE',
        tradableInstrument: {
          instrument: {
            code: 'UNIDAI.MF21',
-            name: 'UNIDAI Monthly (30 Jun 2022)',
            metadata: {
              tags: [
                'formerly:3C58ED2A4A6C5D7E',
@@ -21,7 +21,7 @@ export const generateMarketPositions = () => {
          },
          balance: '265329',
          market: {
-            id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
+            id: 'first-btcusd-id',
            __typename: 'Market',
          },
        },
@@ -43,7 +43,7 @@ export const generateMarketPositions = () => {
            node: {
              openVolume: '12',
              market: {
-                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
+                id: 'first-btcusd-id',
                __typename: 'Market',
              },
              __typename: 'Position',
@@ -1,143 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-import type { OrdersQuery, OrderFieldsFragment } from '@vegaprotocol/orders';
-import { Schema } from '@vegaprotocol/types';
-
-export const generateOrders = (
-  override?: PartialDeep<OrdersQuery>
-): OrdersQuery => {
-  const orders: OrderFieldsFragment[] = [
-    {
-      __typename: 'Order',
-      id: '066468C06549101DAF7BC51099E1412A0067DC08C246B7D8013C9D0CBF1E8EE7',
-      market: {
-        __typename: 'Market',
-        id: 'market-0',
-      },
-      size: '10',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '20000000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 30).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '48DB6767E4E4E0F649C5A13ABFADE39F8451C27DA828DAF14B7A1E8E5EBDAD99',
-      market: {
-        __typename: 'Market',
-        id: 'market-1',
-      },
-      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '100',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 29).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '4e93702990712c41f6995fcbbd94f60bb372ad12d64dfa7d96d205c49f790336',
-      market: {
-        __typename: 'Market',
-        id: 'market-2',
-      },
-      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_FILLED,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '20000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 28).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '94737d2bafafa4bc3b80a56ef084ae52a983b91aa067c31e243c61a0f962a836',
-      market: {
-        __typename: 'Market',
-        id: 'market-3',
-      },
-      size: '1',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_ACTIVE,
-      side: Schema.Side.SIDE_BUY,
-      remaining: '0',
-      price: '100000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 27).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      rejectionReason: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-    },
-    {
-      __typename: 'Order',
-      id: '94aead3ca92dc932efcb503631b03a410e2a5d4606cae6083e2406dc38e52f78',
-      market: {
-        __typename: 'Market',
-        id: 'market-3',
-      },
-      size: '10',
-      type: Schema.OrderType.TYPE_LIMIT,
-      status: Schema.OrderStatus.STATUS_PARTIALLY_FILLED,
-      side: Schema.Side.SIDE_SELL,
-      remaining: '3',
-      price: '100000',
-      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 27).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-      rejectionReason: null,
-    },
-  ];
-
-  const defaultResult: OrdersQuery = {
-    party: {
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      ordersConnection: {
-        __typename: 'OrderConnection',
-        edges: orders.map((f) => {
-          return {
-            __typename: 'OrderEdge',
-            node: f,
-            cursor: f.id,
-          };
-        }),
-        pageInfo: {
-          __typename: 'PageInfo',
-          startCursor:
-            '066468C06549101DAF7BC51099E1412A0067DC08C246B7D8013C9D0CBF1E8EE7',
-          endCursor:
-            '94737d2bafafa4bc3b80a56ef084ae52a983b91aa067c31e243c61a0f962a836',
-          hasNextPage: false,
-          hasPreviousPage: false,
-        },
-      },
-      __typename: 'Party',
-    },
-  };
-  return merge(defaultResult, override);
-};
@@ -1,17 +1,10 @@
-import merge from 'lodash/merge';
-import type { PartyBalanceQuery } from '@vegaprotocol/deal-ticket';
-import type { PartialDeep } from 'type-fest';
-import { AccountType } from '@vegaprotocol/types';
-
-export const generatePartyBalance = (
-  override?: PartialDeep<PartyBalanceQuery>
-): PartyBalanceQuery => {
-  const defaultResult: PartyBalanceQuery = {
+export const generatePartyBalance = () => {
+  return {
    party: {
      accounts: [
        {
          balance: '88474051',
-          type: 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: 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: 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: 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);
 };
@@ -8,7 +8,7 @@ export const generatePartyMarketData = () => {
          balance: '1200000',
          asset: { id: 'fBTC', decimals: 5, __typename: 'Asset' },
          market: null,
-          __typename: 'AccountBalance',
+          __typename: 'Account',
        },
      ],
      marginsConnection: { edges: null, __typename: 'MarginConnection' },
@@ -1,145 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-import type {
-  PositionsQuery,
-  PositionFieldsFragment,
-  MarginsQuery,
-} from '@vegaprotocol/positions';
-
-export const generatePositions = (
-  override?: PartialDeep<PositionsQuery>
-): PositionsQuery => {
-  const nodes: PositionFieldsFragment[] = [
-    {
-      __typename: 'Position',
-      realisedPNL: '0',
-      openVolume: '6',
-      unrealisedPNL: '895000',
-      averageEntryPrice: '1129935',
-      updatedAt: '2022-07-28T15:09:34.441143Z',
-      market: {
-        id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-        __typename: 'Market',
-      },
-    },
-    {
-      __typename: 'Position',
-      realisedPNL: '100',
-      openVolume: '20',
-      unrealisedPNL: '895000',
-      averageEntryPrice: '8509338',
-      updatedAt: '2022-07-28T15:09:34.441143Z',
-      market: {
-        id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-        __typename: 'Market',
-      },
-    },
-    {
-      realisedPNL: '0',
-      openVolume: '1',
-      unrealisedPNL: '-22519',
-      averageEntryPrice: '84400088',
-      updatedAt: '2022-07-28T14:53:54.725477Z',
-      market: {
-        id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-        __typename: 'Market',
-      },
-      __typename: 'Position',
-    },
-  ];
-
-  const defaultResult: PositionsQuery = {
-    party: {
-      __typename: 'Party',
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      positionsConnection: {
-        __typename: 'PositionConnection',
-        edges: nodes.map((node) => {
-          return {
-            __typename: 'PositionEdge',
-            node,
-          };
-        }),
-      },
-    },
-  };
-
-  return merge(defaultResult, override);
-};
-
-export const emptyPositions = (): PositionsQuery => {
-  return {
-    party: {
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      positionsConnection: { edges: null, __typename: 'PositionConnection' },
-      __typename: 'Party',
-    },
-  };
-};
-
-export const generateMargins = (): MarginsQuery => {
-  return {
-    party: {
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      marginsConnection: {
-        edges: [
-          {
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'tDAI-id',
-              },
-            },
-          },
-          {
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'tDAI-id',
-              },
-            },
-            __typename: 'MarginEdge',
-          },
-          {
-            node: {
-              __typename: 'MarginLevels',
-              maintenanceLevel: '0',
-              searchLevel: '0',
-              initialLevel: '0',
-              collateralReleaseLevel: '0',
-              market: {
-                __typename: 'Market',
-                id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-              },
-              asset: {
-                __typename: 'Asset',
-                id: 'tEURO-id',
-              },
-            },
-            __typename: 'MarginEdge',
-          },
-        ],
-        __typename: 'MarginConnection',
-      },
-      __typename: 'Party',
-    },
-  };
-};
@@ -1,13 +1,12 @@
 {
  "extends": "../../tsconfig.base.json",
  "compilerOptions": {
-    "strict": true,
    "jsx": "react-jsx",
    "sourceMap": false,
    "allowSyntheticDefaultImports": true,
    "outDir": "../../dist/out-tsc",
    "allowJs": true,
-    "types": ["cypress", "node", "cypress-real-events", "cypress-grep"]
+    "types": ["cypress", "node", "cypress-real-events"]
  },
-  "include": ["src/**/*.ts", "src/**/*.js", "./declaration.d.ts"]
+  "include": ["src/**/*.ts", "src/**/*.js"]
 }
@@ -20,8 +20,8 @@ NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL
 NX_VEGA_CONFIG_URL="https://static.vega.xyz/assets/testnet-network.json"
 NX_VEGA_ENV = 'TESTNET'
 NX_VEGA_URL="https://api.n11.testnet.vega.xyz/graphql"
-NX_VEGA_WALLET_URL=http://localhost:1789
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_VEGA_WALLET_URL=http://localhost:1789/api/v1
+NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://ropsten.etherscan.io
 NX_VEGA_NETWORKS={"MAINNET":"https://alpha.console.vega.xyz"}
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -1,3 +1,4 @@
 # App configuration variables
 NX_VEGA_URL=http://localhost:3028/query
 NX_VEGA_ENV=LOCAL
+NX_VEGA_REST=http://localhost:3029
@@ -2,7 +2,8 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
 NX_VEGA_URL=https://api.n04.d.vega.xyz/graphql
 NX_VEGA_ENV=DEVNET
+NX_VEGA_REST=https://api.n04.d.vega.xyz
 NX_VEGA_NETWORKS={\"MAINNET\":\"https://alpha.console.vega.xyz\"}
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://ropsten.etherscan.io
 NX_VEGA_EXPLORER_URL=https://dev.explorer.vega.xyz
@@ -1,7 +1,8 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
-NX_VEGA_URL=https://api.vega.xyz/query
+NX_VEGA_URL=https://api.token.vega.xyz/query
 NX_VEGA_ENV=MAINNET
+NX_VEGA_REST=https://api.token.vega.xyz
 NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
 NX_ETHEREUM_PROVIDER_URL=https://mainnet.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
 NX_ETHERSCAN_URL=https://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/docs/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
@@ -2,6 +2,7 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_URL=https://api.n01.stagnet3.vega.xyz/graphql
 NX_VEGA_ENV=STAGNET3
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
+NX_VEGA_REST=https://api.n01.stagnet3.vega.xyz
+NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://ropsten.etherscan.io
+NX_VEGA_EXPLORER_URL=https://staging2.explorer.vega.xyz
@@ -1,8 +1,9 @@
 # App configuration variables
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/testnet-network.json
-NX_VEGA_URL=https://api.n12.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
+NX_VEGA_REST=https://api.n11.testnet.vega.xyz
 NX_VEGA_NETWORKS='{\"MAINNET\":\"https://alpha.console.vega.xyz\"}'
-NX_ETHEREUM_PROVIDER_URL=https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
-NX_ETHERSCAN_URL=https://sepolia.etherscan.io
+NX_ETHEREUM_PROVIDER_URL=https://ropsten.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8
+NX_ETHERSCAN_URL=https://ropsten.etherscan.io
 NX_VEGA_EXPLORER_URL=https://explorer.fairground.wtf
@@ -1,6 +1,6 @@
 {
  "extends": ["plugin:@nrwl/nx/react", "../../.eslintrc.json"],
-  "ignorePatterns": ["!**/*", "__generated__", "__generated___"],
+  "ignorePatterns": ["!**/*", "__generated__"],
  "overrides": [
    {
      "files": ["*.ts", "*.tsx", "*.js", "*.jsx"],
@@ -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,30 +1,7 @@
 import '@testing-library/jest-dom';
-import 'jest-canvas-mock';
 import { defaultFallbackInView } from 'react-intersection-observer';
-import ResizeObserver from 'resize-observer-polyfill';

 defaultFallbackInView(true);
-global.ResizeObserver = ResizeObserver;
-
-global.DOMRect = class DOMRect {
-  bottom = 0;
-  left = 0;
-  right = 0;
-  top = 0;
-
-  constructor(
-    public x = 0,
-    public y = 0,
-    public width = 0,
-    public height = 0
-  ) {}
-  static fromRect(other?: DOMRectInit): DOMRect {
-    return new DOMRect(other?.x, other?.y, other?.width, other?.height);
-  }
-  toJSON() {
-    return JSON.stringify(this);
-  }
-};

 Object.defineProperty(window, 'matchMedia', {
  writable: true,
@@ -39,5 +16,3 @@ Object.defineProperty(window, 'matchMedia', {
    dispatchEvent: jest.fn(),
  })),
 });
-
-jest.setTimeout(30000);
@@ -40,7 +40,11 @@ function App() {
                <div className="max-h-full min-h-full dark:bg-lite-black dark:text-neutral-200 bg-white text-neutral-800 grid grid-rows-[min-content,1fr]">
                  <Header />
                  <Main />
-                  <VegaConnectDialog connectors={Connectors} />
+                  <VegaConnectDialog
+                    connectors={Connectors}
+                    dialogOpen={vegaWalletDialog.connect}
+                    setDialogOpen={vegaWalletDialog.setConnect}
+                  />
                  <VegaManageDialog
                    dialogOpen={vegaWalletDialog.manage}
                    setDialogOpen={vegaWalletDialog.setManage}
@@ -1,112 +0,0 @@
-import React, {
-  forwardRef,
-  useCallback,
-  useContext,
-  useMemo,
-  useRef,
-} from 'react';
-import classNames from 'classnames';
-import type { AgGridReact } from 'ag-grid-react';
-import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit';
-import { ThemeContext, useScreenDimensions } from '@vegaprotocol/react-helpers';
-import type {
-  GridOptions,
-  GetRowIdParams,
-  TabToNextCellParams,
-  CellKeyDownEvent,
-  FullWidthCellKeyDownEvent,
-  IGetRowsParams,
-  IDatasource,
-} from 'ag-grid-community';
-import { NO_DATA_MESSAGE } from '../../constants';
-import * as constants from '../simple-market-list/constants';
-
-export interface GetRowsParams<T>
-  extends Omit<IGetRowsParams, 'successCallback'> {
-  successCallback(rowsThisBlock: T[], lastRow?: number): void;
-}
-
-export interface Datasource<T> extends IDatasource {
-  getRows(params: GetRowsParams<T>): void;
-}
-interface Props<T> extends GridOptions {
-  rowData?: T[];
-  datasource?: Datasource<T>;
-  handleRowClicked?: (event: { data: T }) => void;
-  components?: Record<string, unknown>;
-  classNamesParam?: string | string[];
-}
-
-const ConsoleLiteGrid = <T extends { id?: string }>(
-  { handleRowClicked, getRowId, classNamesParam, ...props }: Props<T>,
-  ref?: React.Ref<AgGridReact>
-) => {
-  const { isMobile, screenSize } = useScreenDimensions();
-  const gridRef = useRef<AgGridReact | null>(null);
-  const theme = useContext(ThemeContext);
-  const handleOnGridReady = useCallback(() => {
-    (
-      (ref as React.RefObject<AgGridReact>) || gridRef
-    ).current?.api?.sizeColumnsToFit();
-  }, [gridRef, ref]);
-  const onTabToNextCell = useCallback((params: TabToNextCellParams) => {
-    const {
-      api,
-      previousCellPosition: { rowIndex },
-    } = params;
-    const rowCount = api.getDisplayedRowCount();
-    if (rowCount <= rowIndex + 1) {
-      return null;
-    }
-    return { ...params.previousCellPosition, rowIndex: rowIndex + 1 };
-  }, []);
-  const getRowIdLocal = useCallback(({ data }: GetRowIdParams) => data.id, []);
-  const onCellKeyDown = useCallback(
-    (
-      params: (CellKeyDownEvent | FullWidthCellKeyDownEvent) & {
-        event: KeyboardEvent;
-      }
-    ) => {
-      const { event: { key = '' } = {}, data } = params;
-      if (key === 'Enter') {
-        handleRowClicked?.({ data });
-      }
-    },
-    [handleRowClicked]
-  );
-  const shouldSuppressHorizontalScroll = useMemo(() => {
-    return !isMobile && constants.LARGE_SCREENS.includes(screenSize);
-  }, [isMobile, screenSize]);
-
-  return (
-    <AgGrid
-      className={classNames(classNamesParam)}
-      rowHeight={60}
-      customThemeParams={
-        theme === 'dark'
-          ? constants.agGridDarkVariables
-          : constants.agGridLightVariables
-      }
-      onGridReady={handleOnGridReady}
-      onRowClicked={handleRowClicked}
-      rowClass={isMobile ? 'mobile' : ''}
-      rowClassRules={constants.ROW_CLASS_RULES}
-      ref={ref || gridRef}
-      overlayNoRowsTemplate={NO_DATA_MESSAGE}
-      suppressContextMenu
-      getRowId={getRowId || getRowIdLocal}
-      suppressMovableColumns
-      suppressRowTransform
-      onCellKeyDown={onCellKeyDown}
-      tabToNextCell={onTabToNextCell}
-      suppressHorizontalScroll={shouldSuppressHorizontalScroll}
-      {...props}
-    />
-  );
-};
-
-const ConsoleLiteGridForwarder = forwardRef(ConsoleLiteGrid) as <T>(
-  p: Props<T> & { ref?: React.Ref<AgGridReact> }
-) => React.ReactElement;
-
-export default ConsoleLiteGridForwarder;
@@ -1 +0,0 @@
-export { default as ConsoleLiteGrid } from './console-lite-grid';
@@ -1,11 +0,0 @@
-query MarketTags($marketId: ID!) {
-  market(id: $marketId) {
-    tradableInstrument {
-      instrument {
-        metadata {
-          tags
-        }
-      }
-    }
-  }
-}
@@ -1,14 +0,0 @@
-query PartyBalanceQuery($partyId: ID!) {
-  party(id: $partyId) {
-    accounts {
-      type
-      balance
-      asset {
-        id
-        symbol
-        name
-        decimals
-      }
-    }
-  }
-}
@@ -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;
+}
@@ -1,54 +0,0 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type MarketTagsQueryVariables = Types.Exact<{
-  marketId: Types.Scalars['ID'];
-}>;
-
-
-export type MarketTagsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null } } } } | null };
-
-
-export const MarketTagsDocument = gql`
-    query MarketTags($marketId: ID!) {
-  market(id: $marketId) {
-    tradableInstrument {
-      instrument {
-        metadata {
-          tags
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useMarketTagsQuery__
- *
- * To run a query within a React component, call `useMarketTagsQuery` and pass it any options that fit your needs.
- * When your component renders, `useMarketTagsQuery` 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 } = useMarketTagsQuery({
- *   variables: {
- *      marketId: // value for 'marketId'
- *   },
- * });
- */
-export function useMarketTagsQuery(baseOptions: Apollo.QueryHookOptions<MarketTagsQuery, MarketTagsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<MarketTagsQuery, MarketTagsQueryVariables>(MarketTagsDocument, options);
-      }
-export function useMarketTagsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarketTagsQuery, MarketTagsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<MarketTagsQuery, MarketTagsQueryVariables>(MarketTagsDocument, options);
-        }
-export type MarketTagsQueryHookResult = ReturnType<typeof useMarketTagsQuery>;
-export type MarketTagsLazyQueryHookResult = ReturnType<typeof useMarketTagsLazyQuery>;
-export type MarketTagsQueryResult = Apollo.QueryResult<MarketTagsQuery, MarketTagsQueryVariables>;
@@ -1,57 +0,0 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type PartyBalanceQueryQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type PartyBalanceQueryQuery = { __typename?: 'Query', party?: { __typename?: 'Party', accounts?: Array<{ __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } }> | null } | null };
-
-
-export const PartyBalanceQueryDocument = gql`
-    query PartyBalanceQuery($partyId: ID!) {
-  party(id: $partyId) {
-    accounts {
-      type
-      balance
-      asset {
-        id
-        symbol
-        name
-        decimals
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __usePartyBalanceQueryQuery__
- *
- * To run a query within a React component, call `usePartyBalanceQueryQuery` and pass it any options that fit your needs.
- * When your component renders, `usePartyBalanceQueryQuery` 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 } = usePartyBalanceQueryQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function usePartyBalanceQueryQuery(baseOptions: Apollo.QueryHookOptions<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>(PartyBalanceQueryDocument, options);
-      }
-export function usePartyBalanceQueryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>(PartyBalanceQueryDocument, options);
-        }
-export type PartyBalanceQueryQueryHookResult = ReturnType<typeof usePartyBalanceQueryQuery>;
-export type PartyBalanceQueryLazyQueryHookResult = ReturnType<typeof usePartyBalanceQueryLazyQuery>;
-export type PartyBalanceQueryQueryResult = Apollo.QueryResult<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>;
@@ -1,24 +1,23 @@
 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 { 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',
+    __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 { DealTicketQuery_market_tradableInstrument_instrument_product_settlementAsset } 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 { AccountType } from '@vegaprotocol/types';
-import type {
-  AccountFragment,
-  DealTicketMarketFragment,
-} from '@vegaprotocol/deal-ticket';
-import { useSettlementAccount } from '@vegaprotocol/deal-ticket';

 interface DealTicketBalanceProps {
-  settlementAsset: DealTicketMarketFragment['tradableInstrument']['instrument']['product']['settlementAsset'];
-  accounts: AccountFragment[];
+  settlementAsset: DealTicketQuery_market_tradableInstrument_instrument_product_settlementAsset;
+  accounts: PartyBalanceQuery_party_accounts[];
  isWalletConnected: boolean;
  className?: string;
 }
@@ -27,7 +26,7 @@ export const DealTicketBalance = ({
    accounts,
    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,30 +11,47 @@ 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 { keypair } = useVegaWallet();

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

  const loader = <Loader />;

  const container = marketId ? (
    <Container marketId={marketId}>
      {(data) => {
-        if (!data.market) {
-          return null as unknown as JSX.Element;
-        }
-
        const balance = (
          <DealTicketBalance
            className="mb-4"
@@ -41,14 +59,14 @@ export const DealTicketContainer = () => {
              data.market.tradableInstrument.instrument.product?.settlementAsset
            }
            accounts={partyData?.party?.accounts || []}
-            isWalletConnected={!!pubKey}
+            isWalletConnected={!!keypair?.pub}
          />
        );

        return (
          <DealTicketManager market={data.market}>
            {loading ? loader : balance}
-            <DealTicketSteps market={data.market} />
+            <DealTicketSteps market={data.market} partyData={partyData} />
          </DealTicketManager>
        );
      }}
@@ -60,7 +78,7 @@ export const DealTicketContainer = () => {
  return (
    <section className="flex p-4 md:p-6">
      <section className="w-full md:w-1/2 md:min-w-[500px]">
-        {pubKey ? container : <ConnectWallet />}
+        {keypair ? container : <ConnectWallet />}
      </section>
      <Baubles />
    </section>
@@ -1,7 +1,7 @@
 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';

@@ -13,9 +13,41 @@ interface DealTicketEstimatesProps {
  fees?: string;
  notionalSize?: string;
  size?: string;
-  slippage?: string;
 }

+interface DataTitleProps {
+  children: ReactNode;
+  quoteName?: string;
+}
+
+const DataTitle = ({ children, quoteName = '' }: DataTitleProps) => (
+  <dt>
+    {children}
+    {quoteName && <small> ({quoteName})</small>}
+  </dt>
+);
+
+interface ValueTooltipProps {
+  value: string;
+  description: string;
+  id?: string;
+}
+
+const ValueTooltipRow = ({ value, description, id }: ValueTooltipProps) => (
+  <dd className="flex gap-x-2 items-center">
+    {value}
+    <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,
@@ -24,7 +56,6 @@ export const DealTicketEstimates = ({
  fees,
  notionalSize,
  size,
-  slippage,
 }: DealTicketEstimatesProps) => (
  <dl className="text-black dark:text-white">
    {size && (
@@ -62,7 +93,7 @@ export const DealTicketEstimates = ({
      </div>
    )}
    {estMargin && (
-      <div className="flex justify-between mb-2">
+      <div className="flex justify-between mb-8">
        <DataTitle quoteName={quoteName}>{t('Est. Margin')}</DataTitle>
        <ValueTooltipRow
          value={estMargin}
@@ -71,62 +102,17 @@ export const DealTicketEstimates = ({
      </div>
    )}
    {estCloseOut && (
-      <div className="flex justify-between mb-2">
-        <DataTitle quoteName={quoteName}>{t('Est. Close out')}</DataTitle>
+      <div className="flex justify-between">
+        <dt>
+          <span>{t('Est. Close out')}</span>
+          &nbsp;
+          <small>({quoteName})</small>
+        </dt>
        <ValueTooltipRow
          value={estCloseOut}
          description={constants.EST_CLOSEOUT_TOOLTIP_TEXT}
        />
      </div>
    )}
-    {slippage && (
-      <div className="flex justify-between mb-2">
-        <DataTitle>{t('Est. Price Impact / Slippage')}</DataTitle>
-        <ValueTooltipRow description={constants.EST_SLIPPAGE}>
-          <TrafficLight value={parseFloat(slippage)} q1={1} q2={5}>
-            {slippage}%
-          </TrafficLight>
-        </ValueTooltipRow>
-      </div>
-    )}
  </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,149 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { BigNumber } from 'bignumber.js';
-import { t } from '@vegaprotocol/react-helpers';
-import {
-  SliderRoot,
-  SliderThumb,
-  SliderTrack,
-  SliderRange,
-  FormGroup,
-} from '@vegaprotocol/ui-toolkit';
-import { InputSetter } from '../input-setter';
-
-interface DealTicketSizeInputProps {
-  step: number;
-  min: number;
-  max: number;
-  value: number;
-  onValueChange: (value: number) => void;
-  positionDecimalPlaces: number;
-}
-
-const getSizeLabel = (value: number): string => {
-  const MIN_LABEL = 'Min';
-  const MAX_LABEL = 'Max';
-  if (value === 0) {
-    return MIN_LABEL;
-  } else if (value === 100) {
-    return MAX_LABEL;
-  }
-
-  return `${value}%`;
-};
-
-export const DealTicketSizeInput = ({
-  value,
-  step,
-  min,
-  max,
-  onValueChange,
-  positionDecimalPlaces,
-}: DealTicketSizeInputProps) => {
-  const sizeRatios = [0, 25, 50, 75, 100];
-  const [inputValue, setInputValue] = useState(value);
-
-  const onInputValueChange = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      let value = parseFloat(event.target.value);
-      const isLessThanMin = value < min;
-      const isMoreThanMax = value > max;
-      if (isLessThanMin) {
-        value = min;
-      } else if (isMoreThanMax) {
-        value = max;
-      }
-
-      if (value) {
-        onValueChange(value);
-      }
-
-      setInputValue(value);
-    },
-    [min, max, onValueChange, setInputValue]
-  );
-
-  const onButtonValueChange = (size: number) => {
-    const newVal = new BigNumber(size)
-      .decimalPlaces(positionDecimalPlaces)
-      .toNumber();
-    onValueChange(newVal);
-    setInputValue(newVal);
-  };
-
-  const onSliderValueChange = useCallback(
-    (value: number[]) => {
-      const val = value[0];
-      setInputValue(val);
-      onValueChange(val);
-    },
-    [onValueChange]
-  );
-
-  return (
-    <div>
-      <div className="flex justify-between text-black dark:text-white mb-2">
-        <span data-testid="min-label">{min}</span>
-        <span data-testid="max-label">{max}</span>
-      </div>
-      <SliderRoot
-        className="mb-2"
-        value={[value]}
-        onValueChange={onSliderValueChange}
-        step={step}
-        min={min}
-        max={max}
-      >
-        <SliderTrack className="bg-lightGrey dark:bg-offBlack">
-          <SliderRange className="!bg-black dark:!bg-white" />
-        </SliderTrack>
-        <SliderThumb />
-      </SliderRoot>
-
-      <div
-        data-testid="percentage-selector"
-        className="flex w-full justify-between text-black dark:text-white mb-6"
-      >
-        {sizeRatios.map((size, index) => {
-          const proportionalSize = size ? (size / 100) * max : min;
-          return (
-            <button
-              className="no-underline hover:underline text-blue"
-              onClick={() => onButtonValueChange(proportionalSize)}
-              type="button"
-              key={index}
-            >
-              {getSizeLabel(size)}
-            </button>
-          );
-        })}
-      </div>
-
-      <dl className="text-black dark:text-white">
-        <div className="flex items-center justify-between">
-          <dt>{t('Contracts')}</dt>
-          <dd className="flex justify-end w-full">
-            <FormGroup
-              hideLabel={true}
-              label="Enter Size"
-              labelFor="trade-size-input"
-              className="mb-1"
-            >
-              <InputSetter
-                id="input-order-size-market"
-                type="number"
-                step={step}
-                min={min}
-                max={max}
-                className="w-full"
-                value={inputValue}
-                onChange={onInputValueChange}
-              >
-                {inputValue}
-              </InputSetter>
-            </FormGroup>
-          </dd>
-        </div>
-      </dl>
-    </div>
-  );
-};
@@ -1,12 +1,27 @@
-import { DealTicketEstimates } from '@vegaprotocol/deal-ticket';
-import { DealTicketSizeInput } from './deal-ticket-size-input';
+import React, { useCallback, useState } from 'react';
+import classNames from 'classnames';
+import { IconNames } from '@blueprintjs/icons';
+import { t } from '@vegaprotocol/react-helpers';
+import {
+  SliderRoot,
+  SliderThumb,
+  SliderTrack,
+  SliderRange,
+  FormGroup,
+  Icon,
+  Tooltip,
+} from '@vegaprotocol/ui-toolkit';
+import { BigNumber } from 'bignumber.js';
+import { DealTicketEstimates } from './deal-ticket-estimates';
+import { InputSetter } from '../input-setter';
+import * as constants from './constants';

 interface DealTicketSizeProps {
  step: number;
  min: number;
  max: number;
-  size: number;
-  onSizeChange: (value: number) => void;
+  value: number;
+  onValueChange: (value: number[]) => void;
  name: string;
  quoteName: string;
  price: string;
@@ -15,33 +30,173 @@ interface DealTicketSizeProps {
  fees: string;
  positionDecimalPlaces: number;
  notionalSize: string;
+  slippage: string | null;
 }

+const getSizeLabel = (value: number): string => {
+  const MIN_LABEL = 'Min';
+  const MAX_LABEL = 'Max';
+  if (value === 0) {
+    return MIN_LABEL;
+  } else if (value === 100) {
+    return MAX_LABEL;
+  }
+
+  return `${value}%`;
+};
+
 export const DealTicketSize = ({
+  value,
  step,
  min,
  max,
  price,
  quoteName,
-  size,
-  onSizeChange,
+  onValueChange,
  estCloseOut,
  positionDecimalPlaces,
  fees,
  notionalSize,
+  slippage,
 }: DealTicketSizeProps) => {
+  const sizeRatios = [0, 25, 50, 75, 100];
+  const [inputValue, setInputValue] = useState(value);
+
+  const onInputValueChange = useCallback(
+    (event: React.ChangeEvent<HTMLInputElement>) => {
+      const value = parseFloat(event.target.value);
+      const isLessThanMin = value < min;
+      const isMoreThanMax = value > max;
+      if (value) {
+        if (isLessThanMin) {
+          onValueChange([min]);
+        } else if (isMoreThanMax) {
+          onValueChange([max]);
+        } else {
+          onValueChange([value]);
+        }
+      }
+      setInputValue(value);
+    },
+    [min, max, onValueChange, setInputValue]
+  );
+
+  const onButtonValueChange = useCallback(
+    (size: number) => {
+      const newVal = new BigNumber(size)
+        .decimalPlaces(positionDecimalPlaces)
+        .toNumber();
+      onValueChange([newVal]);
+      setInputValue(newVal);
+    },
+    [onValueChange, positionDecimalPlaces]
+  );
+
+  const onSliderValueChange = useCallback(
+    (value: number[]) => {
+      setInputValue(value[0]);
+      onValueChange(value);
+    },
+    [onValueChange]
+  );
+
  return max === 0 ? (
    <p>Not enough balance to trade</p>
  ) : (
    <div>
-      <DealTicketSizeInput
+      <div className="flex justify-between text-black dark:text-white mb-2">
+        <span data-testid="min-label">{min}</span>
+        <span data-testid="max-label">{max}</span>
+      </div>
+      <SliderRoot
+        className="mb-2"
+        value={[value]}
+        onValueChange={onSliderValueChange}
        step={step}
        min={min}
        max={max}
-        value={size}
-        onValueChange={onSizeChange}
-        positionDecimalPlaces={positionDecimalPlaces}
-      />
+      >
+        <SliderTrack className="bg-lightGrey dark:bg-offBlack">
+          <SliderRange className="!bg-black dark:!bg-white" />
+        </SliderTrack>
+        <SliderThumb />
+      </SliderRoot>
+
+      <div
+        data-testid="percentage-selector"
+        className="flex w-full justify-between text-black dark:text-white mb-6"
+      >
+        {sizeRatios.map((size, index) => {
+          const proportionalSize = size ? (size / 100) * max : min;
+          return (
+            <button
+              className="no-underline hover:underline text-blue"
+              onClick={() => onButtonValueChange(proportionalSize)}
+              type="button"
+              key={index}
+            >
+              {getSizeLabel(size)}
+            </button>
+          );
+        })}
+      </div>
+
+      <dl className="text-black dark:text-white">
+        <div className="flex items-center justify-between mb-4">
+          <dt>{t('Contracts')}</dt>
+          <dd className="flex justify-end w-full">
+            <FormGroup
+              hideLabel={true}
+              label="Enter Size"
+              labelFor="trade-size-input"
+            >
+              <InputSetter
+                id="input-order-size-market"
+                type="number"
+                step={step}
+                min={min}
+                max={max}
+                className="w-full"
+                value={inputValue}
+                onChange={onInputValueChange}
+              />
+            </FormGroup>
+          </dd>
+        </div>
+      </dl>
+      {slippage && (
+        <dl className="text-black dark:text-white">
+          <div className="flex items-center justify-between mb-8">
+            <dt>{t('Est. Price Impact / Slippage')}</dt>
+            <dd
+              className="flex justify-end gap-x-5"
+              data-testid="price-slippage-value"
+              aria-label={t('Est. Price Impact / Slippage')}
+            >
+              <span
+                className={classNames({
+                  'text-darkerGreen dark:text-lightGreen':
+                    parseFloat(slippage) < 1,
+                  'text-amber':
+                    parseFloat(slippage) >= 1 && parseFloat(slippage) < 5,
+                  'text-vega-red': parseFloat(slippage) >= 5,
+                })}
+              >
+                {slippage}%
+              </span>
+              <Tooltip align="center" description={constants.EST_SLIPPAGE}>
+                <div className="cursor-help" tabIndex={-1}>
+                  <Icon
+                    name={IconNames.ISSUE}
+                    className="block rotate-180"
+                    ariaLabel={constants.EST_SLIPPAGE}
+                  />
+                </div>
+              </Tooltip>
+            </dd>
+          </div>
+        </dl>
+      )}
      <DealTicketEstimates
        quoteName={quoteName}
        fees={fees}
@@ -1,112 +0,0 @@
-import React, { useCallback, useState } from 'react';
-import { t } from '@vegaprotocol/react-helpers';
-import {
-  Dialog,
-  Icon,
-  Intent,
-  Tooltip,
-  TrafficLight,
-} from '@vegaprotocol/ui-toolkit';
-import { InputSetter } from '../../components/input-setter';
-import { IconNames } from '@blueprintjs/icons';
-import {
-  DataTitle,
-  EST_SLIPPAGE,
-  ValueTooltipRow,
-} from '@vegaprotocol/deal-ticket';
-
-interface DealTicketSlippageProps {
-  step?: number;
-  min?: number;
-  max?: number;
-  value: number;
-  onValueChange(value: number): void;
-}
-
-export const DealTicketSlippage = ({
-  value,
-  step = 0.01,
-  min = 0,
-  max = 50,
-  onValueChange,
-}: DealTicketSlippageProps) => {
-  const [isDialogVisible, setIsDialogVisible] = useState(false);
-
-  const onChange = useCallback(
-    (event: React.ChangeEvent<HTMLInputElement>) => {
-      const value = event.target.value;
-      const numericValue = parseFloat(value);
-      onValueChange(numericValue);
-    },
-    [onValueChange]
-  );
-
-  const toggleDialog = useCallback(() => {
-    setIsDialogVisible(!isDialogVisible);
-  }, [isDialogVisible]);
-
-  const formLabel = (
-    <label className="flex items-center mb-1">
-      <span className="mr-1">{t('Adjust slippage tolerance')}</span>
-      <Tooltip align="center" description={EST_SLIPPAGE}>
-        <div className="cursor-help" tabIndex={-1}>
-          <Icon
-            name={IconNames.ISSUE}
-            className="block rotate-180"
-            ariaLabel={EST_SLIPPAGE}
-          />
-        </div>
-      </Tooltip>
-    </label>
-  );
-
-  return (
-    <>
-      <Dialog
-        open={isDialogVisible}
-        onChange={toggleDialog}
-        intent={Intent.None}
-        title={t('Transaction Settings')}
-      >
-        <div data-testid="slippage-dialog">
-          {formLabel}
-          <InputSetter
-            id="input-order-slippage"
-            isInputVisible
-            hasError={!value}
-            type="number"
-            step={step}
-            min={min}
-            max={max}
-            className="w-full"
-            value={value}
-            onChange={onChange}
-          >
-            {value}%
-          </InputSetter>
-        </div>
-      </Dialog>
-      <dl className="text-black dark:text-white">
-        <div className="flex justify-between mb-2">
-          <DataTitle>{t('Est. Price Impact / Slippage')}</DataTitle>
-          <div className="flex">
-            <div className="mr-1">
-              <ValueTooltipRow description={EST_SLIPPAGE}>
-                <TrafficLight value={value} q1={1} q2={5}>
-                  {value}%
-                </TrafficLight>
-              </ValueTooltipRow>
-            </div>
-            <button type="button" onClick={toggleDialog}>
-              <Icon
-                name={IconNames.COG}
-                className="block rotate-180"
-                ariaLabel={t('Override slippage value')}
-              />
-            </button>
-          </div>
-        </div>
-      </dl>
-    </>
-  );
-};
@@ -1,51 +1,48 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useForm, Controller } from 'react-hook-form';
 import { Stepper } from '../stepper';
-import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
-import {
-  useOrderCloseOut,
-  useOrderMargin,
-  usePartyBalanceQuery,
-  useMaximumPositionSize,
-  useCalculateSlippage,
-} from '@vegaprotocol/deal-ticket';
-import {
-  getDefaultOrder,
-  useOrderValidation,
-  validateSize,
-} from '@vegaprotocol/deal-ticket';
+import type { DealTicketQuery_market } from '@vegaprotocol/deal-ticket';
 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 type { Order } from '@vegaprotocol/orders';
+import { useVegaWallet, VegaTxStatus } from '@vegaprotocol/wallet';
 import {
  t,
+  addDecimal,
  toDecimal,
  removeDecimal,
-  addDecimalsFormatNumber,
 } from '@vegaprotocol/react-helpers';
 import {
+  getDefaultOrder,
+  useOrderValidation,
  useOrderSubmit,
  getOrderDialogTitle,
  getOrderDialogIntent,
  getOrderDialogIcon,
  OrderFeedback,
+  validateSize,
 } from '@vegaprotocol/orders';
 import { DealTicketSize } from './deal-ticket-size';
 import MarketNameRenderer from '../simple-market-list/simple-market-renderer';
 import SideSelector, { SIDE_NAMES } from './side-selector';
 import ReviewTrade from './review-trade';
-import { Schema } from '@vegaprotocol/types';
-import { DealTicketSlippage } from './deal-ticket-slippage';
+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';

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

-export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
+export const DealTicketSteps = ({
+  market,
+  partyData,
+}: DealTicketMarketProps) => {
  const navigate = useNavigate();
  const setMarket = useCallback(
    (marketId: string) => {
@@ -60,161 +57,102 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
    watch,
    setValue,
    formState: { errors },
-  } = useForm<OrderSubmissionBody['orderSubmission']>({
+  } = useForm<Order>({
    mode: 'onChange',
    defaultValues: getDefaultOrder(market),
  });

-  const emptyString = ' - ';
+  const [max, setMax] = useState<number | null>(null);
  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: order.type,
-    orderTimeInForce: order.timeInForce,
-    fieldErrors: errors,
-  });
-  const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();
-  const { pubKey } = useVegaWallet();
+  const estCloseOut = useOrderCloseOut({ order, market, partyData });
+  const { keypair } = useVegaWallet();
  const estMargin = useOrderMargin({
    order,
    market,
-    partyId: pubKey || '',
+    partyId: keypair?.pub || '',
  });
+  const value = new BigNumber(orderSize).toNumber();
+  const price =
+    market.depth.lastTrade &&
+    addDecimal(market.depth.lastTrade.price, market.decimalPlaces);
+  const emptyString = ' - ';

-  const { data: partyBalance } = usePartyBalanceQuery({
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
+  const [notionalSize, setNotionalSize] = useState<string | null>(null);
+  const [fees, setFees] = useState<string | null>(null);

  const maxTrade = useMaximumPositionSize({
-    partyId: pubKey || '',
-    accounts: partyBalance?.party?.accounts || [],
+    partyId: keypair?.pub || '',
+    accounts: partyData?.party?.accounts || [],
    marketId: market.id,
    settlementAssetId:
      market.tradableInstrument.instrument.product.settlementAsset.id,
    price: market?.depth?.lastTrade?.price,
    order,
  });
-
-  const estCloseOut = useOrderCloseOut({
-    order,
-    market,
-    partyData: partyBalance,
-  });
  const slippage = useCalculateSlippage({ marketId: market.id, order });
-  const [slippageValue, setSlippageValue] = useState(
-    slippage ? parseFloat(slippage) : 0
-  );
+  useEffect(() => {
+    setMax(
+      new BigNumber(maxTrade)
+        .decimalPlaces(market.positionDecimalPlaces)
+        .toNumber()
+    );
+  }, [maxTrade, market.positionDecimalPlaces]);
+
+  const { message: invalidText, isDisabled } = useOrderValidation({
+    market,
+    orderType,
+    orderTimeInForce,
+    fieldErrors: errors,
+  });
+
+  const { submit, transaction, finalizedOrder, TransactionDialog } =
+    useOrderSubmit();
+
+  const onSizeChange = (value: number[]) => {
+    const newVal = new BigNumber(value[0])
+      .decimalPlaces(market.positionDecimalPlaces)
+      .toString();
+    const isValid = validateSize(step)(newVal);
+    if (isValid !== 'step') {
+      setValue('size', newVal);
+    }
+  };
+
+  useEffect(() => {
+    if (market?.depth?.lastTrade?.price) {
+      const size = new BigNumber(market.depth.lastTrade.price)
+        .multipliedBy(value)
+        .toNumber();
+
+      setNotionalSize(addDecimal(size, market.decimalPlaces));
+    }
+  }, [market, value]);
+
+  useEffect(() => {
+    if (estMargin?.fees && notionalSize) {
+      const percentage = new BigNumber(estMargin?.fees)
+        .dividedBy(notionalSize)
+        .multipliedBy(100)
+        .decimalPlaces(2)
+        .toString();
+
+      setFees(`${estMargin.fees} (${percentage}%)`);
+    }
+  }, [estMargin, notionalSize]);
+
  const transactionStatus =
    transaction.status === VegaTxStatus.Requested ||
    transaction.status === VegaTxStatus.Pending
      ? 'pending'
      : 'default';

-  useEffect(() => {
-    setSlippageValue(slippage ? parseFloat(slippage) : 0);
-  }, [slippage]);
-
-  const price = useMemo(() => {
-    if (slippage && market?.depth?.lastTrade?.price) {
-      const isLong = order.side === Schema.Side.SIDE_BUY;
-      const multiplier = new BigNumber(1)[isLong ? 'plus' : 'minus'](
-        parseFloat(slippage) / 100
-      );
-      return new BigNumber(market?.depth?.lastTrade?.price)
-        .multipliedBy(multiplier)
-        .toNumber();
-    }
-    return null;
-  }, [market?.depth?.lastTrade?.price, order.side, slippage]);
-
-  const formattedPrice =
-    price && addDecimalsFormatNumber(price, market.decimalPlaces);
-
-  const notionalSize = useMemo(() => {
-    if (price) {
-      const size = new BigNumber(price).multipliedBy(order.size).toNumber();
-
-      return addDecimalsFormatNumber(size, market.decimalPlaces);
-    }
-    return null;
-  }, [market.decimalPlaces, order.size, price]);
-
-  const fees = useMemo(() => {
-    if (estMargin?.totalFees && notionalSize) {
-      const percentage = new BigNumber(estMargin?.totalFees)
-        .dividedBy(notionalSize)
-        .multipliedBy(100)
-        .decimalPlaces(2)
-        .toString();
-
-      return `${estMargin.totalFees} (${percentage}%)`;
-    }
-
-    return null;
-  }, [estMargin?.totalFees, notionalSize]);
-
-  const max = useMemo(() => {
-    return new BigNumber(maxTrade)
-      .decimalPlaces(market.positionDecimalPlaces)
-      .toNumber();
-  }, [market.positionDecimalPlaces, maxTrade]);
-
-  useEffect(() => {
-    setSlippageValue(slippage ? parseFloat(slippage) : 0);
-  }, [slippage]);
-
-  const onSizeChange = useCallback(
-    (value: number) => {
-      const newVal = new BigNumber(value)
-        .decimalPlaces(market.positionDecimalPlaces)
-        .toString();
-      const isValid = validateSize(step)(newVal);
-      if (isValid !== 'step') {
-        setValue('size', newVal);
-      }
-    },
-    [market.positionDecimalPlaces, setValue, step]
-  );
-
-  const onSlippageChange = useCallback(
-    (value: number) => {
-      if (market?.depth?.lastTrade?.price) {
-        if (value) {
-          const isLong = order.side === Schema.Side.SIDE_BUY;
-          const multiplier = new BigNumber(1)[isLong ? 'plus' : 'minus'](
-            value / 100
-          );
-          const bestAskPrice = new BigNumber(market?.depth?.lastTrade?.price)
-            .multipliedBy(multiplier)
-            .decimalPlaces(market.decimalPlaces)
-            .toString();
-
-          setValue('price', bestAskPrice);
-
-          if (order.type === Schema.OrderType.TYPE_MARKET) {
-            setValue('type', Schema.OrderType.TYPE_LIMIT);
-          }
-        } else {
-          setValue('type', Schema.OrderType.TYPE_MARKET);
-          setValue('price', market?.depth?.lastTrade?.price);
-        }
-      }
-      setSlippageValue(value);
-    },
-    [
-      market.decimalPlaces,
-      market?.depth?.lastTrade?.price,
-      order.side,
-      order.type,
-      setSlippageValue,
-      setValue,
-    ]
-  );
-
-  const onSubmit = useCallback(
-    (order: OrderSubmissionBody['orderSubmission']) => {
+  const onSubmit = React.useCallback(
+    (order: Order) => {
      if (transactionStatus !== 'pending') {
        submit({
          ...order,
@@ -242,7 +180,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
          ItemRenderer={MarketNameRenderer}
        />
      ),
-      value: market.tradableInstrument.instrument.name,
+      value: market.name,
    },
    {
      label: t('Select Direction'),
@@ -255,40 +193,35 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
          )}
        />
      ),
-      value: SIDE_NAMES[order.side] || '',
+      value: SIDE_NAMES[orderSide] || '',
    },
    {
      label: t('Choose Position Size'),
      component:
        max !== null ? (
-          <>
-            <DealTicketSize
-              step={step}
-              min={step}
-              max={max}
-              onSizeChange={onSizeChange}
-              size={new BigNumber(order.size).toNumber()}
-              name="size"
-              price={formattedPrice || emptyString}
-              positionDecimalPlaces={market.positionDecimalPlaces}
-              quoteName={
-                market.tradableInstrument.instrument.product.settlementAsset
-                  .symbol
-              }
-              notionalSize={notionalSize || emptyString}
-              estCloseOut={estCloseOut || emptyString}
-              fees={fees || emptyString}
-              estMargin={estMargin?.margin || emptyString}
-            />
-            <DealTicketSlippage
-              value={slippageValue}
-              onValueChange={onSlippageChange}
-            />
-          </>
+          <DealTicketSize
+            step={step}
+            min={step}
+            max={max}
+            onValueChange={onSizeChange}
+            value={new BigNumber(orderSize).toNumber()}
+            name="size"
+            price={price || emptyString}
+            positionDecimalPlaces={market.positionDecimalPlaces}
+            quoteName={
+              market.tradableInstrument.instrument.product.settlementAsset
+                .symbol
+            }
+            notionalSize={notionalSize || emptyString}
+            estCloseOut={estCloseOut}
+            fees={fees || emptyString}
+            estMargin={estMargin?.margin || emptyString}
+            slippage={slippage}
+          />
        ) : (
-          t('Loading...')
+          'loading...'
        ),
-      value: order.size,
+      value: orderSize,
    },
    {
      label: t('Review Trade'),
@@ -306,30 +239,23 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
            isDisabled={isDisabled}
            transactionStatus={transactionStatus}
            order={order}
-            estCloseOut={estCloseOut || emptyString}
+            estCloseOut={estCloseOut}
            estMargin={estMargin?.margin || emptyString}
-            price={formattedPrice || emptyString}
+            price={price || emptyString}
            quoteName={
              market.tradableInstrument.instrument.product.settlementAsset
                .symbol
            }
            notionalSize={notionalSize || emptyString}
            fees={fees || emptyString}
-            slippage={slippageValue}
          />
-          <Dialog
+          <TransactionDialog
            title={getOrderDialogTitle(finalizedOrder?.status)}
            intent={getOrderDialogIntent(finalizedOrder?.status)}
            icon={getOrderDialogIcon(finalizedOrder?.status)}
-            content={{
-              Complete: (
-                <OrderFeedback
-                  transaction={transaction}
-                  order={finalizedOrder}
-                />
-              ),
-            }}
-          />
+          >
+            <OrderFeedback transaction={transaction} order={finalizedOrder} />
+          </TransactionDialog>
        </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 type { DealTicketQuery_market } from '@vegaprotocol/deal-ticket';
+import type { Order } from '@vegaprotocol/orders';
 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!) {
@@ -32,17 +33,16 @@ export const MARKET_TAGS_QUERY = gql`
 `;

 interface Props {
-  market: DealTicketMarketFragment;
+  market: DealTicketQuery_market;
  isDisabled: boolean;
  transactionStatus?: string;
-  order: OrderSubmissionBody['orderSubmission'];
+  order: Order;
  estCloseOut: string;
  estMargin: string;
  quoteName: string;
  price: string;
  fees: string;
  notionalSize: string;
-  slippage: number;
 }

 export default ({
@@ -55,7 +55,6 @@ export default ({
  fees,
  price,
  notionalSize,
-  slippage,
 }: Props) => {
  const { data: tagsData } = useQuery<MarketTags, MarketTagsVariables>(
    MARKET_TAGS_QUERY,
@@ -72,10 +71,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 +84,7 @@ export default ({
            <div>
              {tagsData?.market?.tradableInstrument.instrument.metadata
                .tags && (
-                <MarketExpires
+                <SimpleMarketExpires
                  tags={
                    tagsData?.market.tradableInstrument.instrument.metadata.tags
                  }
@@ -107,7 +105,6 @@ export default ({
        fees={fees}
        estCloseOut={estCloseOut}
        notionalSize={notionalSize}
-        slippage={slippage.toString()}
      />

      <div className="mt-12 max-w-sm">
@@ -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>
@@ -1,17 +0,0 @@
-query DepositAssets {
-  assetsConnection {
-    edges {
-      node {
-        id
-        name
-        symbol
-        decimals
-        source {
-          ... on ERC20 {
-            contractAddress
-          }
-        }
-      }
-    }
-  }
-}
@@ -3,17 +3,15 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AssetStatus } from "@vegaprotocol/types";
-
 // ====================================================
-// GraphQL query operation: DepositAssets
+// GraphQL query operation: Deposits
 // ====================================================

-export interface DepositAssets_assetsConnection_edges_node_source_BuiltinAsset {
+export interface Deposits_assetsConnection_edges_node_source_BuiltinAsset {
  __typename: "BuiltinAsset";
 }

-export interface DepositAssets_assetsConnection_edges_node_source_ERC20 {
+export interface Deposits_assetsConnection_edges_node_source_ERC20 {
  __typename: "ERC20";
  /**
   * The address of the ERC20 contract
@@ -21,9 +19,9 @@ export interface DepositAssets_assetsConnection_edges_node_source_ERC20 {
  contractAddress: string;
 }

-export type DepositAssets_assetsConnection_edges_node_source = DepositAssets_assetsConnection_edges_node_source_BuiltinAsset | DepositAssets_assetsConnection_edges_node_source_ERC20;
+export type Deposits_assetsConnection_edges_node_source = Deposits_assetsConnection_edges_node_source_BuiltinAsset | Deposits_assetsConnection_edges_node_source_ERC20;

-export interface DepositAssets_assetsConnection_edges_node {
+export interface Deposits_assetsConnection_edges_node {
  __typename: "Asset";
  /**
   * The ID of the asset
@@ -41,35 +39,28 @@ export interface DepositAssets_assetsConnection_edges_node {
   * 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;
+  source: Deposits_assetsConnection_edges_node_source;
 }

-export interface DepositAssets_assetsConnection_edges {
+export interface Deposits_assetsConnection_edges {
  __typename: "AssetEdge";
-  /**
-   * The asset information
-   */
-  node: DepositAssets_assetsConnection_edges_node;
+  node: Deposits_assetsConnection_edges_node;
 }

-export interface DepositAssets_assetsConnection {
+export interface Deposits_assetsConnection {
  __typename: "AssetsConnection";
  /**
   * The assets
   */
-  edges: (DepositAssets_assetsConnection_edges | null)[] | null;
+  edges: (Deposits_assetsConnection_edges | null)[] | null;
 }

-export interface DepositAssets {
+export interface Deposits {
  /**
   * The list of all assets in use in the Vega network or the specified asset if ID is provided
   */
-  assetsConnection: DepositAssets_assetsConnection | null;
+  assetsConnection: Deposits_assetsConnection;
 }
@@ -1,57 +0,0 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type 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,32 +1,53 @@
-import { useMemo } from 'react';
+import { gql, useQuery } from '@apollo/client';
 import { DepositManager } from '@vegaprotocol/deposits';
 import { t } from '@vegaprotocol/react-helpers';
-import { enabledAssetsProvider } from '@vegaprotocol/assets';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
 import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { Web3Container } from '@vegaprotocol/web3';
+import { assetsConnectionToAssets } from '@vegaprotocol/react-helpers';
+import type { Deposits } from './__generated__/Deposits';
+
+const DEPOSITS_QUERY = gql`
+  query Deposits {
+    assetsConnection {
+      edges {
+        node {
+          id
+          name
+          symbol
+          decimals
+          source {
+            ... on ERC20 {
+              contractAddress
+            }
+          }
+        }
+      }
+    }
+  }
+`;

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

+  const assets = assetsConnectionToAssets(data?.assetsConnection);
+
  return (
-    <AsyncRenderer data={data} loading={loading} error={error}>
-      {data && data.length ? (
+    <AsyncRenderer<Deposits> data={data} loading={loading} error={error}>
+      {assets.length ? (
        <Web3Container>
          <DepositManager
-            assets={data}
+            assets={assets}
            isFaucetable={VEGA_ENV !== Networks.MAINNET}
          />
        </Web3Container>
@@ -22,8 +22,9 @@ export const NavigationDrawer = ({
  const width = 'w-full md:w-auto md:min-w-[15%] shrink-0';
  const position = 'absolute inset-0 h-full z-10 md:static';
  const background = 'bg-black/50 dark:bg-white/50';
+  const border = 'border-r border-neutral-300 dark:border-neutral-700';
  const flex = 'flex justify-end overflow-hidden';
-  const joinedClasses = [flex, width, position, background].join(' ');
+  const joinedClasses = [flex, width, position, background, border].join(' ');

  const outerStyles = classNames(joinedClasses, {
    visible: isMenuOpen,
@@ -1,31 +1,32 @@
 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);
  return (
    <div
-      className="dark flex items-stretch pr-6 py-6 bg-black text-neutral-400"
+      className="flex items-stretch pr-6 py-6 bg-black text-neutral-400 border-b border-neutral-300 dark:border-neutral-700"
      data-testid="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" />
+        <ThemeSwitcher
+          theme={theme}
+          onToggle={toggleTheme}
+          className="-my-4"
+          fixedBg="dark"
+        />
      </div>
    </div>
  );
@@ -1,103 +0,0 @@
-import classNames from 'classnames';
-import React, { useEffect, useRef, useState } from 'react';
-import { Link } from 'react-router-dom';
-
-export interface Item {
-  name: string;
-  id: string;
-  url?: string;
-  isActive?: boolean;
-  color?: string;
-  cssClass?: string;
-}
-
-interface Props {
-  active?: string;
-  cssClass?: string[];
-  items: Item[];
-  'data-testid'?: string;
-  'aria-label'?: string;
-}
-
-const MenuItem = ({ id, name, url, isActive, cssClass }: Item): JSX.Element => {
-  if (!url) {
-    return <span data-testid={id}>{name}</span>;
-  }
-  return (
-    <Link
-      to={url}
-      aria-label={name}
-      className={classNames('pl-0 hover:opacity-75', cssClass, {
-        active: isActive,
-      })}
-      data-testid={id}
-    >
-      {name}
-    </Link>
-  );
-};
-
-const findActive = (active?: string, items?: Item[]) => {
-  if (!active && items?.length) {
-    return 0;
-  }
-  return items?.length
-    ? items.findIndex((item) => item.id === active) || 0
-    : -1;
-};
-
-export const HorizontalMenu = ({
-  items,
-  active,
-  'data-testid': dataTestId,
-  'aria-label': ariaLabel,
-}: Props) => {
-  const [activeNumber, setActiveNumber] = useState<number>(
-    findActive(active, items)
-  );
-  const slideContRef = useRef<HTMLUListElement | null>(null);
-  const [sliderStyles, setSliderStyles] = useState<Record<string, string>>({});
-
-  useEffect(() => {
-    setActiveNumber(findActive(active, items));
-  }, [active, items]);
-
-  useEffect(() => {
-    const contStyles = (
-      slideContRef.current as HTMLUListElement
-    ).getBoundingClientRect();
-    const selectedStyles = (slideContRef.current as HTMLUListElement).children[
-      activeNumber
-    ]?.getBoundingClientRect();
-    const styles: Record<string, string> = selectedStyles
-      ? {
-          backgroundColor: items[activeNumber].color || '',
-          width: `${selectedStyles.width}px`,
-          left: `${selectedStyles.left - contStyles.left}px`,
-        }
-      : {};
-    setSliderStyles(styles);
-  }, [activeNumber, slideContRef, items]);
-
-  return items.length ? (
-    <ul
-      ref={slideContRef}
-      className="grid grid-flow-col auto-cols-min gap-4 relative pb-2 mb-2"
-      data-testid={dataTestId}
-      aria-label={ariaLabel}
-    >
-      {items.map((item, i) => (
-        <li key={item.id} className="md:mr-2 whitespace-nowrap">
-          <MenuItem {...item} isActive={i === activeNumber} />
-        </li>
-      ))}
-      <li
-        className="absolute bottom-0 h-[2px] transition-left duration-300 dark:bg-white bg-black"
-        key="slider"
-        style={sliderStyles}
-      />
-    </ul>
-  ) : null;
-};
-
-export default HorizontalMenu;
@@ -1,2 +0,0 @@
-export { default as HorizontalMenu } from './horizontal-menu';
-export type { Item as HorizontalMenuItem } from './horizontal-menu';
@@ -1,19 +1,20 @@
 import React, { useCallback, useState } from 'react';
-import type { ReactNode } from 'react';
 import { t } from '@vegaprotocol/react-helpers';
 import { Input } from '@vegaprotocol/ui-toolkit';
 import type { InputProps } from '@vegaprotocol/ui-toolkit';

 interface InputSetterProps {
  buttonLabel?: string;
+  value: string | number;
  isInputVisible?: boolean;
-  children?: ReactNode;
+  onValueChange?: () => string;
 }

 export const InputSetter = ({
  buttonLabel = t('set'),
+  value = '',
  isInputVisible = false,
-  children,
+  onValueChange,
  ...props
 }: InputSetterProps & InputProps) => {
  const [isInputToggled, setIsInputToggled] = useState(isInputVisible);
@@ -34,7 +35,7 @@ export const InputSetter = ({

  return isInputToggled ? (
    <div className="flex items-center">
-      <Input {...props} onKeyDown={onInputEnter} />
+      <Input {...props} value={value} onKeyDown={onInputEnter} />
      <button
        type="button"
        className="no-underline hover:underline text-blue ml-2"
@@ -46,10 +47,10 @@ export const InputSetter = ({
  ) : (
    <button
      type="button"
-      className="no-underline hover:underline text-blue py-1.5"
+      className="no-underline hover:underline text-blue"
      onClick={toggleInput}
    >
-      {children || props.value}
+      {value}
    </button>
  );
 };
@@ -8,7 +8,7 @@ interface TabBarProps {
 export const TabBar = ({ className }: TabBarProps) => (
  <div role="group" aria-label="Tab Bar Navigation Menu" className={className}>
    <div role="presentation" className="py-[42px]" />
-    <div className="md:hidden fixed bottom-0 left-0 right-0 bg-black py-4 border-t border-neutral-300 dark:border-neutral-600">
+    <div className="md:hidden fixed bottom-0 left-0 right-0 bg-black py-4 border-t border-neutral-300 dark:border-neutral-700">
      <Nav tabs className="flex justify-evenly items-center" />
    </div>
  </div>
@@ -1,79 +0,0 @@
-import { useMemo, useRef, useCallback } from 'react';
-import { useOutletContext } from 'react-router-dom';
-import type { AgGridReact } from 'ag-grid-react';
-import { PriceCell, useDataProvider } from '@vegaprotocol/react-helpers';
-import type { AccountFields } from '@vegaprotocol/accounts';
-import { aggregatedAccountsDataProvider, getId } from '@vegaprotocol/accounts';
-import type { IGetRowsParams } from 'ag-grid-community';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import {
-  AssetDetailsDialog,
-  useAssetDetailsDialogStore,
-} from '@vegaprotocol/assets';
-import { NO_DATA_MESSAGE } from '../../../constants';
-import { ConsoleLiteGrid } from '../../console-lite-grid';
-import { useAccountColumnDefinitions } from '.';
-
-const AccountsManager = () => {
-  const { partyId = '' } = useOutletContext<{ partyId: string }>();
-  const { isOpen, symbol, setOpen } = useAssetDetailsDialogStore();
-  const gridRef = useRef<AgGridReact | null>(null);
-  const dataRef = useRef<AccountFields[] | null>(null);
-  const variables = useMemo(() => ({ partyId }), [partyId]);
-  const update = useCallback(
-    ({ data }: { data: AccountFields[] | null }) => {
-      dataRef.current = data;
-      gridRef.current?.api?.refreshInfiniteCache();
-      return true;
-    },
-    [gridRef]
-  );
-  const { data, error, loading } = useDataProvider<AccountFields[], never>({
-    dataProvider: aggregatedAccountsDataProvider,
-    update,
-    variables,
-  });
-  if (!dataRef.current && data) {
-    dataRef.current = data;
-  }
-  const getRows = async ({
-    successCallback,
-    startRow,
-    endRow,
-  }: IGetRowsParams) => {
-    const rowsThisBlock = dataRef.current
-      ? dataRef.current.slice(startRow, endRow)
-      : [];
-    const lastRow = dataRef.current?.length ?? -1;
-    successCallback(rowsThisBlock, lastRow);
-  };
-  const { columnDefs, defaultColDef } = useAccountColumnDefinitions();
-  return (
-    <>
-      <AsyncRenderer
-        loading={loading}
-        error={error}
-        data={data}
-        noDataMessage={NO_DATA_MESSAGE}
-      >
-        <ConsoleLiteGrid<AccountFields>
-          rowData={data?.length ? undefined : []}
-          rowModelType={data?.length ? 'infinite' : 'clientSide'}
-          ref={gridRef}
-          datasource={{ getRows }}
-          columnDefs={columnDefs}
-          defaultColDef={defaultColDef}
-          components={{ PriceCell }}
-          getRowId={({ data }) => getId(data)}
-        />
-      </AsyncRenderer>
-      <AssetDetailsDialog
-        assetSymbol={symbol}
-        open={isOpen}
-        onChange={(open) => setOpen(open)}
-      />
-    </>
-  );
-};
-
-export default AccountsManager;
@@ -1,2 +0,0 @@
-export { default as AccountManager } from './accounts';
-export { default as useAccountColumnDefinitions } from './use-column-definitions';
@@ -1,80 +0,0 @@
-import React, { useMemo } from 'react';
-import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
-import type { AccountFields } from '@vegaprotocol/accounts';
-import { useAssetDetailsDialogStore } from '@vegaprotocol/assets';
-import type { ColDef, GroupCellRendererParams } from 'ag-grid-community';
-import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
-
-const useAccountColumnDefinitions = () => {
-  const { open } = useAssetDetailsDialogStore();
-  const columnDefs: ColDef[] = useMemo(() => {
-    return [
-      {
-        colId: 'account-asset',
-        headerName: t('Asset'),
-        field: 'asset.symbol',
-        headerClass: 'uppercase justify-start',
-        cellClass: 'uppercase flex h-full items-center md:pl-4',
-        cellRenderer: ({ value }: GroupCellRendererParams) =>
-          value && value.length > 0 ? (
-            <div className="md:pl-4 grid h-full items-center" title={value}>
-              <div className="truncate min-w-0">
-                <button
-                  className="hover:underline"
-                  onClick={() => {
-                    open(value);
-                  }}
-                >
-                  {value}
-                </button>
-              </div>
-            </div>
-          ) : (
-            ''
-          ),
-      },
-      {
-        colId: 'deposited',
-        headerName: t('Deposited'),
-        field: 'deposited',
-        cellRenderer: 'PriceCell',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<AccountFields, 'deposited'>) => {
-          if (value && data) {
-            return addDecimalsFormatNumber(value, data.asset.decimals);
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'used',
-        headerName: t('Used'),
-        field: 'used',
-        cellRenderer: 'PriceCell',
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<AccountFields, 'used'>) => {
-          if (value && data) {
-            return addDecimalsFormatNumber(value, data.asset.decimals);
-          }
-          return '-';
-        },
-      },
-    ];
-  }, [open]);
-
-  const defaultColDef = useMemo(() => {
-    return {
-      sortable: true,
-      unSortIcon: true,
-      headerClass: 'uppercase',
-      editable: false,
-    };
-  }, []);
-  return { columnDefs, defaultColDef };
-};
-
-export default useAccountColumnDefinitions;
@@ -1,35 +0,0 @@
-import { t } from '@vegaprotocol/react-helpers';
-
-export const PORTFOLIO_ASSETS = 'assets';
-export const PORTFOLIO_POSITIONS = 'positions';
-export const PORTFOLIO_ORDERS = 'orders';
-export const PORTFOLIO_FILLS = 'fills';
-export const PORTFOLIO_DEPOSITS = 'deposits';
-
-export const PORTFOLIO_ITEMS = [
-  {
-    name: t('Assets'),
-    id: PORTFOLIO_ASSETS,
-    url: `/portfolio/${PORTFOLIO_ASSETS}`,
-  },
-  {
-    name: t('Positions'),
-    id: PORTFOLIO_POSITIONS,
-    url: `/portfolio/${PORTFOLIO_POSITIONS}`,
-  },
-  {
-    name: t('Orders'),
-    id: PORTFOLIO_ORDERS,
-    url: `/portfolio/${PORTFOLIO_ORDERS}`,
-  },
-  {
-    name: t('Fills'),
-    id: PORTFOLIO_FILLS,
-    url: `/portfolio/${PORTFOLIO_FILLS}`,
-  },
-  {
-    name: t('Deposits'),
-    id: PORTFOLIO_DEPOSITS,
-    url: `/portfolio/${PORTFOLIO_DEPOSITS}`,
-  },
-];
@@ -1,53 +0,0 @@
-import { useRef } from 'react';
-import { useOutletContext } from 'react-router-dom';
-import type { AgGridReact } from 'ag-grid-react';
-import type { Trade } from '@vegaprotocol/fills';
-import { useFillsList } from '@vegaprotocol/fills';
-import type { BodyScrollEndEvent, BodyScrollEvent } from 'ag-grid-community';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { ConsoleLiteGrid } from '../../console-lite-grid';
-import { NO_DATA_MESSAGE } from '../../../constants';
-import useColumnDefinitions from './use-column-definitions';
-
-const FillsManager = () => {
-  const { partyId } = useOutletContext<{ partyId: string }>();
-  const { columnDefs, defaultColDef } = useColumnDefinitions({ partyId });
-  const gridRef = useRef<AgGridReact | null>(null);
-  const scrolledToTop = useRef(true);
-  const { data, error, loading, addNewRows, getRows } = useFillsList({
-    partyId,
-    gridRef,
-    scrolledToTop,
-  });
-
-  const onBodyScrollEnd = (event: BodyScrollEndEvent) => {
-    if (event.top === 0) {
-      addNewRows();
-    }
-  };
-
-  const onBodyScroll = (event: BodyScrollEvent) => {
-    scrolledToTop.current = event.top <= 0;
-  };
-
-  return (
-    <AsyncRenderer
-      loading={loading}
-      error={error}
-      data={data?.length ? data : null}
-      noDataMessage={NO_DATA_MESSAGE}
-    >
-      <ConsoleLiteGrid<Trade>
-        ref={gridRef}
-        rowModelType="infinite"
-        datasource={{ getRows }}
-        onBodyScrollEnd={onBodyScrollEnd}
-        onBodyScroll={onBodyScroll}
-        columnDefs={columnDefs}
-        defaultColDef={defaultColDef}
-      />
-    </AsyncRenderer>
-  );
-};
-
-export default FillsManager;
@@ -1 +0,0 @@
-export { default as FillsManager } from './fills';
@@ -1,190 +0,0 @@
-import { useMemo } from 'react';
-import type { ColDef, ValueFormatterParams } from 'ag-grid-community';
-import type { Trade } from '@vegaprotocol/fills';
-import classNames from 'classnames';
-import {
-  addDecimal,
-  addDecimalsFormatNumber,
-  formatNumber,
-  getDateTimeFormat,
-  negativeClassNames,
-  positiveClassNames,
-  t,
-} from '@vegaprotocol/react-helpers';
-import BigNumber from 'bignumber.js';
-import { Schema } from '@vegaprotocol/types';
-
-interface Props {
-  partyId: string;
-}
-
-const useColumnDefinitions = ({ partyId }: Props) => {
-  const columnDefs: ColDef[] = useMemo(() => {
-    return [
-      {
-        colId: 'market',
-        headerName: t('Market'),
-        field: 'market.tradableInstrument.instrument.name',
-        cellClass: '!flex h-full items-center !md:pl-4',
-        minWidth: 150,
-      },
-      {
-        colId: 'size',
-        headerName: t('Size'),
-        headerClass: 'uppercase',
-        field: 'size',
-        width: 100,
-        cellClass: ({ data }: { data: Trade }) => {
-          return classNames('!flex h-full items-center justify-center', {
-            [positiveClassNames]: data?.buyer.id === partyId,
-            [negativeClassNames]: data?.seller.id,
-          });
-        },
-        valueFormatter: ({ value, data }: ValueFormatterParams) => {
-          if (value && data?.market) {
-            let prefix;
-            if (data.buyer.id === partyId) {
-              prefix = '+';
-            } else if (data.seller.id) {
-              prefix = '-';
-            }
-
-            const size = addDecimalsFormatNumber(
-              value,
-              data.market.positionDecimalPlaces
-            );
-            return `${prefix}${size}`;
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'value',
-        headerName: t('Value'),
-        headerClass: 'uppercase text-center',
-        cellClass: '!flex h-full items-center',
-        field: 'price',
-        valueFormatter: ({ value, data }: ValueFormatterParams) => {
-          if (value && data?.market) {
-            const asset =
-              data.market.tradableInstrument.instrument.product.settlementAsset
-                .symbol;
-            const valueFormatted = addDecimalsFormatNumber(
-              value,
-              data.market.decimalPlaces
-            );
-            return `${valueFormatted} ${asset}`;
-          }
-          return '-';
-        },
-        type: 'rightAligned',
-      },
-      {
-        colId: 'filledvalue',
-        headerName: t('Filled value'),
-        headerClass: 'uppercase text-center',
-        cellClass: '!flex h-full items-center',
-        field: 'price',
-        valueFormatter: ({ value, data }: ValueFormatterParams) => {
-          if (value && data?.market) {
-            const asset =
-              data.market.tradableInstrument.instrument.product.settlementAsset
-                .symbol;
-            const size = new BigNumber(
-              addDecimal(data.size, data.market.positionDecimalPlaces)
-            );
-            const price = new BigNumber(
-              addDecimal(value, data.market.decimalPlaces)
-            );
-
-            const total = size.times(price).toString();
-            const valueFormatted = formatNumber(
-              total,
-              data?.market.decimalPlaces
-            );
-            return `${valueFormatted} ${asset}`;
-          }
-          return '-';
-        },
-        type: 'rightAligned',
-      },
-      {
-        colId: 'role',
-        headerName: t('Role'),
-        field: 'aggressor',
-        width: 100,
-        valueFormatter: ({ value, data }: ValueFormatterParams) => {
-          if (value && data) {
-            const taker = t('Taker');
-            const maker = t('Maker');
-            if (data?.buyer.id === partyId) {
-              if (value === Schema.Side.SIDE_BUY) {
-                return taker;
-              } else {
-                return maker;
-              }
-            } else if (data?.seller.id === partyId) {
-              if (value === Schema.Side.SIDE_SELL) {
-                return taker;
-              } else {
-                return maker;
-              }
-            }
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'fee',
-        headerName: t('Fee'),
-        headerClass: 'uppercase text-center',
-        cellClass: '!flex h-full items-center',
-        field: 'market.tradableInstrument.instrument.product',
-        valueFormatter: ({ value, data }: ValueFormatterParams) => {
-          if (value && data) {
-            const asset = value.settlementAsset;
-            let feesObj;
-            if (data.buyer.id === partyId) {
-              feesObj = data.buyerFee;
-            } else if (data?.seller.id === partyId) {
-              feesObj = data?.sellerFee;
-            } else {
-              return '-';
-            }
-
-            const fee = new BigNumber(feesObj.makerFee)
-              .plus(feesObj.infrastructureFee)
-              .plus(feesObj.liquidityFee);
-            const totalFees = addDecimalsFormatNumber(
-              fee.toString(),
-              asset.decimals
-            );
-            return `${totalFees} ${asset.symbol}`;
-          }
-          return '-';
-        },
-        type: 'rightAligned',
-      },
-      {
-        colId: 'date',
-        headerName: t('Date'),
-        field: 'createdAt',
-        valueFormatter: ({ value }: ValueFormatterParams) => {
-          return value ? getDateTimeFormat().format(new Date(value)) : '-';
-        },
-      },
-    ];
-  }, [partyId]);
-
-  const defaultColDef = useMemo(() => {
-    return {
-      sortable: true,
-      unSortIcon: true,
-      headerClass: 'uppercase',
-      cellClass: '!flex h-full items-center',
-    };
-  }, []);
-  return { columnDefs, defaultColDef };
-};
-
-export default useColumnDefinitions;
@@ -1,6 +1 @@
 export * from './portfolio';
-export * from './accounts';
-export * from './fills';
-export * from './orders';
-export * from './positions';
-export * as constants from './constants';
@@ -1 +0,0 @@
-export { default as OrdersManager } from './orders';
@@ -1,107 +0,0 @@
-import { useRef, useState } from 'react';
-import type { AgGridReact } from 'ag-grid-react';
-import type { BodyScrollEndEvent, BodyScrollEvent } from 'ag-grid-community';
-import { useOutletContext } from 'react-router-dom';
-import type { Order } from '@vegaprotocol/orders';
-import {
-  useOrderCancel,
-  useOrderListData,
-  useOrderEdit,
-  OrderFeedback,
-  getCancelDialogTitle,
-  getCancelDialogIntent,
-  getEditDialogTitle,
-  OrderEditDialog,
-} from '@vegaprotocol/orders';
-import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
-import { ConsoleLiteGrid } from '../../console-lite-grid';
-import { NO_DATA_MESSAGE } from '../../../constants';
-import useColumnDefinitions from './use-column-definitions';
-
-const OrdersManager = () => {
-  const { partyId } = useOutletContext<{ partyId: string }>();
-  const [editOrder, setEditOrder] = useState<Order | null>(null);
-  const orderCancel = useOrderCancel();
-  const orderEdit = useOrderEdit(editOrder);
-  const { columnDefs, defaultColDef } = useColumnDefinitions({
-    setEditOrder,
-    orderCancel,
-  });
-
-  const gridRef = useRef<AgGridReact | null>(null);
-  const scrolledToTop = useRef(true);
-
-  const { data, error, loading, addNewRows, getRows } = useOrderListData({
-    partyId,
-    gridRef,
-    scrolledToTop,
-  });
-
-  const onBodyScrollEnd = (event: BodyScrollEndEvent) => {
-    if (event.top === 0) {
-      addNewRows();
-    }
-  };
-
-  const onBodyScroll = (event: BodyScrollEvent) => {
-    scrolledToTop.current = event.top <= 0;
-  };
-
-  return (
-    <AsyncRenderer
-      loading={loading}
-      error={error}
-      data={data?.length ? data : null}
-      noDataMessage={NO_DATA_MESSAGE}
-    >
-      <ConsoleLiteGrid<Order>
-        ref={gridRef}
-        rowModelType={data?.length ? 'infinite' : 'clientSide'}
-        rowData={data?.length ? undefined : []}
-        datasource={{ getRows }}
-        onBodyScrollEnd={onBodyScrollEnd}
-        onBodyScroll={onBodyScroll}
-        columnDefs={columnDefs}
-        defaultColDef={defaultColDef}
-      />
-      <orderCancel.Dialog
-        title={getCancelDialogTitle(orderCancel.cancelledOrder?.status)}
-        intent={getCancelDialogIntent(orderCancel.cancelledOrder?.status)}
-        content={{
-          Complete: (
-            <OrderFeedback
-              transaction={orderCancel.transaction}
-              order={orderCancel.cancelledOrder}
-            />
-          ),
-        }}
-      />
-      <orderEdit.Dialog
-        title={getEditDialogTitle(orderEdit.updatedOrder?.status)}
-        content={{
-          Complete: (
-            <OrderFeedback
-              transaction={orderEdit.transaction}
-              order={orderEdit.updatedOrder}
-            />
-          ),
-        }}
-      />
-      {editOrder && (
-        <OrderEditDialog
-          isOpen={Boolean(editOrder)}
-          onChange={(isOpen) => {
-            if (!isOpen) setEditOrder(null);
-          }}
-          order={editOrder}
-          onSubmit={(fields) => {
-            setEditOrder(null);
-            orderEdit.edit({ price: fields.limitPrice });
-          }}
-        />
-      )}
-    </AsyncRenderer>
-  );
-};
-
-export default OrdersManager;
@@ -1,278 +0,0 @@
-import { useMemo } from 'react';
-import type {
-  ColDef,
-  ValueFormatterParams,
-  ICellRendererParams,
-} from 'ag-grid-community';
-import {
-  addDecimal,
-  getDateTimeFormat,
-  negativeClassNames,
-  positiveClassNames,
-  t,
-} from '@vegaprotocol/react-helpers';
-import type {
-  OrderFieldsFragment,
-  Order,
-  CancelOrderArgs,
-} from '@vegaprotocol/orders';
-import { isOrderActive } from '@vegaprotocol/orders';
-import {
-  OrderRejectionReasonMapping,
-  OrderStatusMapping,
-  OrderTypeMapping,
-  Schema,
-  OrderTimeInForceMapping,
-} from '@vegaprotocol/types';
-
-import BigNumber from 'bignumber.js';
-import { Button } from '@vegaprotocol/ui-toolkit';
-
-type StatusKey = keyof typeof OrderStatusMapping;
-type RejectReasonKey = keyof typeof OrderRejectionReasonMapping;
-type OrderTimeKey = keyof typeof OrderTimeInForceMapping;
-interface Props {
-  setEditOrder: (order: Order) => void;
-  orderCancel: {
-    cancel: (args: CancelOrderArgs) => void;
-    [key: string]: unknown;
-  };
-}
-
-const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
-  const columnDefs: ColDef[] = useMemo(() => {
-    return [
-      {
-        colId: 'market',
-        headerName: t('Market'),
-        field: 'market.tradableInstrument.instrument.code',
-        headerClass: 'uppercase justify-start',
-        cellClass: '!flex h-full items-center !md:pl-4',
-      },
-      {
-        colId: 'size',
-        headerName: t('Size'),
-        field: 'size',
-        headerClass: 'uppercase',
-        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,
-        },
-        valueFormatter: ({ value, data }: ValueFormatterParams) => {
-          if (value && data && data.market) {
-            const prefix = data
-              ? data.side === Schema.Side.SIDE_BUY
-                ? '+'
-                : '-'
-              : '';
-            return (
-              prefix + addDecimal(value, data.market.positionDecimalPlaces)
-            );
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'type',
-        field: 'type',
-        width: 80,
-        valueFormatter: ({
-          value,
-        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['type'];
-        }) => OrderTypeMapping[value as Schema.OrderType],
-      },
-      {
-        colId: 'status',
-        field: 'status',
-        cellClass: 'text-center font-mono !flex h-full items-center',
-        valueFormatter: ({
-          value,
-          data,
-        }: ValueFormatterParams & {
-          value?: StatusKey;
-        }) => {
-          if (value && data && data.market) {
-            if (value === Schema.OrderStatus.STATUS_REJECTED) {
-              return `${OrderStatusMapping[value as StatusKey]}: ${
-                data.rejectionReason &&
-                OrderRejectionReasonMapping[
-                  data.rejectionReason as RejectReasonKey
-                ]
-              }`;
-            }
-            return OrderStatusMapping[value as StatusKey] as string;
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'filled',
-        headerName: t('Filled'),
-        headerClass: 'uppercase',
-        field: 'remaining',
-        cellClass: 'font-mono text-center !flex h-full items-center',
-        width: 80,
-        valueFormatter: ({
-          data,
-          value,
-        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['remaining'];
-        }) => {
-          if (value && data && data.market) {
-            const dps = data.market.positionDecimalPlaces;
-            const size = new BigNumber(data.size);
-            const remaining = new BigNumber(value);
-            const fills = size.minus(remaining);
-            return `${addDecimal(fills.toString(), dps)}/${addDecimal(
-              size.toString(),
-              dps
-            )}`;
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'price',
-        field: 'price',
-        type: 'rightAligned',
-        width: 125,
-        headerClass: 'uppercase text-right',
-        cellClass: 'font-mono text-right !flex h-full items-center',
-        valueFormatter: ({
-          value,
-          data,
-        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['price'];
-        }) => {
-          if (
-            value === undefined ||
-            !data ||
-            !data.market ||
-            data.type === Schema.OrderType.TYPE_MARKET
-          ) {
-            return '-';
-          }
-          return addDecimal(value, data.market.decimalPlaces);
-        },
-      },
-      {
-        colId: 'timeInForce',
-        field: 'timeInForce',
-        minWidth: 120,
-        valueFormatter: ({
-          value,
-          data,
-        }: ValueFormatterParams & {
-          value?: OrderTimeKey;
-        }) => {
-          if (value && data?.market) {
-            if (
-              value === Schema.OrderTimeInForce.TIME_IN_FORCE_GTT &&
-              data.expiresAt
-            ) {
-              const expiry = getDateTimeFormat().format(
-                new Date(data.expiresAt)
-              );
-              return `${
-                OrderTimeInForceMapping[value as OrderTimeKey]
-              }: ${expiry}`;
-            }
-
-            return OrderTimeInForceMapping[value as OrderTimeKey];
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'createdat',
-        field: 'createdAt',
-        valueFormatter: ({
-          value,
-        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['createdAt'];
-        }) => {
-          return value ? getDateTimeFormat().format(new Date(value)) : value;
-        },
-      },
-      {
-        colId: 'updated',
-        field: 'updatedAt',
-        cellClass: '!flex h-full items-center justify-center',
-        valueFormatter: ({
-          value,
-        }: ValueFormatterParams & {
-          value?: OrderFieldsFragment['updatedAt'];
-        }) => {
-          return value ? getDateTimeFormat().format(new Date(value)) : '-';
-        },
-      },
-      {
-        colId: 'edit',
-        field: 'edit',
-        width: 75,
-        cellRenderer: ({ data }: ICellRendererParams) => {
-          if (!data) return null;
-          if (isOrderActive(data.status)) {
-            return (
-              <Button
-                data-testid="edit"
-                onClick={() => {
-                  setEditOrder(data);
-                }}
-                size="xs"
-              >
-                {t('Edit')}
-              </Button>
-            );
-          }
-
-          return null;
-        },
-      },
-      {
-        colId: 'cancel',
-        field: 'cancel',
-        minWidth: 130,
-        cellRenderer: ({ data }: ICellRendererParams) => {
-          if (!data) return null;
-          if (isOrderActive(data.status)) {
-            return (
-              <Button
-                size="xs"
-                data-testid="cancel"
-                onClick={() => {
-                  if (data.market) {
-                    orderCancel.cancel({
-                      orderId: data.id,
-                      marketId: data.market.id,
-                    });
-                  }
-                }}
-              >
-                Cancel
-              </Button>
-            );
-          }
-
-          return null;
-        },
-      },
-    ];
-  }, [orderCancel, setEditOrder]);
-  const defaultColDef = useMemo(() => {
-    return {
-      sortable: true,
-      unSortIcon: true,
-      headerClass: 'uppercase',
-      cellClass: '!flex h-full items-center',
-    };
-  }, []);
-  return { columnDefs, defaultColDef };
-};
-
-export default useColumnDefinitions;
@@ -1,27 +1,40 @@
-import React from 'react';
+import * as React from 'react';
+import { AccountsContainer } from '@vegaprotocol/accounts';
+import { t } from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
+import { Tabs, Tab } from '@vegaprotocol/ui-toolkit';
+import { OrderListContainer } from '@vegaprotocol/orders';
+import { PositionsContainer } from '@vegaprotocol/positions';
+import { FillsContainer } from '@vegaprotocol/fills';
 import ConnectWallet from '../wallet-connector';
-import { useOutlet, useLocation } from 'react-router-dom';
-import { HorizontalMenu } from '../horizontal-menu';
-import * as constants from './constants';
+import { DepositContainer } from '../deposits';

 export const Portfolio = () => {
-  const { pubKey } = useVegaWallet();
-  const { pathname } = useLocation();
-  const module = pathname.split('/portfolio/')?.[1] ?? '';
-  const outlet = useOutlet({ partyId: pubKey || '' });
-  if (!pubKey) {
+  const { keypair } = useVegaWallet();
+  if (!keypair) {
    return (
      <section className="xl:w-1/2">
        <ConnectWallet />
      </section>
    );
  }
-
  return (
-    <div className="h-full p-4 md:p-6 grid grid-rows-[min-content_1fr]">
-      <HorizontalMenu active={module} items={constants.PORTFOLIO_ITEMS} />
-      {outlet}
-    </div>
+    <Tabs>
+      <Tab id="assets" name={t('Assets')}>
+        <AccountsContainer />
+      </Tab>
+      <Tab id="positions" name={t('Positions')}>
+        <PositionsContainer />
+      </Tab>
+      <Tab id="orders" name={t('Orders')}>
+        <OrderListContainer />
+      </Tab>
+      <Tab id="fills" name={t('Fills')}>
+        <FillsContainer />
+      </Tab>
+      <Tab id="deposits" name={t('Deposits')}>
+        <DepositContainer />
+      </Tab>
+    </Tabs>
  );
 };
@@ -1 +0,0 @@
-export { default as PositionsManager } from './positions';
@@ -1,58 +0,0 @@
-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,28 +0,0 @@
-import { useOutletContext } from 'react-router-dom';
-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 { partyId } = useOutletContext<{ partyId: string }>();
-  const { data, error, loading, assetSymbols } = usePositionsAssets(partyId);
-  return (
-    <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>
-  );
-};
-
-export default Positions;
@@ -1,278 +0,0 @@
-import { useMemo } from 'react';
-import {
-  addDecimalsFormatNumber,
-  formatNumber,
-  getDateTimeFormat,
-  PriceFlashCell,
-  signedNumberCssClassRules,
-  t,
-} from '@vegaprotocol/react-helpers';
-import type { Position } from '@vegaprotocol/positions';
-import { AmountCell } from '@vegaprotocol/positions';
-import type {
-  CellRendererSelectorResult,
-  ICellRendererParams,
-  ValueGetterParams,
-  GroupCellRendererParams,
-  ColDef,
-} from 'ag-grid-community';
-import { MarketTradingMode } from '@vegaprotocol/types';
-import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
-import { Intent, ProgressBarCell } from '@vegaprotocol/ui-toolkit';
-
-const EmptyCell = () => '';
-
-const useColumnDefinitions = () => {
-  const columnDefs: ColDef[] = useMemo(() => {
-    return [
-      {
-        colId: 'market',
-        headerName: t('Market'),
-        headerClass: 'uppercase justify-start',
-        cellClass: '!flex h-full items-center !md:pl-4',
-        field: 'marketName',
-        cellRenderer: ({ value }: GroupCellRendererParams) => {
-          if (!value) {
-            return null;
-          }
-          const valueFormatted: [string, string?] = (() => {
-            // split market name into two parts, 'Part1 (Part2)' or 'Part1 - Part2'
-            const matches = value.match(/^(.*)(\((.*)\)| - (.*))\s*$/);
-            if (matches && matches[1] && matches[3]) {
-              return [matches[1].trim(), matches[3].trim()];
-            }
-            return [value];
-          })();
-          if (valueFormatted && valueFormatted[1]) {
-            return (
-              <div className="leading-tight">
-                <div>{valueFormatted[0]}</div>
-                <div>{valueFormatted[1]}</div>
-              </div>
-            );
-          }
-          return valueFormatted ? valueFormatted[0] : null;
-        },
-      },
-      {
-        colId: 'amount',
-        headerName: t('Amount'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full items-center',
-        field: 'openVolume',
-        valueGetter: ({ node, data }: ValueGetterParams) => {
-          return node?.rowPinned ? data?.notional : data?.openVolume;
-        },
-        type: 'rightAligned',
-        cellRendererSelector: (
-          params: ICellRendererParams
-        ): CellRendererSelectorResult => {
-          return {
-            component: params.node.rowPinned ? PriceFlashCell : AmountCell,
-          };
-        },
-        valueFormatter: ({
-          value,
-          data,
-          node,
-        }: VegaValueFormatterParams<Position, 'openVolume'>) => {
-          let ret;
-          if (value && data) {
-            ret = node?.rowPinned
-              ? addDecimalsFormatNumber(value, data.decimals)
-              : data;
-          }
-          // FIXME this column needs refactoring
-          return ret as unknown as string;
-        },
-      },
-      {
-        colId: 'markprice',
-        headerName: t('Mark price'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full items-center justify-center',
-        field: 'markPrice',
-        cellRendererSelector: (
-          params: ICellRendererParams
-        ): CellRendererSelectorResult => {
-          return {
-            component: params.node.rowPinned ? EmptyCell : PriceFlashCell,
-          };
-        },
-        valueFormatter: ({
-          value,
-          data,
-          node,
-        }: VegaValueFormatterParams<Position, 'markPrice'>) => {
-          if (
-            data &&
-            value &&
-            node?.rowPinned &&
-            data.marketTradingMode ===
-              MarketTradingMode.TRADING_MODE_OPENING_AUCTION
-          ) {
-            return addDecimalsFormatNumber(
-              value.toString(),
-              data.marketDecimalPlaces
-            );
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'entryprice',
-        headerName: t('Entry price'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full items-center',
-        field: 'averageEntryPrice',
-        headerComponentParams: {
-          template:
-            '<div class="ag-cell-label-container" role="presentation">' +
-            `  <span>${t('Liquidation price (est)')}</span>` +
-            '  <span ref="eText" class="ag-header-cell-text"></span>' +
-            '</div>',
-        },
-        cellRenderer: ({ node, data }: GroupCellRendererParams) => {
-          const valueFormatted =
-            data && !node?.rowPinned
-              ? (() => {
-                  const min = BigInt(data.averageEntryPrice);
-                  const max = BigInt(data.liquidationPrice);
-                  const mid = BigInt(data.markPrice);
-                  const range = max - min;
-                  return {
-                    low: addDecimalsFormatNumber(
-                      min.toString(),
-                      data.marketDecimalPlaces
-                    ),
-                    high: addDecimalsFormatNumber(
-                      max.toString(),
-                      data.marketDecimalPlaces
-                    ),
-                    value: range
-                      ? Number(((mid - min) * BigInt(100)) / range)
-                      : 0,
-                    intent: data.lowMarginLevel ? Intent.Warning : undefined,
-                  };
-                })()
-              : undefined;
-          return node.rowPinned ? (
-            ''
-          ) : (
-            <ProgressBarCell valueFormatted={valueFormatted} />
-          );
-        },
-      },
-      {
-        colId: 'leverage',
-        headerName: t('Leverage'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full items-center justify-center',
-        field: 'currentLeverage',
-        type: 'rightAligned',
-        cellRendererSelector: (
-          params: ICellRendererParams
-        ): CellRendererSelectorResult => {
-          return {
-            component: params.node.rowPinned ? EmptyCell : PriceFlashCell,
-          };
-        },
-        valueFormatter: ({
-          value,
-          node,
-        }: VegaValueFormatterParams<Position, 'currentLeverage'>) =>
-          value === undefined ? '' : formatNumber(value.toString(), 1),
-      },
-      {
-        colId: 'marginallocated',
-        headerName: t('Margin allocated'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full flex-col justify-center',
-        field: 'capitalUtilisation',
-        type: 'rightAligned',
-        cellRenderer: ({ value, node, data }: GroupCellRendererParams) => {
-          const valueFormatted =
-            data && value
-              ? (() => {
-                  return {
-                    low: `${formatNumber(value, 2)}%`,
-                    high: addDecimalsFormatNumber(
-                      data.totalBalance,
-                      data.decimals
-                    ),
-                    value: Number(value),
-                  };
-                })()
-              : undefined;
-          return node.rowPinned ? (
-            ''
-          ) : (
-            <ProgressBarCell valueFormatted={valueFormatted} />
-          );
-        },
-      },
-      {
-        colId: 'realisedpnl',
-        headerName: t('Realised PNL'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full items-center',
-        field: 'realisedPNL',
-        type: 'rightAligned',
-        cellClassRules: signedNumberCssClassRules,
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Position, 'realisedPNL'>) =>
-          value === undefined || data === undefined
-            ? ''
-            : addDecimalsFormatNumber(value.toString(), data.decimals),
-        cellRenderer: 'PriceFlashCell',
-        headerTooltip: t('P&L excludes any fees paid.'),
-      },
-      {
-        colId: 'unrealisedpnl',
-        headerName: t('Unrealised PNL'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full items-center',
-        field: 'unrealisedPNL',
-        type: 'rightAligned',
-        cellClassRules: signedNumberCssClassRules,
-        valueFormatter: ({
-          value,
-          data,
-        }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
-          value === undefined || data === undefined
-            ? ''
-            : addDecimalsFormatNumber(value.toString(), data.decimals),
-        cellRenderer: 'PriceFlashCell',
-      },
-      {
-        colId: 'updated',
-        headerName: t('Updated'),
-        headerClass: 'uppercase',
-        cellClass: '!flex h-full items-center',
-        field: 'updatedAt',
-        type: 'rightAligned',
-        valueFormatter: ({
-          value,
-        }: VegaValueFormatterParams<Position, 'updatedAt'>) => {
-          if (!value) {
-            return '';
-          }
-          return getDateTimeFormat().format(new Date(value));
-        },
-      },
-    ];
-  }, []);
-  const defaultColDef = useMemo(() => {
-    return {
-      sortable: true,
-      unSortIcon: true,
-      headerClass: 'uppercase',
-      cellClass: '!flex h-full items-center',
-    };
-  }, []);
-  return { columnDefs, defaultColDef };
-};
-
-export default useColumnDefinitions;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
AndyWhiteVega	5f25e1a520	test: lint	2022-09-09 12:07:09 +01:00
AndyWhiteVega	385eb2457a	test: speculitive fix for ci	2022-09-09 12:06:43 +01:00
AndyWhiteVega	a7c3ed731d	test: lint	2022-09-09 11:37:12 +01:00
AndyWhiteVega	8f55d79441	test: skip tests	2022-09-09 11:36:47 +01:00
AndyWhiteVega	280bd1e32c	Revert "Test/757 tfe add e2e tests for governance (#1236 )" This reverts commit `cb4cbdc2ca`.	2022-09-09 11:33:49 +01:00
				`@@ -1 +0,0 @@`
				`export { default as ConsoleLiteGrid } from './console-lite-grid';`
				`@@ -1 +0,0 @@`
				`export { default as FillsManager } from './fills';`
				`@@ -1 +0,0 @@`
				`export { default as OrdersManager } from './orders';`
				`@@ -1 +0,0 @@`
				`export { default as PositionsManager } from './positions';`