fix(explorer): add workaround for v53 misreporting total node count

Hack/mainnet leaving validators (#2576 )
* feat: hacky thing to tell people the validators that are leaving * chore: put back empty state * style: lint
2023-01-19 11:47:07 +00:00 · 2023-01-11 14:58:07 +00:00 · 2023-01-04 17:14:45 +00:00 · 2023-01-04 17:03:32 +00:00 · 2023-01-04 16:13:09 +00:00 · 2023-01-04 14:33:48 +00:00
976 changed files with 23861 additions and 36759 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/master/fairground/fairground.toml" --force --home ~/.vegacapsule/testnet/wallet
-
-    - name: Start service using fairground network
-      shell: bash
-      if: ${{ inputs.capsule==false }}
-      run: vegawallet service run --network fairground --automatic-consent --home ~/.vegacapsule/testnet/wallet &
-
-    - name: Start service using capsule network
-      shell: bash
-      if: ${{ inputs.capsule }}
-      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.57.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,112 @@ 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
        uses: actions/checkout@v2
        with:
+          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
+      # Checkout capsule to build local network
+      - name: Checkout capsule
+        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
+          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: v0.54.0
+          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=../frontend-monorepo/vegacapsule/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
+      - name: Install root dependencies
+        run: yarn install
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: yarn nx run ${{ github.event.inputs.project }}:e2e ${{ env.SKIP_NX_CACHE }} --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome ${{ env.TAGS }}
+        run: yarn nx run ${{ github.event.inputs.project }}:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_TEARDOWN_NETWORK_AFTER_FLOWS: true
+          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.57.0'
-      RUN_CAPSULE: true
    steps:
      #######
      ## Setup langs
@@ -33,88 +28,110 @@ 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
        uses: actions/checkout@v2
        with:
+          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
+      # Checkout capsule to build local network
+      - name: Checkout capsule
+        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
+          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: v0.54.0
+          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=../frontend-monorepo/vegacapsule/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
+      - name: Install root dependencies
+        run: yarn install
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: yarn nx run-many --skip-nx-cache --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
+        run: yarn nx run-many --target=e2e --all --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
+          CYPRESS_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.57.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,119 @@ 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
        uses: actions/checkout@v2
        with:
+          ref: ${{ github.event.pull_request.head.ref }}
          fetch-depth: 0
          path: './frontend-monorepo'

-      # Restore node_modules from cache if possible
-      - name: Restore node_modules from cache
-        uses: actions/cache@v3
+      # Checkout capsule to build local network
+      - name: Checkout capsule
+        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
-
-      # 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: v0.2.3
+          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: v0.54.0
+          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=../frontend-monorepo/vegacapsule/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
+      - name: Derive appropriate SHAs for base and head for `nx affected` commands
+        uses: nrwl/nx-set-shas@v3
+        with:
+          working-directory: frontend-monorepo
+          main-branch-name: main
+
+      - name: Install root dependencies
+        run: yarn install
        working-directory: frontend-monorepo

      - name: Run Cypress tests
-        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --env.grepTags='@smoke' --browser chrome
+        run: npx nx affected:e2e --record --key ${{ secrets.CYPRESS_RECORD_KEY }} --browser chrome
        working-directory: frontend-monorepo
        env:
          CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
-          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
-          CYPRESS_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
@@ -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
+        uses: nrwl/nx-set-shas@v3
        with:
-          main-branch-name: ${{ github.base_ref }}
+          main-branch-name: main
      - 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@v3
+        with:
+          main-branch-name: main
+      - 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
@@ -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)
@@ -21,6 +21,7 @@ NX_URL=$URL
 NX_DEPLOY_URL=$DEPLOY_URL
 NX_DEPLOY_PRIME_URL=$DEPLOY_PRIME_URL

-NX_VEGA_URL=https://api.n07.testnet.vega.xyz/graphql
+NX_VEGA_URL=https://api.n11.testnet.vega.xyz/graphql
 NX_VEGA_ENV=TESTNET
-NX_VEGA_WALLET_URL=http://localhost:1789
+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,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,17 +9,13 @@ 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());
@@ -31,14 +23,12 @@ describe('market selector', { tags: '@smoke' }, () => {
      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;
      }
    });
  });
@@ -136,7 +126,7 @@ 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(
@@ -1,9 +1,5 @@
 import { aliasQuery } from '@vegaprotocol/cypress';
-import {
-  generateSimpleMarkets,
-  generateMarketsCandles,
-  generateMarketsData,
-} 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,17 +9,13 @@ 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());
@@ -33,10 +25,9 @@ describe('Market trade', { tags: '@smoke' }, () => {
      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;
      }
    });
  });
@@ -299,7 +290,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
      cy.getByTestId('place-order').click();
      cy.getByTestId('dialog-title').should(
        'have.text',
-        'Awaiting network confirmation'
+        'Confirm transaction in wallet'
      );
    }
  });
@@ -2,25 +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,
-  generateAssets,
-} from '../support/mocks/generate-accounts';
-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();
  });
@@ -36,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',
-      },
-    });
-  });
-});
@@ -17,5 +17,3 @@ import '@vegaprotocol/cypress';
 import 'cypress-real-events/support';
 // Import commands.js using ES2015 syntax:
 import './commands';
