chore: remove settlementDataDecimals field and regen graphql (#2442 )

chore: update tranches
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
2022-12-20 17:36:54 -08:00 · 2022-12-21 00:12:17 +00:00 · 2022-12-20 18:06:15 +00:00 · 2022-12-20 14:41:30 +01:00 · 2022-12-20 12:06:59 +00:00 · 2022-12-20 11:22:35 +00:00
814 changed files with 23693 additions and 13573 deletions
@@ -1,28 +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
-      shell: bash
-      run: |
-        wget 'https://github.com/vegaprotocol/vega/releases/download/${{ inputs.version }}/vega-linux-amd64.zip' -q
-        unzip vega-linux-amd64.zip -d ${{ inputs.gobin }}
-
-    - name: Checkout vegawallet-dummy
-      uses: actions/checkout@v3
-      with:
-        repository: 'vegaprotocol/vegawallet-dummy'
-        path: './dummy'
-
-    - name: Install vegawallet-dummy binaries
-      shell: bash
-      run: go install
-      working-directory: ./dummy
@@ -1,26 +1,6 @@
-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 &
@@ -1,6 +1,10 @@
 inputs:
  passphrase:
    description: 'Wallet password'
+outputs:
+  token:
+    description: 'api-token of wallet'
+    value: ${{ steps.generate-api-token.outputs.api-token }}
 runs:
  using: 'composite'
  steps:
@@ -16,10 +20,23 @@ runs:
      shell: bash
      run: vega wallet import -w capsule_wallet --recovery-phrase-file ./frontend-monorepo/vegacapsule/recovery -p ./passphrase --home ~/.vegacapsule/testnet/wallet

+    - name: Generate second public key
+      shell: bash
+      run: vega wallet key generate -w capsule_wallet -p ./passphrase --home ~/.vegacapsule/testnet/wallet
+
    - name: Import network
      shell: bash
      run: vega wallet network import --force --from-file ./frontend-monorepo/vegacapsule/wallet-config.toml --home ~/.vegacapsule/testnet/wallet

+    - name: Init api-token
+      shell: bash
+      run: vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file passphrase
+
+    - name: Generate api-token
+      id: generate-api-token
+      shell: bash
+      run: echo api-token=$(vega wallet api-token generate --wallet-name capsule_wallet --tokens-passphrase-file passphrase  --wallet-passphrase-file passphrase --home ~/.vegacapsule/testnet/wallet | grep -Eo '[a-zA-Z0-9]{64}') >> $GITHUB_OUTPUT
+
    - name: Start service using capsule network
      shell: bash
-      run: vegawallet-dummy service run --network DV --wallet capsule_wallet --passphrase-file ./passphrase --home ~/.vegacapsule/testnet/wallet &
+      run: vega wallet service run -n DV --load-tokens --tokens-passphrase-file passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet &
@@ -3,6 +3,10 @@ inputs:
    description: 'Recovery phrase'
  passphrase:
    description: 'Wallet password'
+outputs:
+  token:
+    description: 'api-token of wallet'
+    value: ${{ steps.generate-api-token.outputs.api-token }}
 runs:
  using: 'composite'
  steps:
@@ -30,6 +34,15 @@ runs:
      shell: bash
      run: vega wallet network import --from-url="https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/stagnet3/vegawallet-stagnet3.toml" --force --home ~/.vegacapsule/testnet/wallet

+    - name: Init api-token
+      shell: bash
+      run: vega wallet api-token init --home ~/.vegacapsule/testnet/wallet --passphrase-file passphrase
+
+    - name: Generate api-token
+      id: generate-api-token
+      shell: bash
+      run: echo api-token=$(vega wallet api-token generate --wallet-name UI_Trading_Test --tokens-passphrase-file passphrase  --wallet-passphrase-file passphrase --home ~/.vegacapsule/testnet/wallet | grep -Eo '[a-zA-Z0-9]{64}') >> $GITHUB_OUTPUT
+
    - name: Start service using stagnet3 network
      shell: bash
-      run: vegawallet-dummy service run --network stagnet3 --wallet UI_Trading_Test --passphrase-file ./passphrase --home ~/.vegacapsule/testnet/wallet &
+      run: vega wallet service run -n stagnet3 --load-tokens --tokens-passphrase-file passphrase --no-version-check --automatic-consent --home ~/.vegacapsule/testnet/wallet &
@@ -26,10 +26,6 @@ on:
        required: false
        type: boolean
        default: false
-env:
-  GOBIN: /home/runner/go/bin
-  VEGA_VERSION: 'v0.62.1'
-
 jobs:
  manual:
    name: Run Cypress tests -- manual trigger
@@ -43,8 +39,6 @@ jobs:
        run: echo SKIP_NX_CACHE="--skip-nx-cache" >> $GITHUB_ENV

    outputs:
-      vega-version: ${{env.VEGA_VERSION}}
-      gobin: ${{env.GOBIN}}
      skip-cache: ${{env.SKIP_NX_CACHE}}
      tags: ${{env.TAGS}}

@@ -54,7 +48,5 @@ jobs:
    secrets: inherit
    with:
      project: ${{ inputs.project }}
-      vega-version: ${{needs.manual.outputs.vega-version}}
-      gobin: ${{needs.manual.outputs.gobin}}
      skip-cache: ${{needs.manual.outputs.skip-cache}}
      tags: ${{needs.manual.outputs.tags}}
@@ -13,7 +13,5 @@ jobs:
    secrets: inherit
    with:
      project: '[console-lite-e2e, explorer-e2e, liquidity-provision-dashboard-e2e, stats-e2e, token-e2e, trading-e2e]'
-      vega-version: 'v0.62.1'
-      gobin: /home/runner/go/bin
      tags: --env.grepTags '[ @smoke, @regression, @slow ]'
      night-run: true
@@ -11,11 +11,6 @@ on:
      - reopened
      - synchronize
      - ready_for_review
-
-env:
-  GOBIN: /home/runner/go/bin
-  VEGA_VERSION: 'v0.62.1'
-
 jobs:
  pr:
    runs-on: ubuntu-latest
@@ -56,8 +51,6 @@ jobs:

    outputs:
      projects: ${{ env.AFFECTED }}
-      vega-version: ${{ env.VEGA_VERSION }}
-      gobin: ${{ env.GOBIN }}

  dispatch:
    needs: pr
@@ -65,6 +58,4 @@ jobs:
    secrets: inherit
    with:
      project: ${{ needs.pr.outputs.projects }}
-      vega-version: ${{needs.pr.outputs.vega-version}}
-      gobin: ${{needs.pr.outputs.gobin}}
-      tags: "--env.grepTags='@smoke'"
+      tags: "--env.grepTags='[ @smoke, @regression ]'"
@@ -7,13 +7,6 @@ on:
        required: true
        type: string
        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
      skip-cache:
        required: false
        type: string
@@ -26,9 +19,8 @@ jobs:
    if: ${{ inputs.trigger == 'true' }}
    runs-on: self-hosted
    steps:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
+      - name: Vega version
+        run: vega version

      # Checkout front ends
      - name: Checkout frontend mono repo
@@ -51,21 +43,12 @@ jobs:
        run: yarn install --frozen-lockfile
        working-directory: frontend-monorepo

-      #######
-      ## Build and run Vegacapsule network
-      #######
-
-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
      ######
      ## Setup a Vega wallet for our user
      ######

      - name: Set up Vegawallet
+        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
        with:
          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
@@ -83,3 +66,4 @@ jobs:
          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_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}
@@ -7,13 +7,6 @@ on:
        required: true
        type: string
        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
      skip-cache:
        required: false
        type: string
@@ -31,9 +24,11 @@ jobs:
    runs-on: self-hosted
    timeout-minutes: 30
    steps:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
+      - name: Vega version
+        run: vega version
+
+      - name: Vegacapsule version
+        run: vegacapsule version

      # Checkout front ends
      - name: Checkout frontend mono repo
@@ -60,22 +55,15 @@ jobs:
      ## Build and run Vegacapsule network
      #######

-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
      - name: Build and run Vegacapsule network
        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        with:
-          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######

      - name: Set up Vegawallet for docker
+        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/setup-vegawallet-docker
        with:
          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
@@ -97,6 +85,7 @@ jobs:
          CYPRESS_SLACK_WEBHOOK: ${{ secrets.CYPRESS_SLACK_WEBHOOK }}
          CYPRESS_ETH_WALLET_MNEMONIC: ${{ secrets.CYPRESS_ETH_WALLET_MNEMONIC }}
          CYPRESS_NIGHTLY_RUN: ${{ inputs.night-run }}
+          CYPRESS_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}

      ######
      ## Upload logs
@@ -104,8 +93,10 @@ jobs:

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

      - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
        with:
          name: logs
          path: ./vega-capsule-logs.txt
@@ -7,13 +7,6 @@ on:
        required: true
        type: string
        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
      skip-cache:
        required: false
        type: string
@@ -27,9 +20,11 @@ jobs:
    runs-on: self-hosted
    timeout-minutes: 60
    steps:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
+      - name: Vega version
+        run: vega version
+
+      - name: Vegacapsule version
+        run: vegacapsule version

      # Checkout front ends
      - name: Checkout frontend mono repo
@@ -56,22 +51,15 @@ jobs:
      ## Build and run Vegacapsule network
      #######

-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
      - name: Build and run Vegacapsule network
        uses: ./frontend-monorepo/.github/actions/run-vegacapsule
-        with:
-          github-token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      ######
      ## Setup a Vega wallet for our user
      ######

      - name: Set up Vegawallet for docker
+        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/setup-vegawallet-docker
        with:
          passphrase: ${{ secrets.CYPRESS_TRADING_TEST_VEGA_WALLET_PASSPHRASE }}
@@ -92,6 +80,7 @@ jobs:
          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_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}

      ######
      ## Upload logs
@@ -99,8 +88,10 @@ jobs:

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

      - uses: actions/upload-artifact@v2
+        if: ${{ always() }}
        with:
          name: logs
          path: ./vega-capsule-logs.txt
@@ -7,13 +7,6 @@ on:
        required: true
        type: string
        default: 'false'
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
      skip-cache:
        required: false
        type: string
@@ -27,9 +20,8 @@ jobs:
    timeout-minutes: 30
    runs-on: self-hosted
    steps:
-      # Add GOBIN to PATH
-      - name: Add GOBIN to PATH
-        run: echo ${{ inputs.gobin }} >> $GITHUB_PATH
+      - name: Vega version
+        run: vega version

      # Checkout front ends
      - name: Checkout frontend mono repo
@@ -52,21 +44,12 @@ jobs:
        run: yarn install --frozen-lockfile
        working-directory: frontend-monorepo

-      #######
-      ## Build and run Vegacapsule network
-      #######
-
-      - name: Install Vega binaries
-        uses: ./frontend-monorepo/.github/actions/install-vega-binaries
-        with:
-          version: ${{ inputs.vega-version }}
-          gobin: ${{ inputs.gobin }}
-
      ######
      ## Setup a Vega wallet for our user
      ######

      - name: Set up Vegawallet
+        id: setup-vega
        uses: ./frontend-monorepo/.github/actions/setup-vegawallet
        with:
          recovery: ${{ secrets.TRADING_TEST_VEGA_WALLET_RECOVERY }}
@@ -84,3 +67,4 @@ jobs:
          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_VEGA_WALLET_API_TOKEN: ${{ steps.setup-vega.outputs.token }}
@@ -4,7 +4,7 @@ name: Publish docker containers
  push:
    tags:
      - 'v[0-9]+.[0-9]+.[0-9]+'
-      - 'v[0-9]+.[0-9]+.[0-9]+-pre[0-9]+'
+      - 'v[0-9]+.[0-9]+.[0-9]+-*'

  workflow_dispatch:
    inputs:
@@ -4,13 +4,6 @@ on:
      project:
        required: true
        type: string
-      vega-version:
-        required: true
-        type: string
-      gobin:
-        required: false
-        type: string
-        default: /home/runner/go/bin
      skip-cache:
        required: false
        type: string
@@ -27,8 +20,6 @@ jobs:
    secrets: inherit
    with:
      trigger: ${{ contains(inputs.project, 'console-lite-e2e') || contains(inputs.project, 'console-lite') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
      skip-cache: ${{ inputs.skip-cache }}
      tags: ${{ inputs.tags }}

@@ -37,8 +28,6 @@ jobs:
    secrets: inherit
    with:
      trigger: ${{ contains(inputs.project, 'explorer-e2e') || contains(inputs.project, 'explorer') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
      skip-cache: ${{ inputs.skip-cache }}
      tags: ${{ inputs.tags }}
      night-run: ${{ inputs.night-run }}
@@ -60,8 +49,6 @@ jobs:
    secrets: inherit
    with:
      trigger: ${{ contains(inputs.project, 'token-e2e') || contains(inputs.project, 'token') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
      skip-cache: ${{ inputs.skip-cache }}
      tags: ${{ inputs.tags }}

@@ -70,7 +57,5 @@ jobs:
    secrets: inherit
    with:
      trigger: ${{ contains(inputs.project, 'trading-e2e') || contains(inputs.project, 'trading') }}
-      vega-version: ${{ inputs.vega-version }}
-      gobin: ${{ inputs.gobin }}
      skip-cache: ${{ inputs.skip-cache }}
      tags: ${{ inputs.tags }}
@@ -88,12 +88,12 @@ Run `nx test my-app` to execute the unit tests with [Jest](https://jestjs.io), o

 ### Using wallet

-To run tests locally using your own wallets you can add the following environment variables to `cypress.json`
+To run tests locally using your own wallets make sure you have generated at least two public keys and update the following environment variables in `cypress.config.js` to match your wallet.

-1. Change `TRADING_TEST_VEGA_WALLET_NAME` to your Vega wallet name
-2. Add `TRADING_TEST_VEGA_WALLET_PASSPHRASE` as your wallet passphrase
-3. Add `ETH_WALLET_MNEMONIC` as your Ethereum wallet mnemonic
-4. Use [vegawallet-dummy](https://github.com/vegaprotocol/vegawallet-dummy) to avoid being prompted in CLI during test execution.
+1. Set `VEGA_PUBLIC_KEY` and `TRUNCATED_VEGA_PUBLIC_KEY` to your first public key.
+2. Set `VEGA_PUBLIC_KEY2` and `TRUNCATED_VEGA_PUBLIC_KEY2` to your second public key.
+3. Set `TRADING_TEST_VEGA_WALLET_PASSPHRASE` as your wallet passphrase
+4. Add `ETH_WALLET_MNEMONIC` as your Ethereum wallet mnemonic

 ### Formatting

@@ -7,3 +7,4 @@ NX_ETHERSCAN_URL=https://sepolia.etherscan.io
 NX_VEGA_EXPLORER_URL=https://stagnet3.explorer.vega.xyz
 NX_VEGA_WALLET_URL=http://localhost:1789
 CYPRESS_VEGA_ENV=STAGNET3
+CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -4,7 +4,7 @@ module.exports = defineConfig({

  e2e: {
    setupNodeEvents(on, config) {
-      require('cypress-grep/src/plugin')(config);
+      require('@cypress/grep/src/plugin')(config);
      return config;
    },
    baseUrl: 'http://localhost:4200',
@@ -23,7 +23,6 @@ module.exports = defineConfig({
    viewportHeight: 900,
  },
  env: {
-    TRADING_TEST_VEGA_WALLET_NAME: 'UI_Trading_Test',
    ETHEREUM_PROVIDER_URL:
      'https://sepolia.infura.io/v3/4f846e79e13f44d1b51bbd7ed9edefb8',
    VEGA_PUBLIC_KEY:
@@ -0,0 +1,20 @@
+/// <reference types="cypress" />
+
+declare namespace Cypress {
+  // specify additional properties in the TestConfig object
+  // in our case we will add "tags" property
+  interface SuiteConfigOverrides {
+    /**
+     * List of tags for this test
+     * @example a single tag
+     *  it('logs in', { tags: '@smoke' }, () => { ... })
+     * @example multiple tags
+     *  it('works', { tags: ['@smoke', '@slow'] }, () => { ... })
+     */
+    tags?: string | string[];
+  }
+
+  interface Cypress {
+    grep?: (grep?: string, tags?: string, burn?: string) => void;
+  }
+}
@@ -1,4 +1,3 @@
-import { connectVegaWallet } from '../support/vega-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generateMarket,
@@ -8,11 +7,7 @@ import {
  generateSimpleMarkets,
 } from '../support/mocks/generate-markets';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
-import { generateMarketPositions } from '../support/mocks/generate-market-positions';
 import { generateEstimateOrder } from '../support/mocks/generate-estimate-order';
-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';
@@ -31,11 +26,7 @@ describe('market selector', { tags: '@smoke' }, () => {
      aliasQuery(req, 'MarketData', generateMarketData());
      aliasQuery(req, 'Market', generateMarket());
      aliasQuery(req, 'MarketTags', generateMarketTags());
-      aliasQuery(req, 'MarketPositions', generateMarketPositions());
      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
-      aliasQuery(req, 'PartyBalance', generatePartyBalance());
-      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
-      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
      aliasQuery(req, 'MarketNames', generateMarketNames());
      aliasQuery(req, 'MarketDepth', generateMarketDepth());
    });
@@ -52,7 +43,7 @@ describe('market selector', { tags: '@smoke' }, () => {
  it('should be properly rendered', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('input[placeholder="Search"]').should(
        'have.value',
        markets[0].tradableInstrument.instrument.name
@@ -76,7 +67,7 @@ describe('market selector', { tags: '@smoke' }, () => {
  it('typing should change list', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('input[placeholder="Search"]').type('{backspace}');
      cy.getByTestId('market-pane')
        .children()
@@ -112,7 +103,7 @@ describe('market selector', { tags: '@smoke' }, () => {
  it.skip('keyboard navigation should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('input[placeholder="Search"]').type('{backspace}');
      cy.get('input[placeholder="Search"]').clear();
      cy.focused().realPress('ArrowDown');
@@ -134,7 +125,7 @@ describe('market selector', { tags: '@smoke' }, () => {
    if (markets?.length) {
      cy.viewport('iphone-xr');
      cy.visit(`/trading/${markets[0].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('[role="dialog"]').should('not.exist');
      cy.getByTestId('arrow-button').click();
      cy.get('[role="dialog"]').should('be.visible');
@@ -1,4 +1,3 @@
-import { connectVegaWallet } from '../support/vega-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generateSimpleMarkets,
@@ -8,15 +7,14 @@ import {
  generateMarketData,
 } from '../support/mocks/generate-markets';
 import { generateMarketTags } from '../support/mocks/generate-market-tags';
-import { generateMarketPositions } from '../support/mocks/generate-market-positions';
 import { generateEstimateOrder } from '../support/mocks/generate-estimate-order';
-import { generatePartyBalance } from '../support/mocks/generate-party-balance';
-import { generatePartyMarketData } from '../support/mocks/generate-party-market-data';
-import { generateMarketMarkPrice } from '../support/mocks/generate-market-mark-price';
 import { generateMarketDepth } from '../support/mocks/generate-market-depth';
 import type { MarketsQuery, Market } from '@vegaprotocol/market-list';
 import { generateChainId } from '../support/mocks/generate-chain-id';
 import { generateStatistics } from '../support/mocks/generate-statistics';
+import { generateAccounts } from '../support/mocks/generate-accounts';
+import { generateAssets } from '../support/mocks/generate-assets';
+import { generatePositions } from '../support/mocks/generate-positions';

 describe('Market trade', { tags: '@smoke' }, () => {
  let markets: Market[];
@@ -29,14 +27,13 @@ describe('Market trade', { tags: '@smoke' }, () => {
      aliasQuery(req, 'MarketsData', generateMarketsData());
      aliasQuery(req, 'SimpleMarkets', generateSimpleMarkets());
      aliasQuery(req, 'MarketTags', generateMarketTags());
-      aliasQuery(req, 'MarketPositions', generateMarketPositions());
      aliasQuery(req, 'EstimateOrder', generateEstimateOrder());
-      aliasQuery(req, 'PartyBalance', generatePartyBalance());
-      aliasQuery(req, 'PartyMarketData', generatePartyMarketData());
-      aliasQuery(req, 'MarketMarkPrice', generateMarketMarkPrice());
+      aliasQuery(req, 'Accounts', generateAccounts());
+      aliasQuery(req, 'Assets', generateAssets());
      aliasQuery(req, 'MarketDepth', generateMarketDepth());
      aliasQuery(req, 'Market', generateMarket());
      aliasQuery(req, 'MarketData', generateMarketData());
+      aliasQuery(req, 'Positions', generatePositions());
    });
    cy.visit('/markets');
    cy.wait('@Markets').then((response) => {
@@ -63,7 +60,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('side selector should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').should(
        'have.text',
        'Long'
@@ -82,7 +79,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
    if (markets?.length) {
      cy.viewport('iphone-xr');
      cy.visit(`/trading/${markets[0].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.getByTestId('next-button').scrollIntoView().click();

      cy.get('button[aria-label="Open long position"]').should(
@@ -113,8 +110,26 @@ describe('Market trade', { tags: '@smoke' }, () => {

  it('size slider should work well', () => {
    if (markets?.length) {
+      const marketId = markets[1].id;
+      cy.mockGQL((req) => {
+        aliasQuery(
+          req,
+          'Market',
+          generateMarket({
+            market: {
+              id: marketId,
+              tradableInstrument: {
+                instrument: {
+                  product: { settlementAsset: { id: 'asset-id-2' } },
+                },
+              },
+            },
+          })
+        );
+      });
+      cy.visit(`/trading/${marketId}`);
      cy.visit(`/trading/${markets[1].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -135,8 +150,25 @@ describe('Market trade', { tags: '@smoke' }, () => {

  it('percentage selection should work well', () => {
    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      connectVegaWallet();
+      const marketId = markets[1].id;
+      cy.mockGQL((req) => {
+        aliasQuery(
+          req,
+          'Market',
+          generateMarket({
+            market: {
+              id: marketId,
+              tradableInstrument: {
+                instrument: {
+                  product: { settlementAsset: { id: 'asset-id-2' } },
+                },
+              },
+            },
+          })
+        );
+      });
+      cy.visit(`/trading/${marketId}`);
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -146,7 +178,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
        .find('button')
        .should('have.text', '1');

-      cy.getByTestId('max-label').should('have.text', '21');
+      cy.getByTestId('max-label').should('have.text', '11');

      cy.getByTestId('percentage-selector')
        .find('button')
@@ -156,14 +188,14 @@ describe('Market trade', { tags: '@smoke' }, () => {
        .find('dd')
        .eq(0)
        .find('button')
-        .should('have.text', '21');
+        .should('have.text', '11');
    }
  });

  it('size input should work well', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -190,8 +222,25 @@ describe('Market trade', { tags: '@smoke' }, () => {

  it('slippage value should be displayed', () => {
    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      connectVegaWallet();
+      const marketId = markets[1].id;
+      cy.mockGQL((req) => {
+        aliasQuery(
+          req,
+          'Market',
+          generateMarket({
+            market: {
+              id: marketId,
+              tradableInstrument: {
+                instrument: {
+                  product: { settlementAsset: { id: 'asset-id-2' } },
+                },
+              },
+            },
+          })
+        );
+      });
+      cy.visit(`/trading/${marketId}`);
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -206,8 +255,25 @@ describe('Market trade', { tags: '@smoke' }, () => {

  it('allow slippage value to be adjusted', () => {
    if (markets?.length) {
-      cy.visit(`/trading/${markets[1].id}`);
-      connectVegaWallet();
+      const marketId = markets[1].id;
+      cy.mockGQL((req) => {
+        aliasQuery(
+          req,
+          'Market',
+          generateMarket({
+            market: {
+              id: marketId,
+              tradableInstrument: {
+                instrument: {
+                  product: { settlementAsset: { id: 'asset-id-2' } },
+                },
+              },
+            },
+          })
+        );
+      });
+      cy.visit(`/trading/${marketId}`);
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -235,7 +301,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('notional position size should be present', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -262,7 +328,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('total fees should be displayed', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[1].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('#step-1-control [aria-label^="Selected value"]').click();
      cy.get('button[aria-label="Open short position"]').click();
      cy.get('#step-2-control').click();
@@ -280,7 +346,7 @@ describe('Market trade', { tags: '@smoke' }, () => {
  it('order review should display proper calculations', () => {
    if (markets?.length) {
      cy.visit(`/trading/${markets[0].id}`);
-      connectVegaWallet();
+      cy.connectVegaWallet();
      cy.get('#step-3-control').click();

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

      // Start from the bottom tooltip to ensure the tooltip above
@@ -1,4 +1,3 @@
-import { connectVegaWallet } from '../support/vega-wallet';
 import { aliasQuery } from '@vegaprotocol/cypress';
 import {
  generatePositions,
@@ -22,7 +21,7 @@ describe('Portfolio page - wallet', { tags: '@smoke' }, () => {
    cy.visit('/');
    cy.get('[href="/portfolio"]').eq(0).click();
    cy.getByTestId('trading-connect-wallet').should('be.visible');
-    connectVegaWallet();
+    cy.connectVegaWallet();
    cy.getByTestId('trading-connect-wallet').should('not.exist');
  });
 });
@@ -43,7 +42,7 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {

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

    cy.getByTestId('assets').click();
    cy.location('pathname').should('eq', '/portfolio/assets');
@@ -74,7 +73,7 @@ describe('Portfolio page tabs', { tags: '@smoke' }, () => {
        aliasQuery(req, 'Assets', generateAssets());
      });
      cy.visit('/portfolio/assets');
-      connectVegaWallet();
+      cy.connectVegaWallet();
    });

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

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

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

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

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

    it('"No data to display" should be always displayed', () => {
@@ -17,7 +17,7 @@ import '@vegaprotocol/cypress';
 import 'cypress-real-events/support';
 // Import commands.js using ES2015 syntax:
 import './commands';
-import registerCypressGrep from 'cypress-grep';
+import registerCypressGrep from '@cypress/grep';
 import { aliasQuery } from '@vegaprotocol/cypress';
 registerCypressGrep();

@@ -1,5 +1,5 @@
 import type { Market } from '@vegaprotocol/market-list';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { SingleMarketFieldsFragment } from '@vegaprotocol/market-list';

 export const protoCandles = [
@@ -1,6 +1,6 @@
 import merge from 'lodash/merge';
 import type { AccountsQuery } from '@vegaprotocol/accounts';
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types';
 import type { PartialDeep } from 'type-fest';

 export const generateAccounts = (
@@ -74,6 +74,21 @@ export const generateAccounts = (
              },
            },
          },
+          {
+            __typename: 'AccountEdge',
+            node: {
+              type: Types.AccountType.ACCOUNT_TYPE_MARGIN,
+              asset: {
+                __typename: 'Asset',
+                id: 'asset-id-2',
+              },
+              balance: '265329',
+              market: {
+                id: '57fbaa322e97cfc8bb5f1de048c37e033c41b1ac1906d3aed9960912a067ef5a',
+                __typename: 'Market',
+              },
+            },
+          },
          {
            __typename: 'AccountEdge',
            node: {
@@ -1,6 +1,6 @@
 import merge from 'lodash/merge';
 import type { AssetsQuery } from '@vegaprotocol/assets';
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types';
 import type { PartialDeep } from 'type-fest';

 export const generateAssets = (override?: PartialDeep<AssetsQuery>) => {
@@ -1,5 +1,5 @@
 import type { FillsQuery, FillFieldsFragment } from '@vegaprotocol/fills';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';

@@ -1,7 +1,7 @@
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 // eslint-disable-next-line @nrwl/nx/enforce-module-boundaries
-import type { MarketDepthQuery } from '../../../../../libs/market-depth/src/lib/__generated___/MarketDepth';
+import type { MarketDepthQuery } from '../../../../../libs/market-depth/src/lib/__generated__/MarketDepth';

 export const generateMarketDepth = (
  override?: PartialDeep<MarketDepthQuery>
@@ -110,91 +110,91 @@ export const generateMarketDepth = (
        ],
        buy: [
          {
-            price: '9893005',
+            price: '9891005',
            volume: '4',
            numberOfOrders: '3',
            __typename: 'PriceLevel',
          },
          {
-            price: '9893003',
+            price: '9890003',
            volume: '2',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9893001',
+            price: '9889001',
            volume: '1',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9892006',
+            price: '9888006',
            volume: '3',
            numberOfOrders: '2',
            __typename: 'PriceLevel',
          },
          {
-            price: '9891006',
+            price: '9887006',
            volume: '2',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9891001',
+            price: '9886001',
            volume: '1',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890101',
+            price: '9885101',
            volume: '2',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890091',
+            price: '9884091',
            volume: '5',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890081',
+            price: '9883081',
            volume: '4',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890050',
+            price: '9882050',
            volume: '2',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890040',
+            price: '9881040',
            volume: '6',
            numberOfOrders: '3',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890030',
+            price: '9880030',
            volume: '6',
            numberOfOrders: '2',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890021',
+            price: '9879021',
            volume: '3',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890011',
+            price: '9878011',
            volume: '1',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
          },
          {
-            price: '9890001',
+            price: '9877001',
            volume: '11',
            numberOfOrders: '1',
            __typename: 'PriceLevel',
@@ -1,9 +0,0 @@
-export const generateMarketMarkPrice = () => {
-  return {
-    market: {
-      decimalPlaces: 5,
-      data: { markPrice: '692748', __typename: 'MarketData' },
-      __typename: 'Market',
-    },
-  };
-};
@@ -1,72 +0,0 @@
-import type { MarketPositionsQuery } from '@vegaprotocol/deal-ticket';
-import { Schema } from '@vegaprotocol/types';
-
-export const generateMarketPositions = (): MarketPositionsQuery => {
-  return {
-    party: {
-      id: '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                decimals: 5,
-              },
-              balance: '400000000000000000000',
-              market: {
-                id: '2751c508f9759761f912890f37fb3f97a00300bf7685c02a56a86e05facfe221',
-                __typename: 'Market',
-              },
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              type: Schema.AccountType.ACCOUNT_TYPE_MARGIN,
-              asset: {
-                decimals: 5,
-              },
-              balance: '265329',
-              market: {
-                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-                __typename: 'Market',
-              },
-            },
-          },
-        ],
-      },
-      positionsConnection: {
-        edges: [
-          {
-            node: {
-              openVolume: '3',
-              market: {
-                id: '2751c508f9759761f912890f37fb3f97a00300bf7685c02a56a86e05facfe221',
-                __typename: 'Market',
-              },
-              __typename: 'Position',
-            },
-            __typename: 'PositionEdge',
-          },
-          {
-            node: {
-              openVolume: '12',
-              market: {
-                id: 'ca7768f6de84bf86a21bbb6b0109d9659c81917b0e0339b2c262566c9b581a15',
-                __typename: 'Market',
-              },
-              __typename: 'Position',
-            },
-            __typename: 'PositionEdge',
-          },
-        ],
-        __typename: 'PositionConnection',
-      },
-      __typename: 'Party',
-    },
-  };
-};
@@ -1,5 +1,5 @@
 import merge from 'lodash/merge';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type {
  MarketsQuery,
  Market,
@@ -1392,12 +1392,15 @@ export const generatePositionsMarkets = () => {
  };
 };

-export const generateMarket = (): MarketQuery => {
-  return {
+export const generateMarket = (
+  override?: PartialDeep<MarketQuery>
+): MarketQuery => {
+  const defaultResult = {
    market: {
      ...singleMarket,
    },
  };
+  return merge(defaultResult, override);
 };

 export const generateMarketData = (): MarketDataQuery => {
@@ -1413,6 +1416,7 @@ export const generateMarketData = (): MarketDataQuery => {
              },
              marketTradingMode:
                Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+              marketState: Schema.MarketState.STATE_ACTIVE,
              staticMidPrice: '0',
              indicativePrice: '0',
              bestStaticBidPrice: '0',
@@ -1,7 +1,7 @@
 import merge from 'lodash/merge';
 import type { PartialDeep } from 'type-fest';
 import type { OrdersQuery, OrderFieldsFragment } from '@vegaprotocol/orders';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';

 export const generateOrders = (
  override?: PartialDeep<OrdersQuery>
@@ -1,81 +0,0 @@
-import merge from 'lodash/merge';
-import type { PartyBalanceQuery } from '@vegaprotocol/deal-ticket';
-import type { PartialDeep } from 'type-fest';
-import { Schema as Types } from '@vegaprotocol/types';
-
-export const generatePartyBalance = (
-  override?: PartialDeep<PartyBalanceQuery>
-): PartyBalanceQuery => {
-  const defaultResult: PartyBalanceQuery = {
-    party: {
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '88474051',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '100000000',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: '8b52d4a3a4b0ffe733cddbc2b67be273816cfeb6ca4c8b339bac03ffba08e4e4',
-                symbol: 'tEURO',
-                name: 'tEURO TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '3412867',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              balance: '70007',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              asset: {
-                id: 'dai-id',
-                symbol: 'tDAI',
-                name: 'tDAI TEST',
-                decimals: 5,
-                __typename: 'Asset',
-              },
-              __typename: 'AccountBalance',
-            },
-          },
-        ],
-      },
-      __typename: 'Party',
-    },
-  };
-
-  return merge(defaultResult, override);
-};
@@ -1,40 +0,0 @@
-import type { PartyMarketDataQuery } from '@vegaprotocol/deal-ticket';
-import { Schema as Types } from '@vegaprotocol/types';
-
-export const generatePartyMarketData = (): PartyMarketDataQuery => {
-  return {
-    party: {
-      id: '2e1ef32e5804e14232406aebaad719087d326afa5c648b7824d0823d8a46c8d1',
-      accountsConnection: {
-        __typename: 'AccountsConnection',
-        edges: [
-          {
-            __typename: 'AccountEdge',
-            node: {
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '1200000',
-              asset: { id: 'fBTC', decimals: 5, __typename: 'Asset' },
-              market: null,
-              __typename: 'AccountBalance',
-            },
-          },
-          {
-            __typename: 'AccountEdge',
-            node: {
-              __typename: 'AccountBalance',
-              type: Types.AccountType.ACCOUNT_TYPE_GENERAL,
-              balance: '0.000000001',
-              asset: {
-                __typename: 'Asset',
-                id: '5cfa87844724df6069b94e4c8a6f03af21907d7bc251593d08e4251043ee9f7c',
-                decimals: 0,
-              },
-            },
-          },
-        ],
-      },
-      marginsConnection: { edges: null, __typename: 'MarginConnection' },
-      __typename: 'Party',
-    },
-  };
-};
@@ -41,7 +41,7 @@ export const generatePositions = (
      averageEntryPrice: '84400088',
      updatedAt: '2022-07-28T14:53:54.725477Z',
      market: {
-        id: '5a4b0b9e9c0629f0315ec56fcb7bd444b0c6e4da5ec7677719d502626658a376',
+        id: '57fbaa322e97cfc8bb5f1de048c37e033c41b1ac1906d3aed9960912a067ef5a',
        __typename: 'Market',
      },
      __typename: 'Position',
@@ -1,12 +0,0 @@
-export const connectVegaWallet = () => {
-  const form = 'rest-connector-form';
-  const walletName = Cypress.env('TRADING_TEST_VEGA_WALLET_NAME');
-  const walletPassphrase = Cypress.env('TRADING_TEST_VEGA_WALLET_PASSPHRASE');
-  cy.getByTestId('connect-vega-wallet').click();
-  cy.getByTestId('connectors-list')
-    .find('[data-testid="connector-gui"]')
-    .click();
-  cy.getByTestId(form).find('#wallet').click().type(walletName);
-  cy.getByTestId(form).find('#passphrase').click().type(walletPassphrase);
-  cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
-};
@@ -7,7 +7,7 @@
    "allowSyntheticDefaultImports": true,
    "outDir": "../../dist/out-tsc",
    "allowJs": true,
-    "types": ["cypress", "node", "cypress-real-events", "cypress-grep"]
+    "types": ["cypress", "node", "cypress-real-events", "@cypress/grep"]
  },
-  "include": ["src/**/*.ts", "src/**/*.js", "./declaration.d.ts"]
+  "include": ["src/**/*.ts", "src/**/*.js", "./declaration.d.ts", "index.d.ts"]
 }
@@ -1,18 +0,0 @@
-query PartyBalanceQuery($partyId: ID!) {
-  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          type
-          balance
-          asset {
-            id
-            symbol
-            name
-            decimals
-          }
-        }
-      }
-    }
-  }
-}
@@ -1,51 +1,54 @@
-/* tslint:disable */
-/* eslint-disable */
-// @generated
-// This file was automatically generated and should not be edited.
+import * as Types from '@vegaprotocol/types';

-// ====================================================
-// GraphQL query operation: MarketTags
-// ====================================================
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type MarketTagsQueryVariables = Types.Exact<{
+  marketId: Types.Scalars['ID'];
+}>;

-export interface MarketTags_market_tradableInstrument_instrument_metadata {
-  __typename: "InstrumentMetadata";
-  /**
-   * An arbitrary list of tags to associated to associate to the Instrument (string list)
-   */
-  tags: string[] | null;
+
+export type MarketTagsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null } } } } | null };
+
+
+export const MarketTagsDocument = gql`
+    query MarketTags($marketId: ID!) {
+  market(id: $marketId) {
+    tradableInstrument {
+      instrument {
+        metadata {
+          tags
+        }
+      }
+    }
+  }
 }
+    `;

-export interface MarketTags_market_tradableInstrument_instrument {
-  __typename: "Instrument";
-  /**
-   * Metadata for this instrument
-   */
-  metadata: MarketTags_market_tradableInstrument_instrument_metadata;
-}
-
-export interface MarketTags_market_tradableInstrument {
-  __typename: "TradableInstrument";
-  /**
-   * An instance of, or reference to, a fully specified instrument.
-   */
-  instrument: MarketTags_market_tradableInstrument_instrument;
-}
-
-export interface MarketTags_market {
-  __typename: "Market";
-  /**
-   * 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
-   */
-  market: MarketTags_market | null;
-}
-
-export interface MarketTagsVariables {
-  marketId: string;
-}
+/**
+ * __useMarketTagsQuery__
+ *
+ * To run a query within a React component, call `useMarketTagsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useMarketTagsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useMarketTagsQuery({
+ *   variables: {
+ *      marketId: // value for 'marketId'
+ *   },
+ * });
+ */
+export function useMarketTagsQuery(baseOptions: Apollo.QueryHookOptions<MarketTagsQuery, MarketTagsQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<MarketTagsQuery, MarketTagsQueryVariables>(MarketTagsDocument, options);
+      }
+export function useMarketTagsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarketTagsQuery, MarketTagsQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<MarketTagsQuery, MarketTagsQueryVariables>(MarketTagsDocument, options);
+        }
+export type MarketTagsQueryHookResult = ReturnType<typeof useMarketTagsQuery>;
+export type MarketTagsLazyQueryHookResult = ReturnType<typeof useMarketTagsLazyQuery>;
+export type MarketTagsQueryResult = Apollo.QueryResult<MarketTagsQuery, MarketTagsQueryVariables>;
@@ -1,54 +0,0 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type MarketTagsQueryVariables = Types.Exact<{
-  marketId: Types.Scalars['ID'];
-}>;
-
-
-export type MarketTagsQuery = { __typename?: 'Query', market?: { __typename?: 'Market', tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null } } } } | null };
-
-
-export const MarketTagsDocument = gql`
-    query MarketTags($marketId: ID!) {
-  market(id: $marketId) {
-    tradableInstrument {
-      instrument {
-        metadata {
-          tags
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useMarketTagsQuery__
- *
- * To run a query within a React component, call `useMarketTagsQuery` and pass it any options that fit your needs.
- * When your component renders, `useMarketTagsQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = useMarketTagsQuery({
- *   variables: {
- *      marketId: // value for 'marketId'
- *   },
- * });
- */
-export function useMarketTagsQuery(baseOptions: Apollo.QueryHookOptions<MarketTagsQuery, MarketTagsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<MarketTagsQuery, MarketTagsQueryVariables>(MarketTagsDocument, options);
-      }
-export function useMarketTagsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<MarketTagsQuery, MarketTagsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<MarketTagsQuery, MarketTagsQueryVariables>(MarketTagsDocument, options);
-        }
-export type MarketTagsQueryHookResult = ReturnType<typeof useMarketTagsQuery>;
-export type MarketTagsLazyQueryHookResult = ReturnType<typeof useMarketTagsLazyQuery>;
-export type MarketTagsQueryResult = Apollo.QueryResult<MarketTagsQuery, MarketTagsQueryVariables>;
@@ -1,61 +0,0 @@
-import { Schema as Types } from '@vegaprotocol/types';
-
-import { gql } from '@apollo/client';
-import * as Apollo from '@apollo/client';
-const defaultOptions = {} as const;
-export type PartyBalanceQueryQueryVariables = Types.Exact<{
-  partyId: Types.Scalars['ID'];
-}>;
-
-
-export type PartyBalanceQueryQuery = { __typename?: 'Query', party?: { __typename?: 'Party', accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number } } } | null> | null } | null } | null };
-
-
-export const PartyBalanceQueryDocument = gql`
-    query PartyBalanceQuery($partyId: ID!) {
-  party(id: $partyId) {
-    accountsConnection {
-      edges {
-        node {
-          type
-          balance
-          asset {
-            id
-            symbol
-            name
-            decimals
-          }
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __usePartyBalanceQueryQuery__
- *
- * To run a query within a React component, call `usePartyBalanceQueryQuery` and pass it any options that fit your needs.
- * When your component renders, `usePartyBalanceQueryQuery` returns an object from Apollo Client that contains loading, error, and data properties
- * you can use to render your UI.
- *
- * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
- *
- * @example
- * const { data, loading, error } = usePartyBalanceQueryQuery({
- *   variables: {
- *      partyId: // value for 'partyId'
- *   },
- * });
- */
-export function usePartyBalanceQueryQuery(baseOptions: Apollo.QueryHookOptions<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>(PartyBalanceQueryDocument, options);
-      }
-export function usePartyBalanceQueryLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>(PartyBalanceQueryDocument, options);
-        }
-export type PartyBalanceQueryQueryHookResult = ReturnType<typeof usePartyBalanceQueryQuery>;
-export type PartyBalanceQueryLazyQueryHookResult = ReturnType<typeof usePartyBalanceQueryLazyQuery>;
-export type PartyBalanceQueryQueryResult = Apollo.QueryResult<PartyBalanceQueryQuery, PartyBalanceQueryQueryVariables>;
@@ -1,9 +1,13 @@
 import React from 'react';
 import { render } from '@testing-library/react';
-import type { AccountFragment } from '@vegaprotocol/deal-ticket';
-import { DealTicketBalance } from './deal-ticket-balance';
-import { Schema } from '@vegaprotocol/types';
+import { MockedProvider } from '@apollo/client/testing';
 import type { MarketDealTicketAsset } from '@vegaprotocol/market-list';
+import { DealTicketBalance } from './deal-ticket-balance';
+
+jest.mock('@vegaprotocol/wallet', () => ({
+  ...jest.requireActual('@vegaprotocol/wallet'),
+  useVegaWallet: jest.fn().mockReturnValue('wallet-pub-key'),
+}));

 const tDAI: MarketDealTicketAsset = {
  __typename: 'Asset',
@@ -13,23 +17,20 @@ const tDAI: MarketDealTicketAsset = {
  decimals: 2,
 };

-const accounts: AccountFragment[] = [
-  {
-    __typename: 'AccountBalance',
-    type: Schema.AccountType.ACCOUNT_TYPE_GENERAL,
-    balance: '1000000',
-    asset: tDAI,
-  },
-];
+let mockAccountBalance: {
+  accountBalance: string;
+  accountDecimals: number | null;
+} = { accountBalance: '1000000', accountDecimals: 2 };
+jest.mock('@vegaprotocol/accounts', () => ({
+  ...jest.requireActual('@vegaprotocol/accounts'),
+  useAccountBalance: jest.fn(() => mockAccountBalance),
+}));

 describe('DealTicketBalance', function () {
  it('should render the balance', () => {
    const { getByText, getByRole } = render(
-      <DealTicketBalance
-        settlementAsset={tDAI}
-        accounts={accounts}
-        isWalletConnected
-      />
+      <DealTicketBalance settlementAsset={tDAI} isWalletConnected />,
+      { wrapper: MockedProvider }
    );

    expect(getByRole('complementary')).toHaveAccessibleName('tDAI Balance');
@@ -39,11 +40,8 @@ describe('DealTicketBalance', function () {

  it('should prompt to connect wallet', () => {
    const { getByText } = render(
-      <DealTicketBalance
-        settlementAsset={tDAI}
-        accounts={accounts}
-        isWalletConnected={false}
-      />
+      <DealTicketBalance settlementAsset={tDAI} isWalletConnected={false} />,
+      { wrapper: MockedProvider }
    );

    expect(
@@ -52,12 +50,10 @@ describe('DealTicketBalance', function () {
  });

  it('should display zero balance', () => {
+    mockAccountBalance = { accountBalance: '', accountDecimals: null };
    const { getByText } = render(
-      <DealTicketBalance
-        settlementAsset={tDAI}
-        accounts={[]}
-        isWalletConnected={true}
-      />
+      <DealTicketBalance settlementAsset={tDAI} isWalletConnected={true} />,
+      { wrapper: MockedProvider }
    );

    expect(getByText('No tDAI left to trade')).toBeInTheDocument();
@@ -1,41 +1,38 @@
 import classNames from 'classnames';
-import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
-import { Schema } from '@vegaprotocol/types';
-import type { AccountFragment } from '@vegaprotocol/deal-ticket';
+import {
+  addDecimalsFormatNumber,
+  t,
+  toBigNum,
+} from '@vegaprotocol/react-helpers';
 import type { MarketDealTicket } from '@vegaprotocol/market-list';
-import { useSettlementAccount } from '@vegaprotocol/deal-ticket';
+import { useAccountBalance } from '@vegaprotocol/accounts';

 interface DealTicketBalanceProps {
  settlementAsset: MarketDealTicket['tradableInstrument']['instrument']['product']['settlementAsset'];
-  accounts: AccountFragment[];
  isWalletConnected: boolean;
  className?: string;
 }

 export const DealTicketBalance = ({
  settlementAsset,
-  accounts,
  isWalletConnected,
  className = '',
 }: DealTicketBalanceProps) => {
  const settlementAssetId = settlementAsset?.id;
  const settlementAssetSymbol = settlementAsset?.symbol;
-  const settlementAccount = useSettlementAccount(
-    settlementAssetId,
-    accounts,
-    Schema.AccountType.ACCOUNT_TYPE_GENERAL
-  );
+
+  const { accountBalance, accountDecimals } =
+    useAccountBalance(settlementAssetId) || {};
+  const settlementBalance = toBigNum(accountBalance || 0, accountDecimals || 0);
+
  const formattedNumber =
-    settlementAccount?.balance &&
-    settlementAccount.asset.decimals &&
-    addDecimalsFormatNumber(
-      settlementAccount.balance,
-      settlementAccount.asset.decimals
-    );
+    accountBalance &&
+    accountDecimals &&
+    addDecimalsFormatNumber(accountBalance, accountDecimals);

  const balance = (
    <p className="text-blue text-lg font-semibold">
-      {settlementAccount
+      {!settlementBalance.isZero()
        ? t(`${formattedNumber}`)
        : `No ${settlementAssetSymbol} left to trade`}
    </p>
@@ -1,9 +1,5 @@
 import { useParams } from 'react-router-dom';
-import compact from 'lodash/compact';
-import {
-  DealTicketManager,
-  usePartyBalanceQuery,
-} from '@vegaprotocol/deal-ticket';
+import { DealTicketManager } from '@vegaprotocol/deal-ticket';
 import { Loader, Splash } from '@vegaprotocol/ui-toolkit';
 import { t, useDataProvider } from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
@@ -26,11 +22,6 @@ export const DealTicketContainer = () => {
  const { marketId } = useParams<{ marketId: string }>();
  const { pubKey } = useVegaWallet();

-  const { data: partyData } = usePartyBalanceQuery({
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-
  const variables = useMemo(
    () => ({
      marketId: marketId || '',
@@ -46,10 +37,6 @@ export const DealTicketContainer = () => {
    skip: !marketId,
  });

-  const accounts = compact(partyData?.party?.accountsConnection?.edges).map(
-    (e) => e.node
-  );
-
  const loader = <Loader />;
  if (marketId && data) {
    const balance = (
@@ -58,7 +45,6 @@ export const DealTicketContainer = () => {
        settlementAsset={
          data.tradableInstrument.instrument.product?.settlementAsset
        }
-        accounts={accounts || []}
        isWalletConnected={!!pubKey}
      />
    );
@@ -1,13 +1,11 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 import { useForm, Controller } from 'react-hook-form';
-import compact from 'lodash/compact';
 import { Stepper } from '../stepper';
 import {
  getDefaultOrder,
  useOrderCloseOut,
  useOrderMargin,
-  usePartyBalanceQuery,
  useMaximumPositionSize,
  useCalculateSlippage,
  validateAmount,
@@ -37,7 +35,7 @@ import { DealTicketSize } from './deal-ticket-size';
 import MarketNameRenderer from '../simple-market-list/simple-market-renderer';
 import SideSelector, { SIDE_NAMES } from './side-selector';
 import ReviewTrade from './review-trade';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import { DealTicketSlippage } from './deal-ticket-slippage';
 import { useOrderValidation } from './use-order-validation';
 import type { MarketDealTicket } from '@vegaprotocol/market-list';
@@ -77,17 +75,7 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
  });
  const { submit, transaction, finalizedOrder, Dialog } = useOrderSubmit();

-  const { data: partyBalance } = usePartyBalanceQuery({
-    variables: { partyId: pubKey || '' },
-    skip: !pubKey,
-  });
-
-  const accounts = compact(partyBalance?.party?.accountsConnection?.edges).map(
-    (e) => e.node
-  );
  const maxTrade = useMaximumPositionSize({
-    partyId: pubKey || '',
-    accounts: accounts,
    marketId: market.id,
    settlementAssetId:
      market.tradableInstrument.instrument.product.settlementAsset.id,
@@ -98,7 +86,6 @@ export const DealTicketSteps = ({ market }: DealTicketMarketProps) => {
  const estCloseOut = useOrderCloseOut({
    order,
    market,
-    partyData: partyBalance,
  });
  const slippage = useCalculateSlippage({ marketId: market.id, order });
  const [slippageValue, setSlippageValue] = useState(
@@ -8,28 +8,10 @@ import classNames from 'classnames';
 import { DealTicketEstimates } from '@vegaprotocol/deal-ticket';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { SIDE_NAMES } from './side-selector';
-import { gql, useQuery } from '@apollo/client';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import { MarketExpires } from '@vegaprotocol/market-info';
 import type { MarketDealTicket } from '@vegaprotocol/market-list';
-import type {
-  MarketTags,
-  MarketTagsVariables,
-} from './__generated__/MarketTags';
-
-export const MARKET_TAGS_QUERY = gql`
-  query MarketTags($marketId: ID!) {
-    market(id: $marketId) {
-      tradableInstrument {
-        instrument {
-          metadata {
-            tags
-          }
-        }
-      }
-    }
-  }
-`;
+import { useMarketTagsQuery } from './__generated__/MarketTags';

 interface Props {
  market: MarketDealTicket;
@@ -57,12 +39,9 @@ export default ({
  notionalSize,
  slippage,
 }: Props) => {
-  const { data: tagsData } = useQuery<MarketTags, MarketTagsVariables>(
-    MARKET_TAGS_QUERY,
-    {
-      variables: { marketId: market.id },
-    }
-  );
+  const { data: tagsData } = useMarketTagsQuery({
+    variables: { marketId: market.id },
+  });

  return (
    <div className="mb-8 text-black dark:text-white" data-testid="review-trade">
@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { FormGroup } from '@vegaprotocol/ui-toolkit';
 import { t } from '@vegaprotocol/react-helpers';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';

 interface SideSelectorProps {
  value: Schema.Side;
@@ -3,11 +3,7 @@ import { renderHook } from '@testing-library/react';
 import { useVegaWallet } from '@vegaprotocol/wallet';
 import { MockedProvider } from '@apollo/client/testing';
 import type { VegaWalletContextShape } from '@vegaprotocol/wallet';
-import {
-  MarketStateMapping,
-  Schema as Types,
-  Schema,
-} from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { ValidationProps } from './use-order-validation';
 import { marketTranslations, useOrderValidation } from './use-order-validation';
 import type { MarketDealTicket } from '@vegaprotocol/market-list';
@@ -78,9 +74,10 @@ const market: MarketDealTicket = {
    bestBidPrice: '1605489971',
    bestOfferPrice: '1606823730',
    markPrice: '1606823730',
-    trigger: Types.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
+    trigger: Schema.AuctionTrigger.AUCTION_TRIGGER_UNSPECIFIED,
    staticMidPrice: '1606156850',
    marketTradingMode: Schema.MarketTradingMode.TRADING_MODE_CONTINUOUS,
+    marketState: Schema.MarketState.STATE_ACTIVE,
    indicativeVolume: '0',
    indicativePrice: '0',
    bestStaticBidPrice: '1605489971',
@@ -91,7 +88,11 @@ const market: MarketDealTicket = {
    auctionEnd: null,
    market: { __typename: 'Market', id: 'market-id' },
  },
-  marketTimestamps: {},
+  marketTimestamps: {
+    __typename: 'MarketTimestamps',
+    close: null,
+    open: null,
+  },
 };

 const defaultWalletContext = {
@@ -193,7 +194,11 @@ describe('useOrderValidation', () => {
  `(
    'Returns an error message for market state when not accepting orders',
    ({ state }) => {
-      const { result } = setup({ market: { ...defaultOrder.market, state } });
+      const market = {
+        ...defaultOrder.market,
+        data: { ...defaultOrder.market.data, marketState: state },
+      };
+      const { result } = setup({ market });
      expect(result.current).toStrictEqual({
        isDisabled: true,
        message: `This market is ${marketTranslations(
@@ -215,14 +220,19 @@ describe('useOrderValidation', () => {
        balance: '0',
        margin: '100',
        balanceError: false,
-        // asset,
      });
-      const { result } = setup({
-        market: {
-          ...defaultOrder.market,
-          state,
-          tradingMode: Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
+
+      const market = {
+        ...defaultOrder.market,
+        data: {
+          ...defaultOrder.market.data,
+          marketState: state,
+          marketTradingMode:
+            Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
        },
+      };
+      const { result } = setup({
+        market,
        order: {
          ...order,
          type: Schema.OrderType.TYPE_LIMIT,
@@ -231,7 +241,7 @@ describe('useOrderValidation', () => {
      });
      expect(result.current).toStrictEqual({
        isDisabled: false,
-        message: `This market is ${MarketStateMapping[
+        message: `This market is ${Schema.MarketStateMapping[
          state as Schema.MarketState
        ].toLowerCase()} and only accepting liquidity commitment orders`,
        section: 'sec-summary',
@@ -247,8 +257,12 @@ describe('useOrderValidation', () => {
  `(
    `Returns an error message when trying to submit a non-limit order for a "$tradingMode" market`,
    ({ tradingMode, errorMessage }) => {
+      const market = {
+        ...defaultOrder.market,
+        data: { ...defaultOrder.market.data, marketTradingMode: tradingMode },
+      };
      const { result } = setup({
-        market: { ...defaultOrder.market, tradingMode },
+        market,
        order: {
          ...order,
          type: Schema.OrderType.TYPE_MARKET,
@@ -273,8 +287,12 @@ describe('useOrderValidation', () => {
  `(
    `Returns an error message when submitting a limit order with a "$orderTimeInForce" value to a "$tradingMode" market`,
    ({ tradingMode, orderTimeInForce, errorMessage }) => {
+      const market = {
+        ...defaultOrder.market,
+        data: { ...defaultOrder.market.data, marketTradingMode: tradingMode },
+      };
      const { result } = setup({
-        market: { ...defaultOrder.market, tradingMode },
+        market,
        order: {
          ...order,
          type: Schema.OrderType.TYPE_LIMIT,
@@ -377,14 +395,15 @@ describe('useOrderValidation', () => {
  `(
    'Returns error when market state is pending and size is wrong',
    ({ state }) => {
+      const market = {
+        ...defaultOrder.market,
+        data: { ...defaultOrder.market.data, marketState: state },
+      };
      const { result } = setup({
        fieldErrors: {
          size: { type: `validate`, message: DealTicket.ERROR_SIZE_DECIMAL },
        },
-        market: {
-          ...market,
-          state,
-        },
+        market,
      });
      expect(result.current).toStrictEqual({
        isDisabled: true,
@@ -3,7 +3,7 @@ import type { FieldErrors } from 'react-hook-form';
 import { useMemo } from 'react';
 import { t, toDecimal } from '@vegaprotocol/react-helpers';
 import { useVegaWallet } from '@vegaprotocol/wallet';
-import { MarketStateMapping, Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { OrderSubmissionBody } from '@vegaprotocol/wallet';
 import { Tooltip } from '@vegaprotocol/ui-toolkit';
 import {
@@ -39,7 +39,7 @@ export const marketTranslations = (marketState: Schema.MarketState) => {
    case Schema.MarketState.STATE_TRADING_TERMINATED:
      return t('terminated');
    default:
-      return t(MarketStateMapping[marketState]).toLowerCase();
+      return t(Schema.MarketStateMapping[marketState]).toLowerCase();
  }
 };

@@ -169,13 +169,13 @@ export const useOrderValidation = ({
        Schema.MarketState.STATE_TRADING_TERMINATED,
        Schema.MarketState.STATE_CANCELLED,
        Schema.MarketState.STATE_CLOSED,
-      ].includes(market.state)
+      ].includes(market.data.marketState)
    ) {
      return {
        isDisabled: true,
        message: t(
          `This market is ${marketTranslations(
-            market.state
+            market.data.marketState
          )} and not accepting orders`
        ),
        section: DEAL_TICKET_SECTION.SUMMARY,
@@ -186,7 +186,7 @@ export const useOrderValidation = ({
      [
        Schema.MarketState.STATE_PROPOSED,
        Schema.MarketState.STATE_PENDING,
-      ].includes(market.state)
+      ].includes(market.data.marketState)
    ) {
      if (fieldErrorChecking) {
        return fieldErrorChecking;
@@ -195,7 +195,7 @@ export const useOrderValidation = ({
        isDisabled: false,
        message: t(
          `This market is ${marketTranslations(
-            market.state
+            market.data.marketState
          )} and only accepting liquidity commitment orders`
        ),
        section: DEAL_TICKET_SECTION.SUMMARY,
@@ -205,9 +205,9 @@ export const useOrderValidation = ({
    if (isMarketInAuction(market)) {
      if (order.type === Schema.OrderType.TYPE_MARKET) {
        if (
-          market.tradingMode ===
+          market.data.marketTradingMode ===
            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger ===
+          market.data.trigger ===
            Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
        ) {
          return {
@@ -230,9 +230,9 @@ export const useOrderValidation = ({
          };
        }
        if (
-          market.tradingMode ===
+          market.data.marketTradingMode ===
            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger === Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE
+          market.data.trigger === Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE
        ) {
          return {
            isDisabled: true,
@@ -270,9 +270,9 @@ export const useOrderValidation = ({
        ].includes(order.timeInForce)
      ) {
        if (
-          market.tradingMode ===
+          market.data.marketTradingMode ===
            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger ===
+          market.data.trigger ===
            Schema.AuctionTrigger.AUCTION_TRIGGER_LIQUIDITY
        ) {
          return {
@@ -297,9 +297,9 @@ export const useOrderValidation = ({
          };
        }
        if (
-          market.tradingMode ===
+          market.data.marketTradingMode ===
            Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION &&
-          market.data?.trigger === Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE
+          market.data.trigger === Schema.AuctionTrigger.AUCTION_TRIGGER_PRICE
        ) {
          return {
            isDisabled: true,
@@ -355,7 +355,7 @@ export const useOrderValidation = ({
        Schema.MarketTradingMode.TRADING_MODE_BATCH_AUCTION,
        Schema.MarketTradingMode.TRADING_MODE_MONITORING_AUCTION,
        Schema.MarketTradingMode.TRADING_MODE_OPENING_AUCTION,
-      ].includes(market.tradingMode)
+      ].includes(market.data.marketTradingMode)
    ) {
      return {
        isDisabled: false,
@@ -12,7 +12,7 @@ import {
  t,
 } from '@vegaprotocol/react-helpers';
 import BigNumber from 'bignumber.js';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';

 interface Props {
  partyId: string;
@@ -14,20 +14,14 @@ import {
 import type { OrderFieldsFragment, Order } from '@vegaprotocol/orders';
 import type { OrderCancellationBody } from '@vegaprotocol/wallet';
 import { isOrderActive } from '@vegaprotocol/orders';
-import {
-  OrderRejectionReasonMapping,
-  OrderStatusMapping,
-  OrderTypeMapping,
-  Schema,
-  OrderTimeInForceMapping,
-} from '@vegaprotocol/types';
+import * as Schema 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;
+type StatusKey = keyof typeof Schema.OrderStatusMapping;
+type RejectReasonKey = keyof typeof Schema.OrderRejectionReasonMapping;
+type OrderTimeKey = keyof typeof Schema.OrderTimeInForceMapping;
 interface Props {
  setEditOrder: (order: Order) => void;
  orderCancel: {
@@ -81,7 +75,7 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
          value,
        }: ValueFormatterParams & {
          value?: OrderFieldsFragment['type'];
-        }) => OrderTypeMapping[value as Schema.OrderType],
+        }) => Schema.OrderTypeMapping[value as Schema.OrderType],
      },
      {
        colId: 'status',
@@ -95,14 +89,14 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
        }) => {
          if (value && data && data.market) {
            if (value === Schema.OrderStatus.STATUS_REJECTED) {
-              return `${OrderStatusMapping[value as StatusKey]}: ${
+              return `${Schema.OrderStatusMapping[value as StatusKey]}: ${
                data.rejectionReason &&
-                OrderRejectionReasonMapping[
+                Schema.OrderRejectionReasonMapping[
                  data.rejectionReason as RejectReasonKey
                ]
              }`;
            }
-            return OrderStatusMapping[value as StatusKey] as string;
+            return Schema.OrderStatusMapping[value as StatusKey] as string;
          }
          return '-';
        },
@@ -176,11 +170,11 @@ const useColumnDefinitions = ({ setEditOrder, orderCancel }: Props) => {
                new Date(data.expiresAt)
              );
              return `${
-                OrderTimeInForceMapping[value as OrderTimeKey]
+                Schema.OrderTimeInForceMapping[value as OrderTimeKey]
              }: ${expiry}`;
            }

-            return OrderTimeInForceMapping[value as OrderTimeKey];
+            return Schema.OrderTimeInForceMapping[value as OrderTimeKey];
          }
          return '-';
        },
@@ -16,7 +16,7 @@ import type {
  GroupCellRendererParams,
  ColDef,
 } from 'ag-grid-community';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { VegaValueFormatterParams } from '@vegaprotocol/ui-toolkit';
 import { Intent, ProgressBarCell } from '@vegaprotocol/ui-toolkit';

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

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -1,6 +1,6 @@
 import { t } from '@vegaprotocol/react-helpers';
 import { themelite as theme } from '@vegaprotocol/tailwindcss-config';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import colors from 'tailwindcss/colors';
 import type { Market } from '@vegaprotocol/market-list';
 import { IS_MARKET_TRADABLE } from '../../constants';
@@ -9,7 +9,7 @@ import {
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/client/testing';
 import { BrowserRouter } from 'react-router-dom';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { Market } from '@vegaprotocol/market-list';
 import SimpleMarketList from './simple-market-list';

@@ -13,7 +13,7 @@ import SimpleMarketToolbar from './simple-market-toolbar';
 import { IS_MARKET_TRADABLE } from '../../constants';
 import { ConsoleLiteGrid } from '../console-lite-grid';
 import type { Market } from '@vegaprotocol/market-list';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import { marketsWithCandlesProvider } from '@vegaprotocol/market-list';

 export type MarketWithPercentChange = Market & {
@@ -4,7 +4,7 @@ import { InView } from 'react-intersection-observer';
 import { useDataProvider, useYesterday } from '@vegaprotocol/react-helpers';
 import type { Candle } from '@vegaprotocol/market-list';
 import { marketCandlesProvider } from '@vegaprotocol/market-list';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';

 interface Props {
  candles: (Candle | null)[] | null;
@@ -1,6 +1,6 @@
 import React from 'react';
 import { render, screen } from '@testing-library/react';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import MarketNameRenderer from './simple-market-renderer';
 import type { Market } from '@vegaprotocol/market-list';

@@ -14,7 +14,7 @@ import {
  getAllByText,
 } from '@testing-library/react';
 import { MockedProvider } from '@apollo/react-testing';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { Market } from '@vegaprotocol/market-list';
 import SimpleMarketToolbar from './simple-market-toolbar';
 import { markets as filterData } from './mocks/market-filters.json';
@@ -13,7 +13,7 @@ import {
  DropdownMenuItemIndicator,
  Icon,
 } from '@vegaprotocol/ui-toolkit';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { Market } from '@vegaprotocol/market-list';
 import { HorizontalMenu } from '../horizontal-menu';
 import type { HorizontalMenuItem } from '../horizontal-menu';
@@ -1,5 +1,5 @@
 import { useMemo } from 'react';
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import type { MarketWithCandles } from '@vegaprotocol/market-list';
 import type { RouterParams } from './simple-market-list';

@@ -1,4 +1,4 @@
-import { Schema } from '@vegaprotocol/types';
+import * as Schema from '@vegaprotocol/types';
 import { t } from '@vegaprotocol/react-helpers';
 import type { Market } from '@vegaprotocol/market-list';

@@ -16,3 +16,5 @@ NX_EXPLORER_TXS_LIST=0
 NX_EXPLORER_NETWORK_PARAMETERS=1
 NX_EXPLORER_PARTIES=1
 NX_EXPLORER_VALIDATORS=1
+
+CYPRESS_VEGA_WALLET_API_TOKEN=
@@ -5,7 +5,7 @@ module.exports = defineConfig({

  e2e: {
    setupNodeEvents(on, config) {
-      require('cypress-grep/src/plugin')(config);
+      require('@cypress/grep/src/plugin')(config);
      return config;
    },
    baseUrl: 'http://localhost:3000',
@@ -47,34 +47,37 @@ context('Asset page', { tags: '@regression' }, function () {
              .then((assetsListedInJson) => {
                const assetInfo = this.assetsInfo[assetName];

-                assert.equal(assetsListedInJson.name, assetInfo.name);
-                assert.equal(assetsListedInJson.id, assetInfo.id);
-                assert.equal(assetsListedInJson.decimals, assetInfo.decimals);
-                assert.equal(assetsListedInJson.symbol, assetInfo.symbol);
+                assert.equal(assetsListedInJson.name, assetInfo.node.name);
+                assert.equal(assetsListedInJson.id, assetInfo.node.id);
+                assert.equal(
+                  assetsListedInJson.decimals,
+                  assetInfo.node.decimals
+                );
+                assert.equal(assetsListedInJson.symbol, assetInfo.node.symbol);
                assert.equal(
                  assetsListedInJson.source.__typename,
-                  assetInfo.source.__typename
+                  assetInfo.node.source.__typename
                );

-                if (assetInfo.source.__typename == 'ERC20') {
+                if (assetInfo.node.source.__typename == 'ERC20') {
                  assert.equal(
                    assetsListedInJson.source.contractAddress,
-                    assetInfo.source.contractAddress
+                    assetInfo.node.source.contractAddress
                  );
                }

-                if (assetInfo.source.__typename == 'BuiltinAsset') {
+                if (assetInfo.node.source.__typename == 'BuiltinAsset') {
                  assert.equal(
                    assetsListedInJson.source.maxFaucetAmountMint,
-                    assetInfo.source.maxFaucetAmountMint
+                    assetInfo.node.source.maxFaucetAmountMint
                  );
                }

                let knownAssetTypes = ['BuiltinAsset', 'ERC20'];
                assert.include(
                  knownAssetTypes,
-                  assetInfo.source.__typename,
-                  `Checking that current asset type of ${assetInfo.source.__typename} /
+                  assetInfo.node.source.__typename,
+                  `Checking that current asset type of ${assetInfo.node.source.__typename} /
                  is one of: ${knownAssetTypes}: /
                  If fail then we need to add extra tests for un-encountered asset types`
                );
@@ -50,7 +50,7 @@ context('Home Page', function () {
        .invoke('text')
        .should('match', /\d+d \d+h \d+m \d+s/i);
      cy.get(statsValue).eq(3).should('have.text', '2');
-      cy.get(statsValue).eq(4).should('have.text', '0');
+      cy.get(statsValue).eq(4).should('have.text', '2');
      cy.get(statsValue)
        .eq(5)
        .invoke('text')
@@ -14,7 +14,9 @@ let assetData = {

 const assetsInTest = Object.keys(assetData);

-context('Parties page', { tags: '@regression' }, function () {
+// skipped due to existing issue
+// https://github.com/vegaprotocol/frontend-monorepo/issues/2243
+context.skip('Parties page', { tags: '@regression' }, function () {
  before('send-faucet assets to connected vega wallet', function () {
    assetsInTest.forEach((asset) => {
      cy.vega_wallet_receive_fauceted_asset(
@@ -279,9 +279,9 @@ context('Validator page', { tags: '@smoke' }, function () {

    Cypress.Commands.add('get_nodes', () => {
      const mutation =
-        '{nodes { id name infoUrl avatarUrl pubkey tmPubkey ethereumAddress \
+        '{nodesConnection { edges { node { id name infoUrl avatarUrl pubkey tmPubkey ethereumAddress \
          location stakedByOperator stakedByDelegates stakedTotal pendingStake \
-          epochData { total offline online __typename } status name __typename}}';
+          epochData { total offline online __typename } status name __typename}}}}';
      cy.request({
        method: 'POST',
        url: `http://localhost:3028/query`,
@@ -290,7 +290,7 @@ context('Validator page', { tags: '@smoke' }, function () {
        },
        headers: { 'content-type': 'application/json' },
      })
-        .its(`body.data.nodes`)
+        .its(`body.data.nodesConnection.edges`)
        .then(function (response) {
          let nodes = [];
          response.forEach((node) => {
@@ -15,5 +15,5 @@

 import '@vegaprotocol/cypress';
 import './common.functions.js';
-import registerCypressGrep from 'cypress-grep';
+import registerCypressGrep from '@cypress/grep';
 registerCypressGrep();
@@ -4,7 +4,7 @@
    "jsx": "react-jsx",
    "sourceMap": false,
    "outDir": "../../dist/out-tsc",
-    "types": ["cypress", "node", "cypress-grep"],
+    "types": ["cypress", "node", "@cypress/grep"],
    "allowJs": true,
    "esModuleInterop": true,
    "allowSyntheticDefaultImports": true,
@@ -1,13 +1,13 @@
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
-NX_TENDERMINT_URL=https://n01.stagnet3.vega.xyz/tm
-NX_TENDERMINT_WEBSOCKET_URL=wss://n01.stagnet3.vega.xyz/tm/websocket
+NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
+NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
 NX_HOSTED_WALLET_URL=https://wallet.testnet.vega.xyz
 NX_ETHERSCAN_URL=https://sepolia.etherscan.io
-NX_BLOCK_EXPLORER=
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
+NX_ETHERSCAN_URL=https://sepolia.etherscan.io

 # App flags
 NX_EXPLORER_ASSETS=1
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26617
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26617/websocket
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://n04.d.vega.xyz/tm
 NX_TENDERMINT_WEBSOCKET_URL=wss://n04.d.vega.xyz/tm/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/devnet-network.json
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://be.explorer.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.explorer.vega.xyz
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/mainnet-network.json
@@ -1,10 +1,7 @@
-# App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.n00.stagnet3.vega.xyz
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.n00.stagnet3.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://static.vega.xyz/assets/stagnet3-network.json
 NX_VEGA_NETWORKS={\"MAINNET"\:\"https://explorer.vega.xyz"\,\"TESTNET\":\"https://explorer.fairground.wtf\"}
 NX_VEGA_ENV=STAGNET3
 NX_GITHUB_FEEDBACK_URL=https://github.com/vegaprotocol/feedback/discussions
-NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
-NX_ETHERSCAN_URL=https://be.stagnet3.vega.xyz/rest
+NX_BLOCK_EXPLORER=https://be.stagnet3.vega.xyz/rest
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=https://tm.be.testnet.vega.xyz
 NX_BLOCK_EXPLORER=https://be.testnet.vega.xyz/rest
 NX_TENDERMINT_WEBSOCKET_URL=wss://tm.be.testnet.vega.xyz/
@@ -1,5 +1,4 @@
 # App configuration variables
-NX_CHAIN_EXPLORER_URL=https://explorer.vega.trading/.netlify/functions/chain-explorer-api
 NX_TENDERMINT_URL=http://localhost:26607/
 NX_TENDERMINT_WEBSOCKET_URL=wss://localhost:26607/websocket
 NX_VEGA_ENV=CUSTOM
@@ -45,21 +45,20 @@ yarn nx run explorer:serve --env={env} # e.g. stagnet3

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

-| **Flag**                         | **Purpose**                                                     |
-| -------------------------------- | --------------------------------------------------------------- | --- |
-| `NX_CHAIN_EXPLORER_URL`          | The URL of the chain explorer service for decoding transactions |
-| `NX_TENDERMINT_URL`              | The Tendermint REST URL for the Vega consesus engine            |
-| `NX_TENDERMINT_WEBSOCKET_URL`    | The Tendermint Websocket URL for the Vega consensus engine      |
-| `NX_VEGA_ENV`                    | The name of the currently connected vega environment            |     |
-| `NX_EXPLORER_ASSETS`             | Enable the assets page for the explorer                         |
-| `NX_EXPLORER_GENESIS`            | Enable the genesis page for the explorer                        |
-| `NX_EXPLORER_GOVERNANCE`         | Enable the governance page for the explorer                     |
-| `NX_EXPLORER_MARKETS`            | Enable the markets page for the explorer                        |
-| `NX_EXPLORER_ORACLES`            | Enable the oracles page for the explorer                        |
-| `NX_EXPLORER_TXS_LIST`           | Enable the transactions list page for the explorer              |
-| `NX_EXPLORER_NETWORK_PARAMETERS` | Enable the network parameters page for the explorer             |
-| `NX_EXPLORER_PARTIES`            | Enable the parties page for the explorer                        |
-| `NX_EXPLORER_VALIDATORS`         | Enable the validators page for the explorer                     |
+| **Flag**                         | **Purpose**                                                |
+| -------------------------------- | ---------------------------------------------------------- | --- |
+| `NX_TENDERMINT_URL`              | The Tendermint REST URL for the Vega consesus engine       |
+| `NX_TENDERMINT_WEBSOCKET_URL`    | The Tendermint Websocket URL for the Vega consensus engine |
+| `NX_VEGA_ENV`                    | The name of the currently connected vega environment       |     |
+| `NX_EXPLORER_ASSETS`             | Enable the assets page for the explorer                    |
+| `NX_EXPLORER_GENESIS`            | Enable the genesis page for the explorer                   |
+| `NX_EXPLORER_GOVERNANCE`         | Enable the governance page for the explorer                |
+| `NX_EXPLORER_MARKETS`            | Enable the markets page for the explorer                   |
+| `NX_EXPLORER_ORACLES`            | Enable the oracles page for the explorer                   |
+| `NX_EXPLORER_TXS_LIST`           | Enable the transactions list page for the explorer         |
+| `NX_EXPLORER_NETWORK_PARAMETERS` | Enable the network parameters page for the explorer        |
+| `NX_EXPLORER_PARTIES`            | Enable the parties page for the explorer                   |
+| `NX_EXPLORER_VALIDATORS`         | Enable the validators page for the explorer                |

 ## Testing

@@ -1,4 +1,5 @@
 /* eslint-disable */
+process.env.TZ = 'UTC';
 export default {
  displayName: 'explorer',
  preset: '../../jest.preset.js',
@@ -0,0 +1,5 @@
+query ExplorerGovernanceAsset {
+  networkParameter(key: "reward.asset") {
+    value
+  }
+}
@@ -0,0 +1,45 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerGovernanceAssetQueryVariables = Types.Exact<{ [key: string]: never; }>;
+
+
+export type ExplorerGovernanceAssetQuery = { __typename?: 'Query', networkParameter?: { __typename?: 'NetworkParameter', value: string } | null };
+
+
+export const ExplorerGovernanceAssetDocument = gql`
+    query ExplorerGovernanceAsset {
+  networkParameter(key: "reward.asset") {
+    value
+  }
+}
+    `;
+
+/**
+ * __useExplorerGovernanceAssetQuery__
+ *
+ * To run a query within a React component, call `useExplorerGovernanceAssetQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerGovernanceAssetQuery` 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 } = useExplorerGovernanceAssetQuery({
+ *   variables: {
+ *   },
+ * });
+ */
+export function useExplorerGovernanceAssetQuery(baseOptions?: Apollo.QueryHookOptions<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>(ExplorerGovernanceAssetDocument, options);
+      }
+export function useExplorerGovernanceAssetLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>(ExplorerGovernanceAssetDocument, options);
+        }
+export type ExplorerGovernanceAssetQueryHookResult = ReturnType<typeof useExplorerGovernanceAssetQuery>;
+export type ExplorerGovernanceAssetLazyQueryHookResult = ReturnType<typeof useExplorerGovernanceAssetLazyQuery>;
+export type ExplorerGovernanceAssetQueryResult = Apollo.QueryResult<ExplorerGovernanceAssetQuery, ExplorerGovernanceAssetQueryVariables>;
@@ -0,0 +1,40 @@
+import { addDecimalsFormatNumber } from '@vegaprotocol/react-helpers';
+import { AssetLink } from '../links';
+import { useExplorerAssetQuery } from '../links/asset-link/__generated__/Asset';
+
+export type AssetBalanceProps = {
+  assetId: string;
+  price: string;
+  showAssetLink?: boolean;
+};
+
+/**
+ * Given a market ID and a price it will fetch the market
+ * and format the price in that market's decimal places.
+ */
+const AssetBalance = ({
+  assetId,
+  price,
+  showAssetLink = true,
+}: AssetBalanceProps) => {
+  const { data } = useExplorerAssetQuery({
+    fetchPolicy: 'cache-first',
+    variables: { id: assetId },
+  });
+
+  const label =
+    data && data.asset?.decimals
+      ? addDecimalsFormatNumber(price, data.asset.decimals)
+      : price;
+
+  return (
+    <div className="inline-block">
+      <span>{label}</span>{' '}
+      {showAssetLink && data?.asset?.id ? (
+        <AssetLink id={data.asset.id} />
+      ) : null}
+    </div>
+  );
+};
+
+export default AssetBalance;
@@ -0,0 +1,30 @@
+import { addDecimalsFormatNumber } from '@vegaprotocol/react-helpers';
+import { useExplorerGovernanceAssetQuery } from './__generated__/Governance-asset';
+import AssetBalance from './asset-balance';
+
+export type GovernanceAssetBalanceProps = {
+  price: string;
+};
+
+const DEFAULT_DECIMALS = 18;
+
+/**
+ * Effectively a wrapper around AssetBalance that does an extra query to fetch
+ * the governance asset first, which is set by a network parameter
+ */
+const GovernanceAssetBalance = ({ price }: GovernanceAssetBalanceProps) => {
+  const { data } = useExplorerGovernanceAssetQuery();
+
+  if (data && data.networkParameter?.value) {
+    const governanceAssetId = data.networkParameter.value;
+    return <AssetBalance price={price} assetId={governanceAssetId} />;
+  } else {
+    return (
+      <div className="inline-block">
+        <span>{addDecimalsFormatNumber(price, DEFAULT_DECIMALS)}</span>
+      </div>
+    );
+  }
+};
+
+export default GovernanceAssetBalance;
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import type { ReactNode } from 'react';
 import { Panel } from '../panel';
 import {
@@ -1,4 +1,4 @@
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -16,6 +16,7 @@ export type AssetLinkProps = Partial<ComponentProps<typeof Link>> & {
 */
 const AssetLink = ({ id, ...props }: AssetLinkProps) => {
  const { data } = useExplorerAssetQuery({
+    fetchPolicy: 'cache-first',
    variables: { id },
  });

@@ -21,7 +21,7 @@ export const EthExplorerLink = ({
  const link = `${DATA_SOURCES.ethExplorerUrl}/${type}/${id}`;
  return (
    <a
-      className="underline external"
+      className="underline external font-mono"
      target="_blank"
      rel="noopener noreferrer"
      {...props}
@@ -1,9 +1,15 @@
 query ExplorerMarket($id: ID!) {
  market(id: $id) {
    id
+    decimalPlaces
    tradableInstrument {
      instrument {
        name
+        product {
+          ... on Future {
+            quoteName
+          }
+        }
      }
    }
    state
@@ -1,4 +1,4 @@
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -8,16 +8,22 @@ export type ExplorerMarketQueryVariables = Types.Exact<{
 }>;


-export type ExplorerMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string } } } | null };
+export type ExplorerMarketQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, state: Types.MarketState, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string, product: { __typename?: 'Future', quoteName: string } } } } | null };


 export const ExplorerMarketDocument = gql`
    query ExplorerMarket($id: ID!) {
  market(id: $id) {
    id
+    decimalPlaces
    tradableInstrument {
      instrument {
        name
+        product {
+          ... on Future {
+            quoteName
+          }
+        }
      }
    }
    state
@@ -4,10 +4,11 @@ import type { MockedResponse } from '@apollo/client/testing';
 import { render } from '@testing-library/react';
 import MarketLink from './market-link';
 import { ExplorerMarketDocument } from './__generated__/Market';
+import { GraphQLError } from 'graphql';

-function renderComponent(id: string, mock: MockedResponse[]) {
+function renderComponent(id: string, mocks: MockedResponse[]) {
  return (
-    <MockedProvider mocks={mock}>
+    <MockedProvider mocks={mocks} addTypename={false}>
      <MemoryRouter>
        <MarketLink id={id} />
      </MemoryRouter>
@@ -21,6 +22,26 @@ describe('Market link component', () => {
    expect(res.getByText('123')).toBeInTheDocument();
  });

+  it('Renders the ID with an emoji on error', async () => {
+    const mock = {
+      request: {
+        query: ExplorerMarketDocument,
+        variables: {
+          id: '456',
+        },
+      },
+      result: {
+        errors: [new GraphQLError('No such market')],
+      },
+    };
+    const res = render(renderComponent('456', [mock]));
+    // The ID
+    expect(res.getByText('456')).toBeInTheDocument();
+
+    // The emoji
+    expect(await res.findByRole('img')).toBeInTheDocument();
+  });
+
  it('Renders the market name when the query returns a result', async () => {
    const mock = {
      request: {
@@ -33,10 +54,14 @@ describe('Market link component', () => {
        data: {
          market: {
            id: '123',
+            decimalPlaces: 5,
            state: 'irrelevant-test-data',
            tradableInstrument: {
              instrument: {
                name: 'test-label',
+                product: {
+                  quoteName: 'dai',
+                },
              },
            },
          },
@@ -4,6 +4,7 @@ import { useExplorerMarketQuery } from './__generated__/Market';
 import { Link } from 'react-router-dom';

 import type { ComponentProps } from 'react';
+import { t } from '@vegaprotocol/react-helpers';

 export type MarketLinkProps = Partial<ComponentProps<typeof Link>> & {
  id: string;
@@ -15,14 +16,25 @@ export type MarketLinkProps = Partial<ComponentProps<typeof Link>> & {
 * it will use the ID instead
 */
 const MarketLink = ({ id, ...props }: MarketLinkProps) => {
-  const { data } = useExplorerMarketQuery({
+  const { data, error, loading } = useExplorerMarketQuery({
    variables: { id },
  });

-  let label = id;
+  let label = <span>{id}</span>;

-  if (data?.market?.tradableInstrument.instrument.name) {
-    label = data.market.tradableInstrument.instrument.name;
+  if (!loading) {
+    if (data?.market?.tradableInstrument.instrument.name) {
+      label = <span>{data.market.tradableInstrument.instrument.name}</span>;
+    } else if (error) {
+      label = (
+        <div title={t('Unknown market')}>
+          <span role="img" aria-label="Unknown market" className="img">
+            ⚠️
+          </span>
+          &nbsp;{id}
+        </div>
+      );
+    }
  }

  return (
@@ -1,4 +1,4 @@
-import { Schema as Types } from '@vegaprotocol/types';
+import * as Types from '@vegaprotocol/types';

 import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
@@ -22,7 +22,7 @@ const NodeLink = ({ id, ...props }: NodeLinkProps) => {

  return (
    <Link className="underline" {...props} to={`/${Routes.VALIDATORS}#${id}`}>
-      {label}
+      <code>{label}</code>
    </Link>
  );
 };
@@ -10,7 +10,11 @@ export type PartyLinkProps = Partial<ComponentProps<typeof Link>> & {

 const PartyLink = ({ id, ...props }: PartyLinkProps) => {
  return (
-    <Link className="underline" {...props} to={`/${Routes.PARTIES}/${id}`}>
+    <Link
+      className="underline font-mono"
+      {...props}
+      to={`/${Routes.PARTIES}/${id}`}
+    >
      {id}
    </Link>
  );
@@ -0,0 +1,34 @@
+fragment ExplorerDeterministicOrderFields on Order {
+  id
+  type
+  reference
+  status
+  version
+  createdAt
+  updatedAt
+  expiresAt
+  timeInForce
+  price
+  side
+  remaining
+  size
+  rejectionReason
+  party {
+    id
+  }
+  market {
+    id
+    decimalPlaces
+    tradableInstrument {
+      instrument {
+        name
+      }
+    }
+  }
+}
+
+query ExplorerDeterministicOrder($orderId: ID!, $version: Int) {
+  orderByID(id: $orderId, version: $version) {
+    ...ExplorerDeterministicOrderFields
+  }
+}
@@ -0,0 +1,81 @@
+import * as Types from '@vegaprotocol/types';
+
+import { gql } from '@apollo/client';
+import * as Apollo from '@apollo/client';
+const defaultOptions = {} as const;
+export type ExplorerDeterministicOrderFieldsFragment = { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string } } } };
+
+export type ExplorerDeterministicOrderQueryVariables = Types.Exact<{
+  orderId: Types.Scalars['ID'];
+  version?: Types.InputMaybe<Types.Scalars['Int']>;
+}>;
+
+
+export type ExplorerDeterministicOrderQuery = { __typename?: 'Query', orderByID: { __typename?: 'Order', id: string, type?: Types.OrderType | null, reference: string, status: Types.OrderStatus, version: string, createdAt: any, updatedAt?: any | null, expiresAt?: any | null, timeInForce: Types.OrderTimeInForce, price: string, side: Types.Side, remaining: string, size: string, rejectionReason?: Types.OrderRejectionReason | null, party: { __typename?: 'Party', id: string }, market: { __typename?: 'Market', id: string, decimalPlaces: number, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', name: string } } } } };
+
+export const ExplorerDeterministicOrderFieldsFragmentDoc = gql`
+    fragment ExplorerDeterministicOrderFields on Order {
+  id
+  type
+  reference
+  status
+  version
+  createdAt
+  updatedAt
+  expiresAt
+  timeInForce
+  price
+  side
+  remaining
+  size
+  rejectionReason
+  party {
+    id
+  }
+  market {
+    id
+    decimalPlaces
+    tradableInstrument {
+      instrument {
+        name
+      }
+    }
+  }
+}
+    `;
+export const ExplorerDeterministicOrderDocument = gql`
+    query ExplorerDeterministicOrder($orderId: ID!, $version: Int) {
+  orderByID(id: $orderId, version: $version) {
+    ...ExplorerDeterministicOrderFields
+  }
+}
+    ${ExplorerDeterministicOrderFieldsFragmentDoc}`;
+
+/**
+ * __useExplorerDeterministicOrderQuery__
+ *
+ * To run a query within a React component, call `useExplorerDeterministicOrderQuery` and pass it any options that fit your needs.
+ * When your component renders, `useExplorerDeterministicOrderQuery` 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 } = useExplorerDeterministicOrderQuery({
+ *   variables: {
+ *      orderId: // value for 'orderId'
+ *      version: // value for 'version'
+ *   },
+ * });
+ */
+export function useExplorerDeterministicOrderQuery(baseOptions: Apollo.QueryHookOptions<ExplorerDeterministicOrderQuery, ExplorerDeterministicOrderQueryVariables>) {
+        const options = {...defaultOptions, ...baseOptions}
+        return Apollo.useQuery<ExplorerDeterministicOrderQuery, ExplorerDeterministicOrderQueryVariables>(ExplorerDeterministicOrderDocument, options);
+      }
+export function useExplorerDeterministicOrderLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<ExplorerDeterministicOrderQuery, ExplorerDeterministicOrderQueryVariables>) {
+          const options = {...defaultOptions, ...baseOptions}
+          return Apollo.useLazyQuery<ExplorerDeterministicOrderQuery, ExplorerDeterministicOrderQueryVariables>(ExplorerDeterministicOrderDocument, options);
+        }
+export type ExplorerDeterministicOrderQueryHookResult = ReturnType<typeof useExplorerDeterministicOrderQuery>;
+export type ExplorerDeterministicOrderLazyQueryHookResult = ReturnType<typeof useExplorerDeterministicOrderLazyQuery>;
+export type ExplorerDeterministicOrderQueryResult = Apollo.QueryResult<ExplorerDeterministicOrderQuery, ExplorerDeterministicOrderQueryVariables>;
@@ -0,0 +1,153 @@
+import type { components } from '../../../types/explorer';
+import type { MockedResponse } from '@apollo/client/testing';
+import { MockedProvider } from '@apollo/client/testing';
+import { MemoryRouter } from 'react-router-dom';
+import AmendOrderDetails from './amend-order-details';
+import { ExplorerDeterministicOrderDocument } from './__generated__/Order';
+import { render } from '@testing-library/react';
+import * as Schema from '@vegaprotocol/types';
+import { ExplorerMarketDocument } from '../links/market-link/__generated__/Market';
+
+type Amend = components['schemas']['v1OrderAmendment'];
+
+function renderAmendOrderDetails(
+  id: string,
+  version: number,
+  amend: Amend,
+  mocks: MockedResponse[]
+) {
+  return render(
+    <MockedProvider mocks={mocks} addTypename={false}>
+      <MemoryRouter>
+        <AmendOrderDetails version={version} id={id} amend={amend} />
+      </MemoryRouter>
+    </MockedProvider>
+  );
+}
+
+function renderExistingAmend(id: string, version: number, amend: Amend) {
+  const mocks = [
+    {
+      request: {
+        query: ExplorerDeterministicOrderDocument,
+        variables: {
+          orderId: '123',
+          version: 1,
+        },
+      },
+      result: {
+        data: {
+          orderByID: {
+            __typename: 'Order',
+            id: '123',
+            type: 'GTT',
+            status: Schema.OrderStatus.STATUS_ACTIVE,
+            version: version,
+            createdAt: '123',
+            updatedAt: '456',
+            expiresAt: '789',
+            timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
+            price: '200',
+            side: 'BUY',
+            remaining: '99',
+            rejectionReason: 'rejection',
+            reference: '123',
+            size: '100',
+            party: {
+              __typename: 'Party',
+              id: '234',
+            },
+            market: {
+              __typename: 'Market',
+              id: '789',
+              decimalPlaces: '5',
+              tradableInstrument: {
+                instrument: {
+                  name: 'test',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+    {
+      request: {
+        query: ExplorerMarketDocument,
+        variables: {
+          id: '789',
+        },
+      },
+      result: {
+        data: {
+          market: {
+            id: '789',
+            decimalPlaces: 5,
+            state: 'irrelevant-test-data',
+            tradableInstrument: {
+              instrument: {
+                name: 'test-label',
+                product: {
+                  quoteName: 'dai',
+                },
+              },
+            },
+          },
+        },
+      },
+    },
+  ];
+
+  return renderAmendOrderDetails(id, version, amend, mocks);
+}
+
+describe('Amend order details', () => {
+  it('Renders price if price changed', async () => {
+    const amend: Amend = {
+      sizeDelta: '123',
+    };
+
+    const res = renderExistingAmend('123', 1, amend);
+    expect(await res.findByText('New size')).toBeInTheDocument();
+  });
+
+  it('Renders Reference if provided', async () => {
+    const amend: Amend = {
+      peggedReference: 'PEGGED_REFERENCE_MID',
+    };
+
+    const res = renderExistingAmend('123', 1, amend);
+    expect(await res.findByText('New reference')).toBeInTheDocument();
+    expect(await res.findByText('Mid')).toBeInTheDocument();
+  });
+
+  it('Renders offset if provided: positive', async () => {
+    const amend: Amend = {
+      peggedOffset: '1',
+    };
+
+    const res = renderExistingAmend('123', 1, amend);
+    expect(await res.findByText('New offset')).toBeInTheDocument();
+    expect(await res.findByText('1')).toBeInTheDocument();
+  });
+
+  it('Renders positive price if provided', async () => {
+    const amend: Amend = {
+      price: '7879',
+    };
+
+    const res = renderExistingAmend('123', 1, amend);
+    expect(await res.findByText('New price')).toBeInTheDocument();
+    expect(await res.findByText('7879')).toBeInTheDocument();
+  });
+
+  it('Renders negative price if provided', async () => {
+    const amend: Amend = {
+      price: '-7879',
+    };
+
+    const res = renderExistingAmend('123', 1, amend);
+    expect(await res.findByText('New price')).toBeInTheDocument();
+    expect(await res.findByText('-7879')).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,139 @@
+import { t } from '@vegaprotocol/react-helpers';
+import { useExplorerDeterministicOrderQuery } from './__generated__/Order';
+import { MarketLink } from '../links';
+import PriceInMarket from '../price-in-market/price-in-market';
+import { Time } from '../time';
+
+import { sideText, peggedReference } from './lib/order-labels';
+import type { components } from '../../../types/explorer';
+import { VegaColours } from '@vegaprotocol/tailwindcss-config';
+import { wrapperClasses } from './deterministic-order-details';
+
+export interface AmendOrderDetailsProps {
+  id: string;
+  amend: components['schemas']['v1OrderAmendment'];
+  // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
+  version?: number;
+}
+
+export function getSideDeltaColour(delta: string): string {
+  if (delta.charAt(0) === '-') {
+    return VegaColours.pink.DEFAULT;
+  } else {
+    return VegaColours.green.DEFAULT;
+  }
+}
+
+/**
+ * This component renders the changes to an order made in an amend. It's very
+ * similar to the deterministic-order-details component, and should probably
+ * eventually be merged in to that view. However the APIs to make that experience
+ * work nicely are not available, so instead of making 1 complex component, it's
+ * currently 2 similar components.
+ *
+ * @param param0
+ * @returns
+ */
+const AmendOrderDetails = ({
+  id,
+  version = 0,
+  amend,
+}: AmendOrderDetailsProps) => {
+  const { data, error } = useExplorerDeterministicOrderQuery({
+    variables: { orderId: id, version },
+  });
+
+  if (error || (data && !data.orderByID)) {
+    return (
+      <div className={wrapperClasses}>
+        <div className="mb-12 lg:mb-0">
+          <div className="relative block rounded-lg px-3 py-6 md:px-6 lg:-mr-7">
+            <h2 className="text-3xl font-bold mb-4 display-5">
+              {t('Order not found')}
+            </h2>
+            <p className="text-gray-500 mb-12">
+              {t('No order created from this transaction')}
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (!data || !data.orderByID) {
+    return null;
+  }
+
+  const o = data.orderByID;
+
+  return (
+    <div className={wrapperClasses}>
+      <div className="mb-12 lg:mb-0">
+        <div className="relative block px-3 py-6 md:px-6 lg:-mr-7">
+          <h2 className="text-3xl font-bold mb-4 display-5">
+            {t('Edits to ')}
+            {sideText[o.side]}
+            {t(' order')}
+          </h2>
+          <p className="text-gray-500 mb-4">
+            In <MarketLink id={o.market.id} />, updated at{' '}
+            <Time date={o.updatedAt} />.
+          </p>
+
+          <div className="grid md:grid-cols-4 gap-x-6">
+            {amend.sizeDelta && amend.sizeDelta !== '0' ? (
+              <div className="mb-12 md:mb-0">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('New size')}
+                </h2>
+                <h5
+                  className={`text-lg font-medium text-gray-500 mb-0 capitalize ${getSideDeltaColour(
+                    amend.sizeDelta
+                  )}`}
+                >
+                  {amend.sizeDelta}
+                </h5>
+              </div>
+            ) : null}
+
+            {amend.price && amend.price !== '0' ? (
+              <div className="">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('New price')}
+                </h2>
+                <h5 className="text-lg font-medium text-gray-500 mb-0">
+                  <PriceInMarket price={amend.price} marketId={o.market.id} />
+                </h5>
+              </div>
+            ) : null}
+
+            {amend.peggedReference &&
+            amend.peggedReference !== 'PEGGED_REFERENCE_UNSPECIFIED' ? (
+              <div className="">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('New reference')}
+                </h2>
+                <h5 className="text-lg font-medium text-gray-500 mb-0">
+                  {peggedReference[amend.peggedReference]}
+                </h5>
+              </div>
+            ) : null}
+
+            {amend.peggedOffset ? (
+              <div className="">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('New offset')}
+                </h2>
+                <h5 className="text-lg font-medium text-gray-500 mb-0">
+                  {amend.peggedOffset}
+                </h5>
+              </div>
+            ) : null}
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default AmendOrderDetails;
@@ -0,0 +1,123 @@
+import { t } from '@vegaprotocol/react-helpers';
+import { useExplorerDeterministicOrderQuery } from './__generated__/Order';
+import { MarketLink } from '../links';
+import PriceInMarket from '../price-in-market/price-in-market';
+import { Time } from '../time';
+import { sideText, statusText, tifFull, tifShort } from './lib/order-labels';
+
+export interface DeterministicOrderDetailsProps {
+  id: string;
+  // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
+  version?: number;
+}
+
+export const wrapperClasses =
+  'grid lg:grid-cols-1 flex items-center max-w-xl border border-zinc-200 dark:border-zinc-800 rounded-md pv-2 ph-5 mb-5';
+
+/**
+ * This component renders the *current* details for an order
+ *
+ * An important part of this component is that unlike most of the rest of the Explorer,
+ * it is displaying 'live' data. With the current APIs it's impossible to get the state
+ * of the order at a specific point in time. While one day that might be possible, this
+ * order component is not built with that in mind.
+ *
+ * @param param0
+ * @returns
+ */
+const DeterministicOrderDetails = ({
+  id,
+  version = 0,
+}: DeterministicOrderDetailsProps) => {
+  const { data, error } = useExplorerDeterministicOrderQuery({
+    variables: { orderId: id, version },
+  });
+
+  if (error || (data && !data.orderByID)) {
+    return (
+      <div className={wrapperClasses}>
+        <div className="mb-12 lg:mb-0">
+          <div className="relative block rounded-lg px-3 py-6 md:px-6 lg:-mr-7">
+            <h2 className="text-3xl font-bold mb-4 display-5">
+              {t('Order not found')}
+            </h2>
+            <p className="text-gray-500 mb-12">
+              {t('No order created from this transaction')}
+            </p>
+          </div>
+        </div>
+      </div>
+    );
+  }
+
+  if (!data || !data.orderByID) {
+    return null;
+  }
+
+  const o = data.orderByID;
+  return (
+    <div className={wrapperClasses}>
+      <div className="mb-12 lg:mb-0">
+        <div className="relative block px-3 py-6 md:px-6 lg:-mr-7">
+          <h2 className="text-3xl font-bold mb-4 display-5">
+            <abbr title={tifFull[o.timeInForce]} className="bb-dotted mr-2">
+              {tifShort[o.timeInForce]}
+            </abbr>
+            {sideText[o.side]}
+            <span className="mx-5 text-base">@</span>
+            <PriceInMarket price={o.price} marketId={o.market.id} />
+          </h2>
+          <p className="text-gray-500 mb-4">
+            In <MarketLink id={o.market.id} /> at <Time date={o.createdAt} />.
+          </p>
+          {o.reference ? (
+            <p className="text-gray-500 mb-4">
+              <span>{t('Reference')}</span>: {o.reference}
+            </p>
+          ) : null}
+          <div className="grid md:grid-cols-4 gap-x-6">
+            {version !== 0 ? null : (
+              <div className="mb-12 md:mb-0">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('Status')}
+                </h2>
+                <h5 className="text-lg font-medium text-gray-500 mb-0 capitalize">
+                  {statusText[o.status]}
+                </h5>
+              </div>
+            )}
+
+            <div className="mb-12 md:mb-0">
+              <h2 className="text-2xl font-bold text-dark mb-4">{t('Size')}</h2>
+              <h5 className="text-lg font-medium text-gray-500 mb-0">
+                {o.size}
+              </h5>
+            </div>
+
+            {version !== 0 ? null : (
+              <div className="">
+                <h2 className="text-2xl font-bold text-dark mb-4">
+                  {t('Remaining')}
+                </h2>
+                <h5 className="text-lg font-medium text-gray-500 mb-0">
+                  {o.remaining}
+                </h5>
+              </div>
+            )}
+
+            <div className="">
+              <h2 className="text-2xl font-bold text-dark mb-4">
+                {t('Version')}
+              </h2>
+              <h5 className="text-lg font-medium text-gray-500 mb-0">
+                {o.version}
+              </h5>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+};
+
+export default DeterministicOrderDetails;
@@ -0,0 +1,49 @@
+import { t } from '@vegaprotocol/react-helpers';
+import type * as Schema from '@vegaprotocol/types';
+
+export interface DeterministicOrderDetailsProps {
+  id: string;
+  // Version to fetch, with 0 being 'latest' and 1 being 'first'. Defaults to 0
+  version?: number;
+}
+
+export const statusText: Record<Schema.OrderStatus, string> = {
+  STATUS_ACTIVE: t('Active'),
+  STATUS_CANCELLED: t('Cancelled'),
+  STATUS_EXPIRED: t('Expired'),
+  STATUS_FILLED: t('Filled'),
+  STATUS_PARKED: t('Parked'),
+  // Intentionally vague - table shows partial fills
+  STATUS_PARTIALLY_FILLED: t('Active'),
+  STATUS_REJECTED: t('Rejected'),
+  STATUS_STOPPED: t('Stopped'),
+};
+
+export const sideText: Record<Schema.Side, string> = {
+  SIDE_BUY: t('Buy'),
+  SIDE_SELL: t('Sell'),
+};
+
+export const tifShort: Record<Schema.OrderTimeInForce, string> = {
+  TIME_IN_FORCE_FOK: t('FOK'),
+  TIME_IN_FORCE_GFA: t('GFA'),
+  TIME_IN_FORCE_GFN: t('GFN'),
+  TIME_IN_FORCE_GTC: t('GTC'),
+  TIME_IN_FORCE_GTT: t('GTT'),
+  TIME_IN_FORCE_IOC: t('IOC'),
+};
+
+export const tifFull: Record<Schema.OrderTimeInForce, string> = {
+  TIME_IN_FORCE_FOK: t('Fill or Kill'),
+  TIME_IN_FORCE_GFA: t('Good for Auction'),
+  TIME_IN_FORCE_GFN: t('Good for Normal'),
+  TIME_IN_FORCE_GTC: t("Good 'til Cancel"),
+  TIME_IN_FORCE_GTT: t("Good 'til Time"),
+  TIME_IN_FORCE_IOC: t('Immediate or Cancel'),
+};
+
+export const peggedReference: Record<Schema.PeggedReference, string> = {
+  PEGGED_REFERENCE_BEST_ASK: 'Best Ask',
+  PEGGED_REFERENCE_BEST_BID: 'Best Bid',
+  PEGGED_REFERENCE_MID: 'Mid',
+};
@@ -0,0 +1,92 @@
+import { MemoryRouter } from 'react-router-dom';
+import { MockedProvider } from '@apollo/client/testing';
+import type { MockedResponse } from '@apollo/client/testing';
+import { render } from '@testing-library/react';
+import PriceInMarket from './price-in-market';
+import { ExplorerMarketDocument } from '../links/market-link/__generated__/Market';
+
+function renderComponent(
+  price: string,
+  marketId: string,
+  mocks: MockedResponse[]
+) {
+  return (
+    <MockedProvider mocks={mocks} addTypename={false}>
+      <MemoryRouter>
+        <PriceInMarket marketId={marketId} price={price} />
+      </MemoryRouter>
+    </MockedProvider>
+  );
+}
+
+describe('Price in Market component', () => {
+  it('Renders the raw price when there is no market data', () => {
+    const res = render(renderComponent('100', '123', []));
+    expect(res.getByText('100')).toBeInTheDocument();
+  });
+
+  it('Renders the formatted price when market data is fetched', async () => {
+    const mock = {
+      request: {
+        query: ExplorerMarketDocument,
+        variables: {
+          id: '123',
+        },
+      },
+      result: {
+        data: {
+          market: {
+            id: '123',
+            decimalPlaces: 2,
+            state: 'irrelevant-test-data',
+            tradableInstrument: {
+              instrument: {
+                name: 'test dai',
+                product: {
+                  __typename: 'Future',
+                  quoteName: 'dai',
+                },
+              },
+            },
+          },
+        },
+      },
+    };
+
+    const res = render(renderComponent('100', '123', [mock]));
+    expect(await res.findByText('1.00')).toBeInTheDocument();
+    expect(await res.findByText('dai')).toBeInTheDocument();
+  });
+
+  it('Leaves the market id when the market is not found', async () => {
+    const mock = {
+      request: {
+        query: ExplorerMarketDocument,
+        variables: {
+          id: '123',
+        },
+      },
+      error: new Error('No such market'),
+    };
+
+    const res = render(renderComponent('100', '123', [mock]));
+    expect(await res.findByText('100')).toBeInTheDocument();
+  });
+
+  it('Renders `Market` instead of a price for market orders: 0 price', () => {
+    const res = render(renderComponent('0', '123', []));
+    expect(res.getByText('Market')).toBeInTheDocument();
+  });
+
+  it('Renders `Market` instead of a price for market orders: undefined price', () => {
+    const res = render(
+      renderComponent(undefined as unknown as string, '123', [])
+    );
+    expect(res.getByText('Market')).toBeInTheDocument();
+  });
+
+  it('Renders `Market` instead of a price for market orders: empty price', () => {
+    const res = render(renderComponent('', '123', []));
+    expect(res.getByText('Market')).toBeInTheDocument();
+  });
+});
@@ -0,0 +1,47 @@
+import { addDecimalsFormatNumber, t } from '@vegaprotocol/react-helpers';
+import isUndefined from 'lodash/isUndefined';
+import { useExplorerMarketQuery } from '../links/market-link/__generated__/Market';
+import get from 'lodash/get';
+
+export type PriceInMarketProps = {
+  marketId: string;
+  price: string;
+};
+
+/**
+ * Given a market ID and a price it will fetch the market
+ * and format the price in that market's decimal places.
+ */
+const PriceInMarket = ({ marketId, price }: PriceInMarketProps) => {
+  const { data } = useExplorerMarketQuery({
+    variables: { id: marketId },
+  });
+
+  let label = price;
+
+  if (data && data.market?.decimalPlaces) {
+    label = addDecimalsFormatNumber(price, data.market.decimalPlaces);
+  }
+
+  const suffix = get(
+    data,
+    'market.tradableInstrument.instrument.product.quoteName',
+    ''
+  );
+
+  if (isUndefined(price) || price === '' || price === '0') {
+    return (
+      <span>
+        <abbr title={'Best available price'}>{t('Market')}</abbr> {suffix}
+      </span>
+    );
+  } else {
+    return (
+      <div className="inline-block">
+        <span>{label}</span> <span>{suffix}</span>
+      </div>
+    );
+  }
+};
+
+export default PriceInMarket;
--- a/Show More
+++ b/Show More