-import registerCypressGrep from 'cypress-grep';
-registerCypressGrep();
@@ -1,7 +1,4 @@
-import type { Market } from '@vegaprotocol/market-list';
-import { MarketState, MarketTradingMode } from '@vegaprotocol/types';
-
-export const protoCandles = [
+const protoCandles = [
  { open: '9556163', close: '9587028', __typename: 'Candle' },
  {
    open: '9587028',
@@ -76,29 +73,11 @@ 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',
+  state: 'STATE_ACTIVE',
  tradableInstrument: {
    instrument: {
-      id: '',
      code: 'AAVEDAI.MF21',
      name: 'AAVEDAI Monthly (30 Jun 2022)',
      metadata: {
@@ -115,11 +94,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',
 };
@@ -1,117 +0,0 @@
-import merge from 'lodash/merge';
-import type { AccountsQuery, AssetsQuery } from '@vegaprotocol/accounts';
-import { AccountType, Schema as Types } 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: 'Account',
-          type: AccountType.ACCOUNT_TYPE_GENERAL,
-          balance: '100000000',
-          market: null,
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id',
-          },
-        },
-        {
-          __typename: 'Account',
-          type: AccountType.ACCOUNT_TYPE_GENERAL,
-          balance: '100000000',
-          market: {
-            id: '0604e8c918655474525e1a95367902266ade70d318c2c908f0cca6e3d11dcb13',
-            __typename: 'Market',
-          },
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id-2',
-          },
-        },
-        {
-          __typename: 'Account',
-          type: AccountType.ACCOUNT_TYPE_MARGIN,
-          balance: '1000',
-          market: {
-            __typename: 'Market',
-            id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
-          },
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id',
-          },
-        },
-        {
-          __typename: 'Account',
-          type: AccountType.ACCOUNT_TYPE_MARGIN,
-          balance: '1000',
-          market: {
-            __typename: 'Market',
-            id: 'c9f5acd348796011c075077e4d58d9b7f1689b7c1c8e030a5e886b83aa96923d',
-          },
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-id-2',
-          },
-        },
-        {
-          __typename: 'Account',
-          type: AccountType.ACCOUNT_TYPE_GENERAL,
-          balance: '100000000',
-          market: null,
-          asset: {
-            __typename: 'Asset',
-            id: 'asset-0',
-          },
-        },
-      ],
-    },
-  };
-  return merge(defaultAccounts, override);
-};
-
-export const generateAssets = (override?: PartialDeep<AssetsQuery>) => {
-  const defaultAssets: AssetsQuery = {
-    assetsConnection: {
-      edges: [
-        {
-          node: {
-            id: 'asset-id',
-            symbol: 'tEURO',
-            decimals: 5,
-            name: 'Euro',
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-          },
-        },
-        {
-          node: {
-            id: 'asset-id-2',
-            symbol: 'tDAI',
-            decimals: 5,
-            name: 'DAI',
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-          },
-        },
-        {
-          node: {
-            id: 'asset-0',
-            symbol: 'AST0',
-            decimals: 5,
-            name: 'Asto',
-            quantum: '',
-            status: Types.AssetStatus.STATUS_ENABLED,
-          },
-        },
-      ],
-    },
-  };
-  return merge(defaultAssets, override);
-};
@@ -1,7 +1,7 @@
 export const generateDealTicket = () => {
  return {
    market: {
-      id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
+      id: 'first-btcusd-id',
      decimalPlaces: 5,
      positionDecimalPlaces: 0,
      state: 'STATE_ACTIVE',
@@ -1,111 +0,0 @@
-import type { FillsQuery, FillFieldsFragment } from '@vegaprotocol/fills';
-import { Side } 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: Side.SIDE_SELL,
-      buyerFee: {
-        infrastructureFee: '5000',
-      },
-      market: {
-        id: 'market-1',
-      },
-    }),
-    generateFill({
-      id: '2',
-      seller: {
-        id: Cypress.env('VEGA_PUBLIC_KEY'),
-      },
-      aggressor: Side.SIDE_BUY,
-    }),
-    generateFill({
-      id: '3',
-      aggressor: 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: 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 { MarketDepth } from '../../../../../libs/market-depth/src/lib/__generated__/MarketDepth';
-
-export const generateMarketDepth = (
-  override?: PartialDeep<MarketDepth>
-): MarketDepth => {
-  const defaultResult: MarketDepth = {
+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);
 };
@@ -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,149 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-import type {
-  Orders,
-  Orders_party_ordersConnection_edges_node,
-} from '@vegaprotocol/orders';
-import {
-  OrderStatus,
-  OrderTimeInForce,
-  OrderType,
-  Side,
-} from '@vegaprotocol/types';
-
-export const generateOrders = (override?: PartialDeep<Orders>): Orders => {
-  const orders: Orders_party_ordersConnection_edges_node[] = [
-    {
-      __typename: 'Order',
-      id: '066468C06549101DAF7BC51099E1412A0067DC08C246B7D8013C9D0CBF1E8EE7',
-      market: {
-        __typename: 'Market',
-        id: 'market-0',
-      },
-      size: '10',
-      type: OrderType.TYPE_LIMIT,
-      status: OrderStatus.STATUS_FILLED,
-      side: Side.SIDE_BUY,
-      remaining: '0',
-      price: '20000000',
-      timeInForce: 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: OrderType.TYPE_LIMIT,
-      status: OrderStatus.STATUS_FILLED,
-      side: Side.SIDE_BUY,
-      remaining: '0',
-      price: '100',
-      timeInForce: 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: OrderType.TYPE_LIMIT,
-      status: OrderStatus.STATUS_FILLED,
-      side: Side.SIDE_BUY,
-      remaining: '0',
-      price: '20000',
-      timeInForce: 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: OrderType.TYPE_LIMIT,
-      status: OrderStatus.STATUS_ACTIVE,
-      side: Side.SIDE_BUY,
-      remaining: '0',
-      price: '100000',
-      timeInForce: 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: OrderType.TYPE_LIMIT,
-      status: OrderStatus.STATUS_PARTIALLY_FILLED,
-      side: Side.SIDE_SELL,
-      remaining: '3',
-      price: '100000',
-      timeInForce: OrderTimeInForce.TIME_IN_FORCE_GTC,
-      createdAt: new Date(2020, 1, 27).toISOString(),
-      updatedAt: null,
-      expiresAt: null,
-      liquidityProvision: null,
-      peggedOrder: null,
-      rejectionReason: null,
-    },
-  ];
-
-  const defaultResult: Orders = {
-    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,144 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartialDeep } from 'type-fest';
-import type {
-  Positions,
-  Positions_party_positionsConnection_edges_node,
-} from '@vegaprotocol/positions';
-
-export const generatePositions = (
-  override?: PartialDeep<Positions>
-): Positions => {
-  const nodes: Positions_party_positionsConnection_edges_node[] = [
-    {
-      __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: Positions = {
-    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 = () => {
-  return {
-    party: {
-      id: Cypress.env('VEGA_PUBLIC_KEY'),
-      positionsConnection: { edges: null, __typename: 'PositionConnection' },
-      __typename: 'Party',
-    },
-  };
-};
-
-export const generateMargins = () => {
-  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: {
-              m_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"]
 }
@@ -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
@@ -2,6 +2,7 @@
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
 NX_VEGA_URL=https://api.vega.xyz/query
 NX_VEGA_ENV=MAINNET
+NX_VEGA_REST=https://api.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
@@ -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_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,5 +1,4 @@
 import '@testing-library/jest-dom';
-import 'jest-canvas-mock';
 import { defaultFallbackInView } from 'react-intersection-observer';
 import ResizeObserver from 'resize-observer-polyfill';

@@ -39,5 +38,3 @@ Object.defineProperty(window, 'matchMedia', {
    dispatchEvent: jest.fn(),
  })),
 });
-
-jest.setTimeout(30000);
@@ -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';
@@ -26,7 +26,7 @@ export interface MarketTags_market_tradableInstrument_instrument {
 export interface MarketTags_market_tradableInstrument {
  __typename: "TradableInstrument";
  /**
-   * An instance of, or reference to, a fully specified instrument.
+   * An instance of or reference to a fully specified instrument.
   */
  instrument: MarketTags_market_tradableInstrument_instrument;
 }
@@ -34,14 +34,14 @@ export interface MarketTags_market_tradableInstrument {
 export interface MarketTags_market {
  __typename: "Market";
  /**
-   * An instance of, or reference to, a tradable instrument.
+   * An instance of or reference to a tradable instrument.
   */
  tradableInstrument: MarketTags_market_tradableInstrument;
 }

 export interface MarketTags {
  /**
-   * An instrument that is trading on the Vega network
+   * An instrument that is trading on the VEGA network
   */
  market: MarketTags_market | null;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AccountType } from "@vegaprotocol/types";
+import { AccountType } from "./../../../../../../../libs/types/src/__generated__/globalTypes";

 // ====================================================
 // GraphQL query operation: PartyBalanceQuery
@@ -12,7 +12,7 @@ import { AccountType } from "@vegaprotocol/types";
 export interface PartyBalanceQuery_party_accounts_asset {
  __typename: "Asset";
  /**
-   * The ID of the asset
+   * The id of the asset
   */
  id: string;
  /**
@@ -24,7 +24,7 @@ export interface PartyBalanceQuery_party_accounts_asset {
   */
  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
+   * The precision of the asset
   */
  decimals: number;
 }
@@ -55,7 +55,7 @@ export interface PartyBalanceQuery_party {

 export interface PartyBalanceQuery {
  /**
-   * An entity that is trading on the Vega network
+   * An entity that is trading on the VEGA network
   */
  party: PartyBalanceQuery_party | null;
 }
@@ -1,4 +1,4 @@
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -1,4 +1,4 @@
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -1,13 +1,13 @@
 import * as React from 'react';
 import classNames from 'classnames';
-import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
+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';

 interface DealTicketBalanceProps {
-  settlementAsset: DealTicketMarketFragment['tradableInstrument']['instrument']['product']['settlementAsset'];
+  settlementAsset: DealTicketQuery_market_tradableInstrument_instrument_product_settlementAsset;
  accounts: PartyBalanceQuery_party_accounts[];
  isWalletConnected: boolean;
  className?: string;
@@ -37,13 +37,13 @@ const PARTY_BALANCE_QUERY = gql`

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

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

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

@@ -82,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,17 +1,12 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useForm, Controller } from 'react-hook-form';
 import { Stepper } from '../stepper';
-import type { DealTicketMarketFragment } from '@vegaprotocol/deal-ticket';
-import {
-  getDefaultOrder,
-  useOrderValidation,
-  validateSize,
-} from '@vegaprotocol/deal-ticket';
+import 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 type { Order } from '@vegaprotocol/orders';
 import { useVegaWallet, VegaTxStatus } from '@vegaprotocol/wallet';
 import {
  t,
@@ -20,11 +15,14 @@ import {
  removeDecimal,
 } from '@vegaprotocol/react-helpers';
 import {
+  getDefaultOrder,
+  useOrderValidation,
  useOrderSubmit,
  getOrderDialogTitle,
  getOrderDialogIntent,
  getOrderDialogIcon,
  OrderFeedback,
+  validateSize,
 } from '@vegaprotocol/orders';
 import { DealTicketSize } from './deal-ticket-size';
 import MarketNameRenderer from '../simple-market-list/simple-market-renderer';
@@ -39,7 +37,7 @@ import { Side, OrderType } from '@vegaprotocol/types';
 import { DealTicketSlippage } from './deal-ticket-slippage';

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

@@ -61,7 +59,7 @@ export const DealTicketSteps = ({
    watch,
    setValue,
    formState: { errors },
-  } = useForm<OrderSubmissionBody['orderSubmission']>({
+  } = useForm<Order>({
    mode: 'onChange',
    defaultValues: getDefaultOrder(market),
  });
@@ -80,15 +78,15 @@ export const DealTicketSteps = ({
    fieldErrors: errors,
  });
  const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();
-  const { pubKey } = useVegaWallet();
+  const { keypair } = useVegaWallet();
  const estMargin = useOrderMargin({
    order,
    market,
-    partyId: pubKey || '',
+    partyId: keypair?.pub || '',
  });

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

  const onSubmit = useCallback(
-    (order: OrderSubmissionBody['orderSubmission']) => {
+    (order: Order) => {
      if (transactionStatus !== 'pending') {
        submit({
          ...order,
@@ -6,8 +6,8 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import * as React from 'react';
 import classNames from 'classnames';
-import type { DealTicketMarketFragment } 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';
@@ -33,10 +33,10 @@ 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;
@@ -1,4 +1,4 @@
-query DepositAssets {
+query Deposits {
  assetsConnection {
    edges {
      node {
@@ -1,75 +0,0 @@
-/* tslint:disable */
-/* eslint-disable */
-// @generated
-// This file was automatically generated and should not be edited.
-
-import { AssetStatus } from "@vegaprotocol/types";
-
-// ====================================================
-// GraphQL query operation: DepositAssets
-// ====================================================
-
-export interface DepositAssets_assetsConnection_edges_node_source_BuiltinAsset {
-  __typename: "BuiltinAsset";
-}
-
-export interface DepositAssets_assetsConnection_edges_node_source_ERC20 {
-  __typename: "ERC20";
-  /**
-   * The address of the ERC20 contract
-   */
-  contractAddress: string;
-}
-
-export type DepositAssets_assetsConnection_edges_node_source = DepositAssets_assetsConnection_edges_node_source_BuiltinAsset | DepositAssets_assetsConnection_edges_node_source_ERC20;
-
-export interface DepositAssets_assetsConnection_edges_node {
-  __typename: "Asset";
-  /**
-   * The ID of the asset
-   */
-  id: string;
-  /**
-   * The full name of the asset (e.g: Great British Pound)
-   */
-  name: string;
-  /**
-   * The symbol of the asset (e.g: GBP)
-   */
-  symbol: string;
-  /**
-   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
-   */
-  decimals: number;
-  /**
-   * The status of the asset in the Vega network
-   */
-  status: AssetStatus;
-  /**
-   * The origin source of the asset (e.g: an ERC20 asset)
-   */
-  source: DepositAssets_assetsConnection_edges_node_source;
-}
-
-export interface DepositAssets_assetsConnection_edges {
-  __typename: "AssetEdge";
-  /**
-   * The asset information
-   */
-  node: DepositAssets_assetsConnection_edges_node;
-}
-
-export interface DepositAssets_assetsConnection {
-  __typename: "AssetsConnection";
-  /**
-   * The assets
-   */
-  edges: (DepositAssets_assetsConnection_edges | null)[] | null;
-}
-
-export interface DepositAssets {
-  /**
-   * The list of all assets in use in the Vega network or the specified asset if ID is provided
-   */
-  assetsConnection: DepositAssets_assetsConnection | null;
-}
@@ -0,0 +1,72 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { AssetStatus } from "./../../../../../../../libs/types/src/__generated__/globalTypes";
+
+// ====================================================
+// GraphQL query operation: Deposits
+// ====================================================
+
+export interface Deposits_assetsConnection_edges_node_source_BuiltinAsset {
+  __typename: "BuiltinAsset";
+}
+
+export interface Deposits_assetsConnection_edges_node_source_ERC20 {
+  __typename: "ERC20";
+  /**
+   * The address of the erc20 contract
+   */
+  contractAddress: string;
+}
+
+export type Deposits_assetsConnection_edges_node_source = Deposits_assetsConnection_edges_node_source_BuiltinAsset | Deposits_assetsConnection_edges_node_source_ERC20;
+
+export interface Deposits_assetsConnection_edges_node {
+  __typename: "Asset";
+  /**
+   * The id of the asset
+   */
+  id: string;
+  /**
+   * The full name of the asset (e.g: Great British Pound)
+   */
+  name: string;
+  /**
+   * The symbol of the asset (e.g: GBP)
+   */
+  symbol: string;
+  /**
+   * The precision of the asset
+   */
+  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: Deposits_assetsConnection_edges_node_source;
+}
+
+export interface Deposits_assetsConnection_edges {
+  __typename: "AssetEdge";
+  node: Deposits_assetsConnection_edges_node;
+}
+
+export interface Deposits_assetsConnection {
+  __typename: "AssetsConnection";
+  /**
+   * The assets
+   */
+  edges: (Deposits_assetsConnection_edges | null)[] | null;
+}
+
+export interface Deposits {
+  /**
+   * The list of all assets in use in the vega network or the specified asset if id is provided
+   */
+  assetsConnection: Deposits_assetsConnection;
+}
@@ -1,16 +1,16 @@
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types/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 DepositsQueryVariables = 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 type DepositsQuery = { __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 } };


-export const DepositAssetsDocument = gql`
-    query DepositAssets {
+export const DepositsDocument = gql`
+    query Deposits {
  assetsConnection {
    edges {
      node {
@@ -30,28 +30,28 @@ export const DepositAssetsDocument = gql`
    `;

 /**
- * __useDepositAssetsQuery__
+ * __useDepositsQuery__
 *
- * 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
+ * To run a query within a React component, call `useDepositsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useDepositsQuery` 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({
+ * const { data, loading, error } = useDepositsQuery({
 *   variables: {
 *   },
 * });
 */
-export function useDepositAssetsQuery(baseOptions?: Apollo.QueryHookOptions<DepositAssetsQuery, DepositAssetsQueryVariables>) {
+export function useDepositsQuery(baseOptions?: Apollo.QueryHookOptions<DepositsQuery, DepositsQueryVariables>) {
        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<DepositAssetsQuery, DepositAssetsQueryVariables>(DepositAssetsDocument, options);
+        return Apollo.useQuery<DepositsQuery, DepositsQueryVariables>(DepositsDocument, options);
      }
-export function useDepositAssetsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<DepositAssetsQuery, DepositAssetsQueryVariables>) {
+export function useDepositsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<DepositsQuery, DepositsQueryVariables>) {
          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<DepositAssetsQuery, DepositAssetsQueryVariables>(DepositAssetsDocument, options);
+          return Apollo.useLazyQuery<DepositsQuery, DepositsQueryVariables>(DepositsDocument, options);
        }
-export type DepositAssetsQueryHookResult = ReturnType<typeof useDepositAssetsQuery>;
-export type DepositAssetsLazyQueryHookResult = ReturnType<typeof useDepositAssetsLazyQuery>;
-export type DepositAssetsQueryResult = Apollo.QueryResult<DepositAssetsQuery, DepositAssetsQueryVariables>;
+export type DepositsQueryHookResult = ReturnType<typeof useDepositsQuery>;
+export type DepositsLazyQueryHookResult = ReturnType<typeof useDepositsLazyQuery>;
+export type DepositsQueryResult = Apollo.QueryResult<DepositsQuery, DepositsQueryVariables>;
@@ -5,10 +5,10 @@ import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import { AsyncRenderer, Splash } from '@vegaprotocol/ui-toolkit';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { Web3Container } from '@vegaprotocol/web3';
-import type { DepositAssets } from './__generated__/DepositAssets';
+import type { Deposits } from './__generated__/Deposits';

 const DEPOSITS_QUERY = gql`
-  query DepositAssets {
+  query Deposits {
    assetsConnection {
      edges {
        node {
@@ -33,17 +33,17 @@ const DEPOSITS_QUERY = gql`
 */
 export const DepositContainer = () => {
  const { VEGA_ENV } = useEnvironment();
-  const { pubKey } = useVegaWallet();
+  const { keypair } = useVegaWallet();

-  const { data, loading, error } = useQuery<DepositAssets>(DEPOSITS_QUERY, {
-    variables: { partyId: pubKey },
-    skip: !pubKey,
+  const { data, loading, error } = useQuery<Deposits>(DEPOSITS_QUERY, {
+    variables: { partyId: keypair?.pub },
+    skip: !keypair?.pub,
  });

  const assets = getEnabledAssets(data);

  return (
-    <AsyncRenderer<DepositAssets> data={data} loading={loading} error={error}>
+    <AsyncRenderer<Deposits> data={data} loading={loading} error={error}>
      {assets.length ? (
        <Web3Container>
          <DepositManager
@@ -12,7 +12,7 @@ const Header = () => {
  } = 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"
      data-testid="header"
    >
      <Logo />
@@ -21,7 +21,12 @@ const Header = () => {
          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';
@@ -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,83 +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 }) => {
-      if (!gridRef.current?.api) {
-        return false;
-      }
-      if (dataRef.current?.length) {
-        dataRef.current = data;
-        gridRef.current.api.refreshInfiniteCache();
-        return true;
-      }
-      return false;
-    },
-    [gridRef]
-  );
-  const { data, error, loading } = useDataProvider<AccountFields[], never>({
-    dataProvider: aggregatedAccountsDataProvider,
-    update,
-    variables,
-  });
-  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 { Side } 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 === Side.SIDE_BUY) {
-                return taker;
-              } else {
-                return maker;
-              }
-            } else if (data?.seller.id === partyId) {
-              if (value === 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,101 +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)}
-      >
-        <OrderFeedback
-          transaction={orderCancel.transaction}
-          order={orderCancel.cancelledOrder}
-        />
-      </orderCancel.Dialog>
-      <orderEdit.Dialog
-        title={getEditDialogTitle(orderEdit.updatedOrder?.status)}
-      >
-        <OrderFeedback
-          transaction={orderEdit.transaction}
-          order={orderEdit.updatedOrder}
-        />
-      </orderEdit.Dialog>
-      {editOrder && (
-        <OrderEditDialog
-          isOpen={Boolean(editOrder)}
-          onChange={(isOpen) => {
-            if (!isOpen) setEditOrder(null);
-          }}
-          order={editOrder}
-          onSubmit={(fields) => {
-            setEditOrder(null);
-            orderEdit.edit({ price: fields.entryPrice });
-          }}
-        />
-      )}
-    </AsyncRenderer>
-  );
-};
-
-export default OrdersManager;
@@ -1,287 +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 {
-  Orders_party_ordersConnection_edges_node,
-  Order,
-  CancelOrderArgs,
-} from '@vegaprotocol/orders';
-import { isOrderActive } from '@vegaprotocol/orders';
-import {
-  OrderRejectionReasonMapping,
-  OrderStatus,
-  OrderType,
-  OrderStatusMapping,
-  OrderTypeMapping,
-  Side,
-  OrderTimeInForce,
-  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: Orders_party_ordersConnection_edges_node;
-          }) => data?.side === Side.SIDE_BUY,
-          [negativeClassNames]: ({
-            data,
-          }: {
-            data: Orders_party_ordersConnection_edges_node;
-          }) => data?.side === Side.SIDE_SELL,
-        },
-        valueFormatter: ({ value, data }: ValueFormatterParams) => {
-          if (value && data && data.market) {
-            const prefix = data
-              ? data.side === Side.SIDE_BUY
-                ? '+'
-                : '-'
-              : '';
-            return (
-              prefix + addDecimal(value, data.market.positionDecimalPlaces)
-            );
-          }
-          return '-';
-        },
-      },
-      {
-        colId: 'type',
-        field: 'type',
-        width: 80,
-        valueFormatter: ({
-          value,
-        }: ValueFormatterParams & {
-          value?: Orders_party_ordersConnection_edges_node['type'];
-        }) => OrderTypeMapping[value as 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 === 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?: Orders_party_ordersConnection_edges_node['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?: Orders_party_ordersConnection_edges_node['price'];
-        }) => {
-          if (
-            value === undefined ||
-            !data ||
-            !data.market ||
-            data.type === 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 === 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?: Orders_party_ordersConnection_edges_node['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?: Orders_party_ordersConnection_edges_node['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,291 +0,0 @@
-import { useMemo } from 'react';
-import {
-  addDecimalsFormatNumber,
-  formatNumber,
-  getDateTimeFormat,
-  PriceFlashCell,
-  signedNumberCssClassRules,
-  t,
-} from '@vegaprotocol/react-helpers';
-import type {
-  PositionsTableValueFormatterParams,
-  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 { 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,
-        }: PositionsTableValueFormatterParams & {
-          value: 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,
-        }: PositionsTableValueFormatterParams & {
-          value: 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,
-        }: PositionsTableValueFormatterParams & {
-          value: 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,
-        }: PositionsTableValueFormatterParams & {
-          value: Position['realisedPNL'];
-        }) =>
-          value === 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,
-        }: PositionsTableValueFormatterParams & {
-          value: Position['unrealisedPNL'];
-        }) =>
-          value === 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,
-        }: PositionsTableValueFormatterParams & {
-          value: 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;
@@ -0,0 +1,5 @@
+subscription CandleLive($marketId: ID!) {
+  candles(marketId: $marketId, interval: INTERVAL_I1H) {
+    close
+  }
+}
@@ -0,0 +1,44 @@
+fragment SimpleMarketDataFields on MarketData {
+  market {
+    id
+    state
+  }
+}
+
+query SimpleMarkets($CandleSince: String!) {
+  markets {
+    id
+    name
+    state
+    data {
+      ...SimpleMarketDataFields
+    }
+    tradableInstrument {
+      instrument {
+        code
+        metadata {
+          tags
+        }
+        product {
+          __typename
+          ... on Future {
+            quoteName
+            settlementAsset {
+              symbol
+            }
+          }
+        }
+      }
+    }
+    candles(interval: INTERVAL_I1H, since: $CandleSince) {
+      open
+      close
+    }
+  }
+}
+
+subscription SimpleMarketDataSub {
+  marketData {
+    ...SimpleMarketDataFields
+  }
+}
@@ -0,0 +1,30 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { MarketState } from "@vegaprotocol/types";
+
+// ====================================================
+// GraphQL fragment: SimpleMarketDataFields
+// ====================================================
+
+export interface SimpleMarketDataFields_market {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+  /**
+   * Current state of the market
+   */
+  state: MarketState;
+}
+
+export interface SimpleMarketDataFields {
+  __typename: "MarketData";
+  /**
+   * market ID of the associated mark price
+   */
+  market: SimpleMarketDataFields_market;
+}
@@ -0,0 +1,37 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { MarketState } from "./../../../../../../../libs/types/src/__generated__/globalTypes";
+
+// ====================================================
+// GraphQL subscription operation: SimpleMarketDataSub
+// ====================================================
+
+export interface SimpleMarketDataSub_marketData_market {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+  /**
+   * Current state of the market
+   */
+  state: MarketState;
+}
+
+export interface SimpleMarketDataSub_marketData {
+  __typename: "MarketData";
+  /**
+   * market id of the associated mark price
+   */
+  market: SimpleMarketDataSub_marketData_market;
+}
+
+export interface SimpleMarketDataSub {
+  /**
+   * Subscribe to the mark price changes
+   */
+  marketData: SimpleMarketDataSub_marketData;
+}
@@ -0,0 +1,109 @@
+/* tslint:disable */
+/* eslint-disable */
+// @generated
+// This file was automatically generated and should not be edited.
+
+import { MarketState } from "./../../../../../../../libs/types/src/__generated__/globalTypes";
+
+// ====================================================
+// GraphQL query operation: SimpleMarkets
+// ====================================================
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument_metadata {
+  __typename: "InstrumentMetadata";
+  /**
+   * An arbitrary list of tags to associated to associate to the Instrument (string list)
+   */
+  tags: string[] | null;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument_product_settlementAsset {
+  __typename: "Asset";
+  /**
+   * The symbol of the asset (e.g: GBP)
+   */
+  symbol: string;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument_product {
+  __typename: "Future";
+  /**
+   * String representing the quote (e.g. BTCUSD -> USD is quote)
+   */
+  quoteName: string;
+  /**
+   * The name of the asset (string)
+   */
+  settlementAsset: SimpleMarkets_markets_tradableInstrument_instrument_product_settlementAsset;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument_instrument {
+  __typename: "Instrument";
+  /**
+   * A short non necessarily unique code used to easily describe the instrument (e.g: FX:BTCUSD/DEC18) (string)
+   */
+  code: string;
+  /**
+   * Full and fairly descriptive name for the instrument
+   */
+  name: string;
+  /**
+   * Metadata for this instrument
+   */
+  metadata: SimpleMarkets_markets_tradableInstrument_instrument_metadata;
+  /**
+   * A reference to or instance of a fully specified product, including all required product parameters for that product (Product union)
+   */
+  product: SimpleMarkets_markets_tradableInstrument_instrument_product;
+}
+
+export interface SimpleMarkets_markets_tradableInstrument {
+  __typename: "TradableInstrument";
+  /**
+   * An instance of or reference to a fully specified instrument.
+   */
+  instrument: SimpleMarkets_markets_tradableInstrument_instrument;
+}
+
+export interface SimpleMarkets_markets_candles {
+  __typename: "Candle";
+  /**
+   * Open price (uint64)
+   */
+  open: string;
+  /**
+   * Close price (uint64)
+   */
+  close: string;
+}
+
+export interface SimpleMarkets_markets {
+  __typename: "Market";
+  /**
+   * Market ID
+   */
+  id: string;
+  /**
+   * Current state of the market
+   */
+  state: MarketState;
+  /**
+   * An instance of or reference to a tradable instrument.
+   */
+  tradableInstrument: SimpleMarkets_markets_tradableInstrument;
+  /**
+   * Candles on a market, for the 'last' n candles, at 'interval' seconds as specified by params
+   */
+  candles: (SimpleMarkets_markets_candles | null)[] | null;
+}
+
+export interface SimpleMarkets {
+  /**
+   * One or more instruments that are trading on the VEGA network
+   */
+  markets: SimpleMarkets_markets[] | null;
+}
+
+export interface SimpleMarketsVariables {
+  CandleSince: string;
+}
@@ -1,4 +1,4 @@
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -0,0 +1,117 @@
+import * as Types from '@vegaprotocol/types/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type SimpleMarketDataFieldsFragment = { __typename?: 'MarketData', market: { __typename?: 'Market', id: string, state: Types.MarketState } };
+
+export type SimpleMarketsQueryVariables = Types.Exact<{
+  CandleSince: Types.Scalars['String'];
+}>;
+
+
+export type SimpleMarketsQuery = { __typename?: 'Query', markets?: Array<{ __typename?: 'Market', id: string, name: string, state: Types.MarketState, data?: { __typename?: 'MarketData', market: { __typename?: 'Market', id: string, state: Types.MarketState } } | null, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', symbol: string } } } }, candles?: Array<{ __typename?: 'Candle', open: string, close: string } | null> | null }> | null };
+
+export type SimpleMarketDataSubSubscriptionVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type SimpleMarketDataSubSubscription = { __typename?: 'Subscription', marketData: { __typename?: 'MarketData', market: { __typename?: 'Market', id: string, state: Types.MarketState } } };
+
+export const SimpleMarketDataFieldsFragmentDoc = gql`
+    fragment SimpleMarketDataFields on MarketData {
+  market {
+    id
+    state
+  }
+}
+    `;
+export const SimpleMarketsDocument = gql`
+    query SimpleMarkets($CandleSince: String!) {
+  markets {
+    id
+    name
+    state
+    data {
+      ...SimpleMarketDataFields
+    }
+    tradableInstrument {
+      instrument {
+        code
+        metadata {
+          tags
+        }
+        product {
+          __typename
+          ... on Future {
+            quoteName
+            settlementAsset {
+              symbol
+            }
+          }
+        }
+      }
+    }
+    candles(interval: INTERVAL_I1H, since: $CandleSince) {
+      open
+      close
+    }
+  }
+}
+    ${SimpleMarketDataFieldsFragmentDoc}`;
+
+/**
+ * __useSimpleMarketsQuery__
+ *
+ * To run a query within a React component, call `useSimpleMarketsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useSimpleMarketsQuery` 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 } = useSimpleMarketsQuery({
+ *   variables: {
+ *      CandleSince: // value for 'CandleSince'
+ *   },
+ * });
+ */
+export function useSimpleMarketsQuery(baseOptions: Apollo.QueryHookOptions<SimpleMarketsQuery, SimpleMarketsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<SimpleMarketsQuery, SimpleMarketsQueryVariables>(SimpleMarketsDocument, options);
+      }
+export function useSimpleMarketsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SimpleMarketsQuery, SimpleMarketsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<SimpleMarketsQuery, SimpleMarketsQueryVariables>(SimpleMarketsDocument, options);
+        }
+export type SimpleMarketsQueryHookResult = ReturnType<typeof useSimpleMarketsQuery>;
+export type SimpleMarketsLazyQueryHookResult = ReturnType<typeof useSimpleMarketsLazyQuery>;
+export type SimpleMarketsQueryResult = Apollo.QueryResult<SimpleMarketsQuery, SimpleMarketsQueryVariables>;
+export const SimpleMarketDataSubDocument = gql`
+    subscription SimpleMarketDataSub {
+  marketData {
+    ...SimpleMarketDataFields
+  }
+}
+    ${SimpleMarketDataFieldsFragmentDoc}`;
+
+/**
+ * __useSimpleMarketDataSubSubscription__
+ *
+ * To run a query within a React component, call `useSimpleMarketDataSubSubscription` and pass it any options that fit your needs.
+ * When your component renders, `useSimpleMarketDataSubSubscription` 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 subscription, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useSimpleMarketDataSubSubscription({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useSimpleMarketDataSubSubscription(baseOptions?: Apollo.SubscriptionHookOptions<SimpleMarketDataSubSubscription, SimpleMarketDataSubSubscriptionVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useSubscription<SimpleMarketDataSubSubscription, SimpleMarketDataSubSubscriptionVariables>(SimpleMarketDataSubDocument, options);
+      }
+export type SimpleMarketDataSubSubscriptionHookResult = ReturnType<typeof useSimpleMarketDataSubSubscription>;
+export type SimpleMarketDataSubSubscriptionResult = Apollo.SubscriptionResult<SimpleMarketDataSubSubscription>;
@@ -1,9 +1,9 @@
 import { t } from '@vegaprotocol/react-helpers';
 import { themelite as theme } from '@vegaprotocol/tailwindcss-config';
 import { MarketState } from '@vegaprotocol/types';
-import colors from 'tailwindcss/colors';
-import type { Market } from '@vegaprotocol/market-list';
 import { IS_MARKET_TRADABLE } from '../../constants';
+import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
+import colors from 'tailwindcss/colors';

 export const STATES_FILTER = [
  { value: 'all', text: t('All') },
@@ -192,17 +192,8 @@ export const agGridDarkVariables = `
 `;

 export const ROW_CLASS_RULES = {
-  'cursor-pointer': ({ data }: { data: Market }) =>
+  'cursor-pointer': ({ data }: { data: SimpleMarkets_markets }) =>
    IS_MARKET_TRADABLE(data || {}),
 };

 export const LARGE_SCREENS = ['xl', 'xxl'];
-
-export const ALL_PRODUCTS_ITEM = {
-  name: t('All Markets'),
-  id: 'allmarkets',
-  cssClass: 'text-pink',
-  color: theme.colors.pink,
-};
-
-export const AG_GRID_CONTAINER_STYLES = { width: '100%', height: '100%' };
@@ -0,0 +1,94 @@
+import produce from 'immer';
+import { gql } from '@apollo/client';
+import { makeDataProvider } from '@vegaprotocol/react-helpers';
+import type {
+  SimpleMarkets,
+  SimpleMarkets_markets,
+} from './__generated__/SimpleMarkets';
+import type {
+  SimpleMarketDataSub,
+  SimpleMarketDataSub_marketData,
+} from './__generated__/SimpleMarketDataSub';
+
+export const MARKETS_QUERY = gql`
+  query SimpleMarkets($CandleSince: String!) {
+    markets {
+      id
+      state
+      tradableInstrument {
+        instrument {
+          code
+          name
+          metadata {
+            tags
+          }
+          product {
+            __typename
+            ... on Future {
+              quoteName
+              settlementAsset {
+                symbol
+              }
+            }
+          }
+        }
+      }
+      candles(interval: I1H, since: $CandleSince) {
+        open
+        close
+      }
+    }
+  }
+`;
+
+const MARKET_DATA_SUB = gql`
+  subscription SimpleMarketDataSub {
+    marketData {
+      market {
+        id
+        state
+      }
+    }
+  }
+`;
+
+export const CANDLE_SUB = gql`
+  subscription CandleLive($marketId: ID!) {
+    candles(marketId: $marketId, interval: I1H) {
+      close
+    }
+  }
+`;
+
+const update = (
+  data: SimpleMarkets_markets[],
+  delta: SimpleMarketDataSub_marketData
+) => {
+  return produce(data, (draft) => {
+    const index = draft.findIndex((m) => m.id === delta.market.id);
+    if (index !== -1) {
+      draft[index].state = delta.market.state;
+    }
+    // @TODO - else push new market to draft
+  });
+};
+
+const getData = (responseData: SimpleMarkets) => responseData.markets;
+const getDelta = (
+  subscriptionData: SimpleMarketDataSub
+): SimpleMarketDataSub_marketData => subscriptionData.marketData;
+
+export const dataProvider = makeDataProvider<
+  SimpleMarkets,
+  SimpleMarkets_markets[],
+  SimpleMarketDataSub,
+  SimpleMarketDataSub_marketData
+>({
+  query: MARKETS_QUERY,
+  subscriptionQuery: MARKET_DATA_SUB,
+  update,
+  getData,
+  getDelta,
+});
+
+export default dataProvider;
@@ -5,7 +5,7 @@ import { EXPIRE_DATE_FORMAT } from '../../constants';
 const SimpleMarketExpires = ({
  tags,
 }: {
-  tags?: ReadonlyArray<string> | null;
+  tags: ReadonlyArray<string> | null;
 }) => {
  if (tags) {
    const dateFound = tags.reduce<Date | null>((agg, tag) => {
@@ -4,14 +4,21 @@ import {
  render,
  screen,
  waitFor,
+  cleanup,
  getAllByRole,
  fireEvent,
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
+import type { MockedResponse } from '@apollo/client/testing';
 import { BrowserRouter } from 'react-router-dom';
 import { MarketState } from '@vegaprotocol/types';
-import type { Market } from '@vegaprotocol/market-list';
 import SimpleMarketList from './simple-market-list';
+import { MARKETS_QUERY } from './data-provider';
+import type {
+  SimpleMarkets_markets,
+  SimpleMarkets,
+} from './__generated__/SimpleMarkets';
+import type { SimpleMarketDataSub_marketData } from './__generated__/SimpleMarketDataSub';

 const mockedNavigate = jest.fn();

@@ -21,11 +28,20 @@ jest.mock('react-router-dom', () => ({
  useParams: () => ({}),
 }));

-jest.mock('./simple-market-percent-change', () => jest.fn());
+jest.mock('date-fns', () => ({
+  subDays: () => new Date('2022-06-02T11:11:21.721Z'),
+}));

-let marketsMock = [
+let updateMock: ({
+  delta,
+}: {
+  delta: SimpleMarketDataSub_marketData;
+}) => boolean;
+
+let mockData = [
  {
-    id: 'MARKET_A',
+    id: '1',
+    name: 'Market 1',
    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
@@ -41,7 +57,8 @@ let marketsMock = [
    },
  },
  {
-    id: 'MARKET_B',
+    id: '2',
+    name: 'Market 2',
    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
@@ -56,22 +73,20 @@ let marketsMock = [
      },
    },
  },
-] as unknown as Market[];
+] as unknown as SimpleMarkets_markets[];

-const LIB = '@vegaprotocol/react-helpers';
-const useDataProvider = () => {
-  return {
-    data: marketsMock,
-    loading: false,
-    error: false,
-  };
+const mockUseDataProvider = ({ update }: { update: () => boolean }) => {
+  updateMock = update;
+  return { data: mockData, loading: false, error: false };
 };
-jest.mock(LIB, () => ({
-  ...jest.requireActual(LIB),
-  useDataProvider: jest.fn(() => useDataProvider()),
+
+jest.mock('@vegaprotocol/react-helpers', () => ({
+  ...jest.requireActual('@vegaprotocol/react-helpers'),
+  useDataProvider: jest.fn((args) => mockUseDataProvider(args)),
 }));

 const mockIsTradable = jest.fn((_arg) => true);
+
 jest.mock('../../constants', () => ({
  ...jest.requireActual('../../constants'),
  IS_MARKET_TRADABLE: jest.fn((arg) => mockIsTradable(arg)),
@@ -80,12 +95,25 @@ jest.mock('../../constants', () => ({
 describe('SimpleMarketList', () => {
  afterEach(() => {
    jest.clearAllMocks();
+    cleanup();
  });

+  const mocks: MockedResponse<SimpleMarkets> = {
+    request: {
+      query: MARKETS_QUERY,
+      variables: {
+        CandleSince: '2022-06-02T11:11:21.721Z',
+      },
+    },
+    result: {
+      data: { markets: mockData },
+    },
+  };
+
  it('should be properly rendered with some data', async () => {
    await act(async () => {
      render(
-        <MockedProvider mocks={[]}>
+        <MockedProvider mocks={[mocks]}>
          <SimpleMarketList />
        </MockedProvider>,
        { wrapper: BrowserRouter }
@@ -96,49 +124,95 @@ describe('SimpleMarketList', () => {
      expect(
        document.querySelector('.ag-center-cols-container')
      ).toBeInTheDocument();
+    });
+    await waitFor(() => {
      const container = document.querySelector('.ag-center-cols-container');
      expect(getAllByRole(container as HTMLDivElement, 'row')).toHaveLength(2);
    });
  });

-  it('click on row should be properly handled', async () => {
+  it('update should return proper boolean value', async () => {
    await act(async () => {
      render(
-        <MockedProvider mocks={[]}>
+        <MockedProvider mocks={[mocks]}>
          <SimpleMarketList />
        </MockedProvider>,
        { wrapper: BrowserRouter }
      );
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+    await waitFor(() => {
+      expect(
+        document.querySelector('.ag-center-cols-container')
+      ).toBeInTheDocument();
+    });
+
+    await expect(
+      updateMock({
+        delta: {
+          __typename: 'MarketData',
+          market: {
+            __typename: 'Market',
+            id: '2',
+            state: MarketState.STATE_ACTIVE,
+          },
+        },
+      })
+    ).toEqual(true);
+
+    await expect(
+      updateMock({
+        delta: {
+          __typename: 'MarketData',
+          market: {
+            __typename: 'Market',
+            id: '2',
+            state: MarketState.STATE_SUSPENDED,
+          },
+        },
+      })
+    ).toEqual(false);
+  });
+
+  it('click on row should be properly handled', async () => {
+    await act(async () => {
+      render(
+        <MockedProvider mocks={[mocks]}>
+          <SimpleMarketList />
+        </MockedProvider>,
+        { wrapper: BrowserRouter }
+      );
+      await new Promise((resolve) => setTimeout(resolve, 0));
+    });
+    await waitFor(() => {
+      expect(
+        document.querySelector('.ag-center-cols-container')
+      ).toBeInTheDocument();
    });
    mockIsTradable.mockClear();
    const container = document.querySelector('.ag-center-cols-container');
    const firstRow = getAllByRole(container as HTMLDivElement, 'row')[0];
-    expect(firstRow).toHaveAttribute('row-id', marketsMock[0].id);
-    await act(async () => {
-      fireEvent.click(firstRow);
-    });
+    expect(firstRow).toHaveAttribute('row-id', '1');
+    fireEvent.click(firstRow);
    await waitFor(() => {
-      expect(mockIsTradable).toHaveBeenCalledWith(
-        expect.objectContaining({
-          id: marketsMock[0].id,
-          state: MarketState.STATE_ACTIVE,
-        })
-      );
-      expect(mockedNavigate).toHaveBeenCalledWith(
-        `/trading/${marketsMock[0].id}`
-      );
+      expect(mockIsTradable).toHaveBeenCalledWith({
+        ...mockData[0],
+        percentChange: '-',
+      });
+      expect(mockedNavigate).toHaveBeenCalledWith(`/trading/${mockData[0].id}`);
    });
  });

  it('should be properly renderer as empty', async () => {
-    marketsMock = [];
+    mockData = [];
    await act(async () => {
      render(
-        <MockedProvider mocks={[]}>
+        <MockedProvider mocks={[mocks]}>
          <SimpleMarketList />
        </MockedProvider>,
        { wrapper: BrowserRouter }
      );
+      await new Promise((resolve) => setTimeout(resolve, 0));
    });
    await waitFor(() => {
      expect(screen.getByText('No data to display')).toBeInTheDocument();
@@ -1,22 +1,40 @@
-import { useCallback, useEffect, useRef, useMemo } from 'react';
+import React, {
+  useCallback,
+  useContext,
+  useEffect,
+  useMemo,
+  useRef,
+} from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
+import { subDays } from 'date-fns';
 import type { AgGridReact } from 'ag-grid-react';
+import { AgGridDynamic as AgGrid } from '@vegaprotocol/ui-toolkit';
 import {
-  useScreenDimensions,
  useDataProvider,
+  useScreenDimensions,
 } from '@vegaprotocol/react-helpers';
+import { t } from '@vegaprotocol/react-helpers';
 import { AsyncRenderer } from '@vegaprotocol/ui-toolkit';
+import { ThemeContext } from '@vegaprotocol/react-helpers';
 import type { MarketState } from '@vegaprotocol/types';
-import useMarketsFilterData from './use-markets-filter-data';
-import useColumnDefinitions from './use-column-definitions';
+import useMarketsFilterData from '../../hooks/use-markets-filter-data';
+import useColumnDefinitions from '../../hooks/use-column-definitions';
+import dataProvider from './data-provider';
+import * as constants from './constants';
 import SimpleMarketToolbar from './simple-market-toolbar';
+import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';
+import type { SimpleMarketDataSub_marketData } from './__generated__/SimpleMarketDataSub';
 import { IS_MARKET_TRADABLE } from '../../constants';
-import { ConsoleLiteGrid } from '../console-lite-grid';
-import type { Market } from '@vegaprotocol/market-list';
-import { Interval } from '@vegaprotocol/types';
-import { marketsWithCandlesProvider } from '@vegaprotocol/market-list';
+import type {
+  CellKeyDownEvent,
+  FullWidthCellKeyDownEvent,
+} from 'ag-grid-community/dist/lib/events';
+import type {
+  GetRowIdParams,
+  TabToNextCellParams,
+} from 'ag-grid-community/dist/lib/entities/iCallbackParams';

-export type MarketWithPercentChange = Market & {
+export type SimpleMarketsType = SimpleMarkets_markets & {
  percentChange?: number | '-';
 };

@@ -27,25 +45,33 @@ export type RouterParams = Partial<{
 }>;

 const SimpleMarketList = () => {
-  const { isMobile } = useScreenDimensions();
+  const { isMobile, screenSize } = useScreenDimensions();
  const navigate = useNavigate();
  const params = useParams<RouterParams>();
+  const theme = useContext(ThemeContext);
  const statusesRef = useRef<Record<string, MarketState | ''>>({});
  const gridRef = useRef<AgGridReact | null>(null);
+  const variables = useMemo(
+    () => ({
+      CandleSince: subDays(Date.now(), 1).toJSON(),
+    }),
+    []
+  );
+  const update = useCallback(
+    ({ delta }: { delta: SimpleMarketDataSub_marketData }) =>
+      statusesRef.current[delta.market.id] === delta.market.state,
+    [statusesRef]
+  );

-  const variables = useMemo(() => {
-    const yesterday = Math.round(new Date().getTime() / 1000) - 24 * 3600;
-    return {
-      since: new Date(yesterday * 1000).toISOString(),
-      interval: Interval.INTERVAL_I1H,
-    };
-  }, []);
  const { data, error, loading } = useDataProvider({
-    dataProvider: marketsWithCandlesProvider,
+    dataProvider,
+    update,
    variables,
-    noUpdate: true,
  });
-  const localData = useMarketsFilterData(data, params);
+  const localData: Array<SimpleMarketsType> = useMarketsFilterData(
+    data || [],
+    params
+  );

  const handleOnGridReady = useCallback(() => {
    gridRef.current?.api?.sizeColumnsToFit();
@@ -66,8 +92,10 @@ const SimpleMarketList = () => {

  const { columnDefs, defaultColDef } = useColumnDefinitions({ isMobile });

+  const getRowId = useCallback(({ data }: GetRowIdParams) => data.id, []);
+
  const handleRowClicked = useCallback(
-    ({ data }: { data: Market }) => {
+    ({ data }: { data: SimpleMarketsType }) => {
      if (IS_MARKET_TRADABLE(data)) {
        navigate(`/trading/${data.id}`);
      }
@@ -75,17 +103,64 @@ const SimpleMarketList = () => {
    [navigate]
  );

+  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 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 (
    <div className="h-full p-4 md:p-6 grid grid-rows-[min-content,1fr]">
      <SimpleMarketToolbar data={data || []} />
      <AsyncRenderer loading={loading} error={error} data={localData}>
-        <ConsoleLiteGrid<MarketWithPercentChange>
-          classNamesParam="mb-32 min-h-[300px]"
+        <AgGrid
+          className="mb-32 min-h-[300px]"
+          defaultColDef={defaultColDef}
          columnDefs={columnDefs}
          rowData={localData}
-          defaultColDef={defaultColDef}
-          handleRowClicked={handleRowClicked}
-          getRowId={({ data }) => data.id}
+          rowHeight={60}
+          customThemeParams={
+            theme === 'dark'
+              ? constants.agGridDarkVariables
+              : constants.agGridLightVariables
+          }
+          onGridReady={handleOnGridReady}
+          onRowClicked={handleRowClicked}
+          rowClass={isMobile ? 'mobile' : ''}
+          rowClassRules={constants.ROW_CLASS_RULES}
+          ref={gridRef}
+          overlayNoRowsTemplate={t('No data to display')}
+          suppressContextMenu
+          getRowId={getRowId}
+          suppressMovableColumns
+          suppressRowTransform
+          onCellKeyDown={onCellKeyDown}
+          tabToNextCell={onTabToNextCell}
+          suppressHorizontalScroll={shouldSuppressHorizontalScroll}
        />
      </AsyncRenderer>
    </div>
@@ -2,10 +2,10 @@ import React from 'react';
 import { render, screen } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
 import SimpleMarketPercentChange from './simple-market-percent-change';
-import type { Candle } from '@vegaprotocol/market-list';
+import type { SimpleMarkets_markets_candles } from './__generated__/SimpleMarkets';

 describe('SimpleMarketPercentChange should parse proper change', () => {
-  let candles: (Candle | null)[] | null;
+  let candles: (SimpleMarkets_markets_candles | null)[] | null;
  const setValue = () => undefined;
  it('empty array', () => {
    candles = [];
@@ -34,7 +34,11 @@ describe('SimpleMarketPercentChange should parse proper change', () => {
    expect(screen.getByText('-')).toBeInTheDocument();
  });
  it('an appreciated one', () => {
-    candles = [{ open: '50' } as Candle, { close: '100' } as Candle, null];
+    candles = [
+      { open: '50' } as SimpleMarkets_markets_candles,
+      { close: '100' } as SimpleMarkets_markets_candles,
+      null,
+    ];
    render(
      <MockedProvider>
        <SimpleMarketPercentChange
@@ -50,7 +54,11 @@ describe('SimpleMarketPercentChange should parse proper change', () => {
    );
  });
  it('a depreciated one', () => {
-    candles = [{ open: '100' } as Candle, { close: '50' } as Candle, null];
+    candles = [
+      { open: '100' } as SimpleMarkets_markets_candles,
+      { close: '50' } as SimpleMarkets_markets_candles,
+      null,
+    ];
    render(
      <MockedProvider>
        <SimpleMarketPercentChange
@@ -1,20 +1,26 @@
-import { useEffect, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import classNames from 'classnames';
 import { InView } from 'react-intersection-observer';
-import { useDataProvider } from '@vegaprotocol/react-helpers';
-import type { Candle } from '@vegaprotocol/market-list';
-import { marketCandlesProvider } from '@vegaprotocol/market-list';
-import { Interval } from '@vegaprotocol/types';
+import { useSubscription } from '@apollo/client';
+import type { SimpleMarkets_markets_candles } from './__generated__/SimpleMarkets';
+import type {
+  CandleLive,
+  CandleLiveVariables,
+} from './__generated__/CandleLive';
+import { CANDLE_SUB } from './data-provider';

 interface Props {
-  candles: (Candle | null)[] | null;
+  candles: (SimpleMarkets_markets_candles | null)[] | null;
  marketId: string;
  setValue: (arg: unknown) => void;
 }

 const EMPTY_VALUE = ' - ';

-const getChange = (candles: (Candle | null)[] | null, lastClose?: string) => {
+const getChange = (
+  candles: (SimpleMarkets_markets_candles | null)[] | null,
+  lastClose?: string
+) => {
  if (candles) {
    const first = parseInt(candles.find((item) => item?.open)?.open || '-1');
    const last =
@@ -68,19 +74,11 @@ const SimpleMarketPercentChangeWrapper = (props: Props) => {
 };

 const SimpleMarketPercentChange = ({ candles, marketId, setValue }: Props) => {
-  const yesterday = Math.round(new Date().getTime() / 1000) - 24 * 3600;
-  const { data } = useDataProvider({
-    dataProvider: marketCandlesProvider,
-    variables: {
-      marketId,
-      interval: Interval.INTERVAL_I1D,
-      since: new Date(yesterday * 1000).toISOString(),
-    },
-  });
-
-  const close = data?.map((m) => m.close);
-
-  const change = getChange(candles, close?.[0]);
+  const { data: { candles: { close = undefined } = {} } = {} } =
+    useSubscription<CandleLive, CandleLiveVariables>(CANDLE_SUB, {
+      variables: { marketId },
+    });
+  const change = getChange(candles, close);
  const colorClasses = getClassColor(change);
  useEffect(() => {
    const value = parseFloat(change);
@@ -1,36 +1,36 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
+import type { MarketNames_markets } from '@vegaprotocol/deal-ticket';
 import { MarketState } from '@vegaprotocol/types';
 import MarketNameRenderer from './simple-market-renderer';
-import type { Market } from '@vegaprotocol/market-list';

 describe('SimpleMarketRenderer', () => {
  const market = {
-    id: 'MARKET_A',
+    id: 'marketId',
    state: MarketState.STATE_ACTIVE,
    tradableInstrument: {
      instrument: {
-        code: 'MARKET_A_CODE',
-        name: 'MARKET_A_NAME',
+        code: 'Market code',
+        name: 'Market Name',
        product: {
-          quoteName: 'MARKET_A_QUOTE_NAME',
+          quoteName: 'Quote name',
        },
        metadata: {
          tags: null,
        },
      },
    },
-  } as Market;
+  } as MarketNames_markets;

  it('should properly render not mobile', () => {
    render(<MarketNameRenderer market={market} isMobile={false} />);
-    expect(screen.getByText('MARKET_A_NAME')).toBeInTheDocument();
-    expect(screen.getByText('MARKET_A_QUOTE_NAME')).toBeInTheDocument();
+    expect(screen.getByText('Market Name')).toBeInTheDocument();
+    expect(screen.getByText('Quote name')).toBeInTheDocument();
  });

  it('should properly render mobile', () => {
    render(<MarketNameRenderer market={market} isMobile={true} />);
-    expect(screen.getByText('MARKET_A_CODE')).toBeInTheDocument();
-    expect(screen.getByText('MARKET_A_QUOTE_NAME')).toBeInTheDocument();
+    expect(screen.getByText('Market code')).toBeInTheDocument();
+    expect(screen.getByText('Quote name')).toBeInTheDocument();
  });
 });
@@ -1,9 +1,10 @@
+import React from 'react';
 import classNames from 'classnames';
+import type { MarketNames_markets } from '@vegaprotocol/deal-ticket';
 import SimpleMarketExpires from './simple-market-expires';
-import type { Market } from '@vegaprotocol/market-list';

 interface Props {
-  market: Market;
+  market: MarketNames_markets;
  isMobile?: boolean;
 }

@@ -1,4 +1,4 @@
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useRef, useState } from 'react';
 import classNames from 'classnames';
 import { useNavigate, useParams, Link } from 'react-router-dom';
 import {
@@ -7,6 +7,7 @@ import {
 } from '@radix-ui/react-dropdown-menu';
 import { IconNames } from '@blueprintjs/icons';
 import { t } from '@vegaprotocol/react-helpers';
+import { themelite as theme } from '@vegaprotocol/tailwindcss-config';
 import {
  DropdownMenuCheckboxItem,
  DropdownMenuContent,
@@ -15,13 +16,11 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { MarketState } from '@vegaprotocol/types';
 import useMarketFiltersData from '../../hooks/use-markets-filter';
-import type { Market } from '@vegaprotocol/market-list';
-import { HorizontalMenu } from '../horizontal-menu';
-import type { HorizontalMenuItem } from '../horizontal-menu';
-import * as constants from './constants';
+import { STATES_FILTER } from './constants';
+import type { SimpleMarkets_markets } from './__generated__/SimpleMarkets';

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

 const SimpleMarketToolbar = ({ data }: Props) => {
@@ -29,6 +28,37 @@ const SimpleMarketToolbar = ({ data }: Props) => {
  const params = useParams();
  const { products, assetsPerProduct } = useMarketFiltersData(data);
  const [isOpen, setOpen] = useState(false);
+  const [activeNumber, setActiveNumber] = useState(
+    products?.length ? products.indexOf(params.product || '') + 1 : -1
+  );
+
+  const [sliderStyles, setSliderStyles] = useState<Record<string, string>>({});
+  const slideContRef = useRef<HTMLUListElement | null>(null);
+
+  useEffect(() => {
+    if (products.length) {
+      setActiveNumber(products.indexOf(params.product || '') + 1);
+    } else {
+      setActiveNumber(-1);
+    }
+  }, [params, products, setActiveNumber]);
+
+  useEffect(() => {
+    const contStyles = (
+      slideContRef.current as HTMLUListElement
+    ).getBoundingClientRect();
+    const selectedStyles = (slideContRef.current as HTMLUListElement).children[
+      activeNumber
+    ]?.getBoundingClientRect();
+    const styles: Record<string, string> = selectedStyles
+      ? {
+          backgroundColor: activeNumber ? '' : theme.colors.pink,
+          width: `${selectedStyles.width}px`,
+          left: `${selectedStyles.left - contStyles.left}px`,
+        }
+      : {};
+    setSliderStyles(styles);
+  }, [activeNumber, slideContRef]);

  const onStateChange = useCallback(
    (activeState: string) => {
@@ -44,33 +74,53 @@ const SimpleMarketToolbar = ({ data }: Props) => {
    [params, navigate]
  );

-  const productItems = useMemo(() => {
-    const currentState = params.state || MarketState.STATE_ACTIVE;
-    const noStateSkip = currentState !== MarketState.STATE_ACTIVE;
-    const items: HorizontalMenuItem[] = [
-      {
-        ...constants.ALL_PRODUCTS_ITEM,
-        url: `/markets${noStateSkip ? '/' + currentState : ''}`,
-      },
-    ];
-    products.forEach((product) =>
-      items.push({
-        name: product,
-        id: product,
-        url: `/markets/${currentState}/${product}`,
-      })
-    );
-    return items;
-  }, [params, products]);
-
  return (
    <div className="w-full max-w-full mb-2 md:mb-8 font-alpha">
-      <HorizontalMenu
-        active={params.product || constants.ALL_PRODUCTS_ITEM.id}
-        items={productItems}
+      <ul
+        ref={slideContRef}
+        className="grid grid-flow-col auto-cols-min gap-4 relative pb-2 mb-2"
        data-testid="market-products-menu"
        aria-label={t('Product type')}
-      />
+      >
+        <li key="all-markets" className="md:mr-2 whitespace-nowrap">
+          <Link
+            to={`/markets${
+              params.state && params.state !== MarketState.STATE_ACTIVE
+                ? '/' + params.state
+                : ''
+            }`}
+            aria-label={t('All markets')}
+            className={classNames('pl-0 text-pink hover:opacity-75', {
+              active: !activeNumber,
+            })}
+          >
+            {t('All Markets')}
+          </Link>
+        </li>
+        {products.map((product, i) => (
+          <li key={product} className="mx-2 whitespace-nowrap">
+            <Link
+              to={`/markets/${
+                params.state || MarketState.STATE_ACTIVE
+              }/${product}`}
+              className={classNames(
+                'hover:opacity-75 text-black dark:text-white',
+                {
+                  active: activeNumber - 1 === i,
+                }
+              )}
+              aria-label={product}
+            >
+              {product}
+            </Link>
+          </li>
+        ))}
+        <li
+          className="absolute bottom-0 h-[2px] transition-left duration-300 dark:bg-white bg-black"
+          key="slider"
+          style={sliderStyles}
+        />
+      </ul>
      <div className="grid gap-4 pb-2 mt-2 md:mt-6 md:grid-cols-[min-content,min-content,1fr]">
        <div className="pb-2">
          <DropdownMenu open={isOpen} onOpenChange={(open) => setOpen(open)}>
@@ -80,7 +130,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
              onClick={() => setOpen(!isOpen)}
            >
              <div className="w-full justify-between uppercase inline-flex items-center justify-center box-border">
-                {constants.STATES_FILTER.find(
+                {STATES_FILTER.find(
                  (state) =>
                    state.value === params.state ||
                    (!params.state && state.value === MarketState.STATE_ACTIVE)
@@ -97,7 +147,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
              </div>
            </DropdownMenuTrigger>
            <DropdownMenuContent>
-              {constants.STATES_FILTER.map(({ value, text }) => (
+              {STATES_FILTER.map(({ value, text }) => (
                <DropdownMenuCheckboxItem
                  className="uppercase text-ui"
                  key={value}
@@ -119,7 +169,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
        <div className="hidden md:block text-deemphasise dark:text-midGrey">
          |
        </div>
-        {params.product && (
+        {activeNumber > 0 && (
          <ul
            className="md:gap-x-6 gap-x-4 gap-y-1 pb-2 md:ml-2 flex flex-wrap"
            data-testid="market-assets-menu"
@@ -139,7 +189,7 @@ const SimpleMarketToolbar = ({ data }: Props) => {
                {t('All')}
              </Link>
            </li>
-            {assetsPerProduct[params?.product]?.map((asset) => (
+            {assetsPerProduct[products[activeNumber - 1]]?.map((asset) => (
              <li key={asset}>
                <Link
                  to={`/markets/${params.state}/${params.product}/${asset}`}
@@ -1,43 +0,0 @@
-import { useMemo } from 'react';
-import { MarketState } from '@vegaprotocol/types';
-import type { MarketWithCandles } from '@vegaprotocol/market-list';
-import type { RouterParams } from './simple-market-list';
-
-const useMarketsFilterData = (
-  data: MarketWithCandles[] | null,
-  params: RouterParams
-) => {
-  return useMemo(() => {
-    return (
-      data?.filter((item) => {
-        if (
-          params.product &&
-          params.product !==
-            item.tradableInstrument.instrument.product.__typename
-        ) {
-          return false;
-        }
-        if (
-          params.asset &&
-          params.asset !== 'all' &&
-          params.asset !==
-            item.tradableInstrument.instrument.product.settlementAsset.symbol
-        ) {
-          return false;
-        }
-        const state =
-          params.state === 'all'
-            ? ''
-            : params.state
-            ? params.state
-            : MarketState.STATE_ACTIVE;
-        if (state && state !== item.state) {
-          return false;
-        }
-        return true;
-      }) || []
-    );
-  }, [data, params.product, params.asset, params.state]);
-};
-
-export default useMarketsFilterData;
@@ -10,8 +10,8 @@ export const VegaWalletConnectButton = ({
  setConnectDialog,
  setManageDialog,
 }: VegaWalletConnectButtonProps) => {
-  const { pubKey } = useVegaWallet();
-  const isConnected = pubKey !== null;
+  const { keypair } = useVegaWallet();
+  const isConnected = keypair !== null;

  const handleClick = () => {
    if (isConnected) {
@@ -31,7 +31,7 @@ export const VegaWalletConnectButton = ({
        onClick={handleClick}
        className="ml-auto inline-block text-ui-small font-mono hover:underline"
      >
-        {isConnected ? truncateByChars(pubKey) : 'Connect Vega wallet'}
+        {isConnected ? truncateByChars(keypair.pub) : 'Connect Vega wallet'}
      </button>
    </span>
  );
@@ -1,6 +1,6 @@
+import type { SimpleMarkets_markets } from '../components/simple-market-list/__generated__/SimpleMarkets';
 import { MarketState } from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/react-helpers';
-import type { Market } from '@vegaprotocol/market-list';

 export const DATE_FORMAT = 'dd MMMM yyyy HH:mm';
 export const EXPIRE_DATE_FORMAT = 'MMM dd';
@@ -9,7 +9,7 @@ export const TRADABLE_STATES = {
  [MarketState.STATE_ACTIVE]: true,
 };

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

 export const MARKET_STATES_MAP: Record<MarketState | '', string> = {
@@ -24,5 +24,3 @@ export const MARKET_STATES_MAP: Record<MarketState | '', string> = {
  [MarketState.STATE_TRADING_TERMINATED]: t('TradingTerminated'),
  '': t('Unknown'),
 };
-
-export const NO_DATA_MESSAGE = t('No data to display');
@@ -10,7 +10,7 @@
 export interface MarketMarkPrice_market_data {
  __typename: "MarketData";
  /**
-   * The mark price (an unsigned integer)
+   * the mark price (actually an unsigned int)
   */
  markPrice: string;
 }
@@ -18,8 +18,8 @@ export interface MarketMarkPrice_market_data {
 export interface MarketMarkPrice_market {
  __typename: "Market";
  /**
-   * The number of decimal places that an integer must be shifted by in order to get a correct
-   * number denominated in the currency of the market. (uint64)
+   * decimalPlaces indicates the number of decimal places that an integer must be shifted by in order to get a correct
+   * number denominated in the currency of the Market. (uint64)
   * 
   * Examples:
   * Currency     Balance  decimalPlaces  Real Balance
@@ -42,7 +42,7 @@ export interface MarketMarkPrice_market {

 export interface MarketMarkPrice {
  /**
-   * An instrument that is trading on the Vega network
+   * An instrument that is trading on the VEGA network
   */
  market: MarketMarkPrice_market | null;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AccountType } from "@vegaprotocol/types";
+import { AccountType } from "./../../../../../../libs/types/src/__generated__/globalTypes";

 // ====================================================
 // GraphQL query operation: PartyMarketData
@@ -12,11 +12,11 @@ import { AccountType } from "@vegaprotocol/types";
 export interface PartyMarketData_party_accounts_asset {
  __typename: "Asset";
  /**
-   * The ID of the asset
+   * The id of the asset
   */
  id: string;
  /**
-   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
+   * The precision of the asset
   */
  decimals: number;
 }
@@ -60,19 +60,19 @@ export interface PartyMarketData_party_marginsConnection_edges_node_market {
 export interface PartyMarketData_party_marginsConnection_edges_node {
  __typename: "MarginLevels";
  /**
-   * Market in which the margin is required for this party
+   * market in which the margin is required for this party
   */
  market: PartyMarketData_party_marginsConnection_edges_node_market;
  /**
-   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   * this is the minimal margin required for a party to place a new order on the network (unsigned int actually)
   */
  initialLevel: string;
  /**
-   * Minimal margin for the position to be maintained in the network (unsigned integer)
+   * minimal margin for the position to be maintained in the network (unsigned int actually)
   */
  maintenanceLevel: string;
  /**
-   * If the margin is between maintenance and search, the network will initiate a collateral search (unsigned integer)
+   * if the margin is between maintenance and search, the network will initiate a collateral search (unsigned int actually)
   */
  searchLevel: string;
 }
@@ -101,14 +101,14 @@ export interface PartyMarketData_party {
   */
  accounts: PartyMarketData_party_accounts[] | null;
  /**
-   * Margin levels for a market
+   * Margin level for a market
   */
-  marginsConnection: PartyMarketData_party_marginsConnection | null;
+  marginsConnection: PartyMarketData_party_marginsConnection;
 }

 export interface PartyMarketData {
  /**
-   * An entity that is trading on the Vega network
+   * An entity that is trading on the VEGA network
   */
  party: PartyMarketData_party | null;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { Side, OrderTimeInForce, OrderType } from "@vegaprotocol/types";
+import { Side, OrderTimeInForce, OrderType } from "./../../../../../../libs/types/src/__generated__/globalTypes";

 // ====================================================
 // GraphQL query operation: EstimateOrder
@@ -12,15 +12,15 @@ import { Side, OrderTimeInForce, OrderType } from "@vegaprotocol/types";
 export interface EstimateOrder_estimateOrder_fee {
  __typename: "TradeFee";
  /**
-   * The maker fee, paid by the aggressive party to the other party (the one who had an order in the book)
+   * The maker fee, aggressive party to the other party (the one who had an order in the book)
   */
  makerFee: string;
  /**
-   * The infrastructure fee, a fee paid to the validators to maintain the Vega network
+   * The infrastructure fee, a fee paid to the node runner to maintain the vega network
   */
  infrastructureFee: string;
  /**
-   * The fee paid to the liquidity providers that committed liquidity to the market
+   * The fee paid to the market makers to provide liquidity in the market
   */
  liquidityFee: string;
 }
@@ -28,7 +28,7 @@ export interface EstimateOrder_estimateOrder_fee {
 export interface EstimateOrder_estimateOrder_marginLevels {
  __typename: "MarginLevels";
  /**
-   * This is the minimum margin required for a party to place a new order on the network (unsigned integer)
+   * this is the minimal margin required for a party to place a new order on the network (unsigned int actually)
   */
  initialLevel: string;
 }
@@ -47,7 +47,7 @@ export interface EstimateOrder_estimateOrder {

 export interface EstimateOrder {
  /**
-   * Return an estimation of the potential cost for a new order
+   * return an estimation of the potential cost for a new order
   */
  estimateOrder: EstimateOrder_estimateOrder;
 }
@@ -3,7 +3,7 @@
 // @generated
 // This file was automatically generated and should not be edited.

-import { AccountType } from "@vegaprotocol/types";
+import { AccountType } from "./../../../../../../libs/types/src/__generated__/globalTypes";

 // ====================================================
 // GraphQL query operation: MarketPositions
@@ -12,7 +12,7 @@ import { AccountType } from "@vegaprotocol/types";
 export interface MarketPositions_party_accounts_asset {
  __typename: "Asset";
  /**
-   * The precision of the asset. Should match the decimal precision of the asset on its native chain, e.g: for ERC20 assets, it is often 18
+   * The precision of the asset
   */
  decimals: number;
 }
@@ -67,9 +67,6 @@ export interface MarketPositions_party_positionsConnection_edges_node {

 export interface MarketPositions_party_positionsConnection_edges {
  __typename: "PositionEdge";
-  /**
-   * The position
-   */
  node: MarketPositions_party_positionsConnection_edges_node;
 }

@@ -94,12 +91,12 @@ export interface MarketPositions_party {
  /**
   * Trading positions relating to a party
   */
-  positionsConnection: MarketPositions_party_positionsConnection | null;
+  positionsConnection: MarketPositions_party_positionsConnection;
 }

 export interface MarketPositions {
  /**
-   * An entity that is trading on the Vega network
+   * An entity that is trading on the VEGA network
   */
  party: MarketPositions_party | null;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Edd	77f084c5de	fix(explorer): add workaround for v53 misreporting total node count	2023-01-19 11:47:07 +00:00
Dexter Edwards	3e06c9478c	Hack/mainnet leaving validators (#2576 ) * feat: hacky thing to tell people the validators that are leaving * chore: put back empty state * style: lint	2023-01-11 14:58:07 +00:00
Joe Tsang	326a2e6412	chore: pull capsule from v0.2.3 (#2520 )	2023-01-04 17:14:45 +00:00
Edd	5a1bd5a73f	chore(explorer): add mirror env (#2517 ) * chore(explorer): add mirror env * chore: bump nx sha3 in extra workflows	2023-01-04 17:03:32 +00:00
Edd	0416e916e1	chore: bump nx sha3 in workflows	2023-01-04 16:13:09 +00:00
Dexter	af3bb2dcd5	chore: update mirror url	2023-01-04 14:33:48 +00:00
Dexter	6229e6f92b	chore: adjust mirror env vars	2023-01-04 13:28:29 +00:00
Dexter Edwards	f03aa655c3	chore: fix percetnages (#2501 )	2023-01-03 12:43:20 +00:00
Dexter EdwardsandMatthew Russell	20dd1995ca	chore: remove validating nodes (#2454 ) * chore: remove validating nodes * fix: explorer home * chore: remove stray log Co-authored-by: Matthew Russell <mattrussell36@gmail.com>	2022-12-21 17:26:19 +00:00
Dexter	266f2462bc	fix: rounding error	2022-12-14 09:17:59 +00:00
Dexter Edwards	14052c4088	fix: rewards page (#2393 )	2022-12-13 17:01:37 +00:00
Dexter Edwards	d4231ea531	Fix/rest delegations (#2392 ) * chore: create use delegations hook * chore: add polling to use delegations * chore: remove polling logic from hook * chore: remove delegations from staking form * chore: fix more delegations queries * chore: rename file * fix: spelling issues	2022-12-13 15:37:11 +00:00
Dexter Edwards	718c93f486	chore: poll delegations less frequently (#2390 )	2022-12-13 10:45:24 +00:00
Dexter Edwards	4ef5d7f19c	feat: mirror environment (#2342 ) * feat: mirror environment * chore: update networks to have correct data node * chore: update netowrks to point to correct data nodes	2022-12-07 10:11:23 +00:00
Edd	51f341ea94	fix(#2012 ): fix mainnet block explorer (#2020 ) * chore(explorer): add urls for mainnet explorer api	2022-11-10 16:28:09 +00:00
Elmar	6d09e4ee64	chore(#1976 ): block explorer txs list (#1996 ) * Feat/1334 replace json (#1459) * feat(explorer): add panel component * feat(explorer): add info panel component * feat(explorer): change layout styles * feat(explorer): render json data in component for parties * feat(explorer): change testnet env * feat(explorer): change eslint json * feat(explorer): render staking json in info panel component * fix(explorer): pr comments * fix(explorer): theme dark nav (#1498) * fix(explorer): add party to consolidated search (#1588) * fix(explorer): add party to consolidated search * chore(explorer): add missing tests for detect-search.spec.ts * feat(explorer): add txs infinite scroll list (#1625) * Feat/1682 fix api endpoints (#1690) * chore(explorer): replace tendermint api with block explorer api for transaction related searches * feat(explorer): replace detect search type to be by process of elimination as temp measure * fix(explorer): fix broken tests * Feat/397 list transactions (#1770) * chore(explorer): add stagnet 1 env vars * feat(explorer): add info block component * feat(explorer): change tx order type lozenge * feat(explorer): change truncated-link.tsx style * feat(explorer): add stats info component for txs * feat(explorer): change page title size * feat(explorer): update txs list and add txs for party * fix(explorer): remove unused var * fix(explorer): change copy and remove unused vars * fix(explorer): pr review fixes * Feat/1501 improve party details (#1785) * feat(explorer): change styling party details page * feat(explorer): use panel component in txs-stats-info.tsx * feat(explorer): change order for party details sections * chore(explorer): add stagnet-1 env vars (#1846) * chore(explorer): add sandbox env vars (#1867) * chore(explorer): update BE api urls (#1886) * Feat/1416 tx detail (#1953) * chore(explorer): add new vega colours to tw config * feat(explorer): add new nested data list component * feat(explorer): abstract page header with copy to new component * feat(explorer): update styles tx details page * fix(explorer): linting errors * fix(explorer): fix txs type * fix(explorer): fix strong typing * fix(explorer): fix styling error for e2e test * fix(explorer): reduce limit of txs from 100 to 20	2022-11-09 10:03:02 +00:00
Elmar	63bfcb6e75	fix(explorer): fix uptime to reference genesisTime field (#1819 )	2022-10-21 13:11:56 +01:00
Elmar	66046a9471	fix(stats-manager): fix uptime pointing to incorrect field (#1328 ) (#1725 )	2022-10-21 12:16:35 +01:00
Dexter Edwards	4263a6b07b	fix: do no allow min or max fraction digits to go out of range (#1806 ) * fix: do no allow min or max fraction digits to go out of range * style: lint * chore: assign variable to remove magic number	2022-10-20 14:41:19 +01:00
Dexter Edwards	389291785b	fix: wallet connect (#1706 )	2022-10-11 12:30:05 +01:00
Dexter Edwards	a1746019b6	Chore/api endpoints (#1392 ) * ci: correct api endpoints * ci: force build	2022-09-20 11:32:17 +01:00
Dexter Edwards	be38f630d8	Chore/more env config (#1363 ) * chore: remove vega URL as no longer needed * chore: remove bad env config * chore: remove config caching * chore: remove silly text * style: lint * chore: style lint * test: remove test for removed functionality	2022-09-16 18:23:02 +01:00
Matthew Russell	c49c52a635	fix: supporting text content on withdrawals page	2022-09-08 15:13:37 -07:00
Matthew Russell	a94fc689b9	chore: appease nx import path	2022-09-08 12:42:05 -07:00
Matthew Russell	25f63d2fd2	fix: regen types from mainnet and fix errors	2022-09-08 12:31:10 -07:00
Dexter	1ac0cf554f	ci: force build	2022-09-08 15:08:02 +01:00
Dexter	48004d836d	Revert "chore: proposal schema change (1057) (#1169 )" This reverts commit `d2791f2e59`.	2022-09-08 15:03:26 +01:00
Dexter	32e2e22c64	chore: revert ethereumAddress changes which are not on mainnet yet	2022-09-08 15:02:23 +01:00
Dexter	71c8b31ffe	fix: tranches styles look terrible	2022-09-08 14:59:35 +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';`