feat(ci): remove extra files

feat(ci): disable linting / building
feat(ci): disable hooks
2023-09-05 12:12:41 +02:00 · 2023-09-05 11:53:46 +02:00 · 2023-09-05 11:53:02 +02:00 · 2023-09-05 11:44:27 +02:00 · 2023-09-05 09:09:31 +01:00 · 2023-09-05 09:43:37 +02:00
58 changed files with 549 additions and 941 deletions
@@ -0,0 +1,28 @@
+---
+name: Feature Epic
+about: A template to capture and scope user requirements, high level process, and basic mockups for an upcoming feature as part of the initial core spec review process.
+title: 'FEATURE EPIC: '
+labels: feature-epic
+---
+
+## Core Feature
+
+<Name>
+
+## Tasks
+
+- [ ] Define high level requirements
+- [ ] Create basic mockups
+- [ ] Update "API Requirements" in core spec
+- [ ] Update "User-Interface Spec" in relevant front end repo
+- [ ] Create detailed user stories using normal template
+
+## High Level Requirements
+
+## Basic Mockups
+
+## Link to API Requirements in Core spec
+
+## Link to User Interface Specs
+
+## Linked User Stories
@@ -1,6 +1,6 @@
 # Related issues 🔗

-Closes #[Issue number here]
+Issue: #[Issue number here]

 # Description ℹ️

@@ -7,7 +7,7 @@ on:
 jobs:
  after-release:
    runs-on: ubuntu-22.04
-    timeout-minutes: 30
+    timeout-minutes: 45
    steps:
      - name: Checkout
        uses: actions/checkout@v3
@@ -30,18 +30,20 @@ jobs:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

+      - name: Wait for publish to complete
+        uses: lewagon/wait-on-check-action@v1.3.1
+        with:
+          ref: ${{ github.event.release.tag_name }}
+          check-name: '(CD) publish dist / trading'
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          wait-interval: 10
+
      - name: resolve ipfs hashes for release
        run: |
          echo "Name: ${{ github.event.release.name }}"
          echo "Description: ${{ github.event.release.body }}"
          echo "Tag: ${{ github.event.release.tag_name }}"
-          commit="$(git rev-list -n 1 ${{ github.event.release.tag_name }})"
-          echo "Commit: $commit"
-          until docker pull vegaprotocol/trading:$commit; do
-            echo "Image not pushed yet, waiting 60 seconds"
-            sleep 60
-          done
-          docker run --rm vegaprotocol/trading:$commit cat /ipfs-hash > ipfs-hash
+          docker run --rm vegaprotocol/trading:mainnet cat /ipfs-hash > ipfs-hash
          curl -L https://dist.ipfs.tech/kubo/v0.20.0/kubo_v0.20.0_linux-amd64.tar.gz -o kubo.tgz
          tar -xzf kubo.tgz
          export PATH="$PATH:$PWD/kubo"
@@ -6,7 +6,7 @@ name: 'Add Issues To Project Board'
    types:
      - opened
 env:
-  GH_TOKEN: ${{ secrets.GH_NEW_CARD_TO_PROJECT }}
+  GH_TOKEN: ${{ secrets.PROJECT_MANAGE_ACTION }}
  PROJECT_ID: ${{ secrets.FRONT_END_PROJECT_ID }}
  ISSUE_ID: ${{ github.event.issue.node_id }}
  USER: ${{ github.actor }}
@@ -81,140 +81,36 @@ jobs:
        with:
          main-branch-name: develop

-      - name: Check formatting
-        run: yarn nx format:check
-
-      - name: Lint affected
-        run: yarn nx affected:lint --max-warnings=0
-
-      - name: Build affected spec
-        run: yarn nx affected --target=build-spec
-
-      - name: Test affected
-        run: yarn nx affected:test
-
-      - name: Build affected
-        run: yarn nx affected:build || (yarn install && yarn nx affected:build)
-
      # See affected apps
      - name: See affected apps
        run: |
-          affected="$(yarn nx print-affected --base=${{ env.NX_BASE }} --head=${{ env.NX_HEAD }} --select=projects)"
          branch_slug="$(echo '${{ github.head_ref || github.ref_name }}' | sed -r s/[^a-zA-Z0-9]+/-/g | sed -r s/^-+\|-+$//g | cut -c 1-50 )"
+          python3 tools/ci/check-affected.py --github-ref="${{ github.ref }}" --branch-slug="$branch_slug" --event-name="${{ github.event_name }}"

-          echo ">>>> debug"
-          echo "NX_BASE: ${{ env.NX_BASE }}"
-          echo "NX_HEAD: ${{ env.NX_HEAD }}"
-          echo "Affected: ${affected}"
-          echo "Branch slug: ${branch_slug}"
-          echo "Current ref: ${{ github.ref }}"
-          echo ">>>> eof debug"
+      - name: Verify script result
+        run: |
+          echo "Check outputs from script"
+          echo "projects: ${{ env.PROJECTS }}"
+          echo "projects-e2e: ${{ env.PROJECTS_E2E }}"
+          echo "preview_governance: ${{ env.PREVIEW_GOVERNANCE }}"
+          echo "preview_trading: ${{ env.PREVIEW_TRADING }}"
+          echo "preview_explorer: ${{ env.PREVIEW_EXPLORER }}"
+          echo "preview_tools: ${{ env.PREVIEW_TOOLS }}"

-          projects_array=()
+      # - name: Check formatting
+      #   run: yarn nx format:check

-          preview_governance="not deployed"
-          preview_trading="not deployed"
-          preview_explorer="not deployed"
-          preview_tools="not deployed"
+      # - name: Lint affected
+      #   run: yarn nx affected:lint --max-warnings=0

-          # parse if affected is any of three main applications, if none - use all of them
-          if echo "$affected" | grep -q governance; then
-            echo "Governance is affected"
-            projects_array+=("governance")
-            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-          fi
-          if echo "$affected" | grep -q trading; then
-            echo "Trading is affected"
-            projects_array+=("trading")
-            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-          fi
-          if echo "$affected" | grep -q explorer; then
-            echo "Explorer is affected"
-            projects_array+=("explorer")
-            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          fi
-          if [[ ${#projects_array[@]} -eq 0 ]]; then
-            projects_array=("governance" "trading" "explorer")
-            preview_governance=$(printf "https://%s.%s.vega.rocks" "governance" "$branch_slug")
-            preview_trading=$(printf "https://%s.%s.vega.rocks" "trading" "$branch_slug")
-            preview_explorer=$(printf "https://%s.%s.vega.rocks" "explorer" "$branch_slug")
-          fi
+      # - name: Build affected spec
+      #   run: yarn nx affected --target=build-spec

-          # applications parsed before this loop are applicable for running e2e-tests
-          projects_e2e_array=()
-          for project in "${projects_array[@]}"; do
-            projects_e2e_array+=("${project}-e2e")
-          done
-          # all applications below this loop are not applicable for running e2e-test
+      # - name: Test affected
+      #   run: yarn nx affected:test

-          # check if pull request event to deploy tools
-          if [[ "${{ github.event_name }}" = "pull_request" ]]; then
-            if echo "$affected" | grep -q multisig-signer; then
-              echo "Tools are affected"
-              echo "Deploying tools on preview"
-              preview_tools=$(printf "https://%s.%s.vega.rocks" "tools" "$branch_slug")
-
-              projects_array+=("multisig-signer")
-            fi
-          # those apps deploy only from develop to mainnet
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-            if echo "$affected" | grep -q multisig-signer; then
-              echo "Tools are affected"
-              echo "Deploying tools on s3"
-
-              projects_array+=("multisig-signer")
-            fi
-            if echo "$affected" | grep -q static; then
-              echo "static is affected"
-              echo "Deploying static on s3"
-
-              projects_array+=("static")
-            fi
-            if echo "$affected" | grep -q ui-toolkit; then
-              echo "ui-toolkit is affected"
-              echo "Deploying ui-toolkit on s3"
-
-              projects_array+=("ui-toolkit")
-            fi
-          fi
-
-          # if branch starts with release/ and ends with trading / governance or explorer - overwrite the array of affected projects with fixed single application
-          if [[ "${{ github.ref }}" == *release* ]]; then
-            echo ">> This is a relase branch"
-            case "${{ github.ref }}" in
-              *trading)
-                echo ">> Only trading will be deployed"
-                projects_array=(trading)
-                projects_e2e_array=(trading)
-              ;;
-              *governance)
-                echo ">> Only governance will be deployed"
-                projects_array=(governance)
-                projects_e2e_array=(governance)
-              ;;
-              *explorer)
-                echo ">> Only explorer will be deployed"
-                projects_array=(explorer)
-                projects_e2e_array=(explorer)
-              ;;
-              *)
-                echo ">> All apps will be deployed"
-              ;;
-            esac
-          fi
-
-          echo "Projects: ${projects_array[@]}"
-          echo "Projects E2E: ${projects_e2e_array[@]}"
-          projects_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_array[@]}")
-          projects_e2e_json=$(jq -M --compact-output --null-input '$ARGS.positional' --args -- "${projects_e2e_array[@]}")
-
-          echo PROJECTS_E2E=$projects_e2e_json >> $GITHUB_ENV
-          echo PROJECTS=$projects_json >> $GITHUB_ENV
-
-          echo PREVIEW_GOVERNANCE=$preview_governance >> $GITHUB_ENV
-          echo PREVIEW_TRADING=$preview_trading >> $GITHUB_ENV
-          echo PREVIEW_EXPLORER=$preview_explorer >> $GITHUB_ENV
-          echo PREVIEW_TOOLS=$preview_tools >> $GITHUB_ENV
+      # - name: Build affected
+      #   run: yarn nx affected:build || (yarn install && yarn nx affected:build)

    outputs:
      projects: ${{ env.PROJECTS }}
@@ -224,6 +120,15 @@ jobs:
      preview_explorer: ${{ env.PREVIEW_EXPLORER }}
      preview_tools: ${{ env.PREVIEW_TOOLS }}

+  console-e2e:
+    needs: lint-test-build
+    name: '(CI) console python'
+    uses: ./.github/workflows/console-test-run.yml
+    secrets: inherit
+    if: ${{ contains(fromJSON(needs.lint-test-build.outputs.projects), 'trading') && github.event_name == 'pull_request' }}
+    with:
+      github-sha: ${{ github.event.pull_request.head.sha || github.sha }}
+
  cypress:
    needs: lint-test-build
    name: '(CI) cypress'
@@ -232,7 +137,7 @@ jobs:
    secrets: inherit
    with:
      projects: ${{ needs.lint-test-build.outputs.projects-e2e }}
-      tags: '@smoke @regression'
+      tags: '@smoke'

  publish-dist:
    needs: lint-test-build
@@ -1,55 +1,138 @@
-name: console-test-run
+name: (CI) Console tests
+
 on:
  workflow_call:
    inputs:
      github-sha:
        required: true
        type: string
+
 jobs:
-  console-test:
-    timeout-minutes: 5
-    runs-on: self-hosted-runner
+  run-tests:
+    name: run-tests
+    runs-on: 8-cores
+    timeout-minutes: 20
    steps:
+      #----------------------------------------------
+      #       check-out frontend-monorepo
+      #----------------------------------------------
+      - name: Checkout console test repo
+        uses: actions/checkout@v3
+        with:
+          ref: ${{ inputs.github-sha }}
+      #----------------------------------------------
+      #       cache node modules
+      #----------------------------------------------
+      - name: Cache node modules
+        id: cache
+        uses: actions/cache@v3
+        with:
+          path: node_modules
+          key: ${{ runner.os }}-cache-node-modules-${{ hashFiles('yarn.lock') }}
+          # comment out "restore-keys" if you need to rebuild yarn from 0
+          restore-keys: |
+            ${{ runner.os }}-cache-node-modules-
+      #----------------------------------------------
+      #       setup node
+      #----------------------------------------------
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version-file: '.nvmrc'
+          # https://stackoverflow.com/questions/61010294/how-to-cache-yarn-packages-in-github-actions
+          cache: yarn
+      #----------------------------------------------
+      #       install deps if cache missing
+      #----------------------------------------------
+      - name: yarn install
+        if: steps.cache.outputs.cache-hit != 'true'
+        run: yarn install --pure-lockfile
+      #----------------------------------------------
+      #       build trading
+      #----------------------------------------------
+      - name: Build affected spec
+        run: |
+          yarn env-cmd -f ./apps/trading/.env.stagnet1 yarn nx export trading
+      #----------------------------------------------
+      #       run trading server
+      #----------------------------------------------
+      - name: Run trading server
+        run: |
+          docker run -d -p 80:4200 -v $PWD/docker/nginx.conf:/etc/nginx/conf.d/default.conf -v $PWD/dist/apps/trading/exported:/usr/share/nginx/html nginx:1.23-alpine@sha256:6318314189b40e73145a48060bff4783a116c34cc7241532d0d94198fb2c9629
+          sleep 5
+          docker ps
+      #----------------------------------------------
+      #       check if container persists between runs
+      #----------------------------------------------
+      - name: Check server
+        run: |
+          docker ps
+      #----------------------------------------------
+      #       check-out tests repo
+      #----------------------------------------------
      - name: Checkout console test repo
        uses: actions/checkout@v3
        with:
          repository: vegaprotocol/console-test
          path: './console-test'
-
-      - name: Set up Python
+      #----------------------------------------------
+      #       set-up python
+      #----------------------------------------------
+      - name: Set up python
+        id: setup-python
        uses: actions/setup-python@v4
        with:
          python-version: '3.10.11'
-
+      #----------------------------------------------
+      #  -----  install & configure poetry  -----
+      #----------------------------------------------
      - name: Install Poetry
        uses: snok/install-poetry@v1
-
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+          virtualenvs-path: console-test/.venv
+      #----------------------------------------------
+      #       load cached venv if cache exists
+      #----------------------------------------------
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v3
+        with:
+          path: console-test/.venv
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+      #----------------------------------------------
+      # install dependencies if cache does not exist
+      #----------------------------------------------
      - name: Install dependencies
-        run: |
-          poetry install --no-root
        working-directory: ./console-test
-
-      - name: load Binaries
-        run: |
-          poetry run python -m vega_sim.tools.load_binaries
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        run: poetry install --no-interaction --no-root
+      #----------------------------------------------
+      # install vega binaries
+      #----------------------------------------------
+      - name: Install vega binaries
        working-directory: ./console-test
-
-      - name: pull console
-        run: |
-          poetry run docker pull ghcr.io/vegaprotocol/frontend/trading:${{ inputs.github-sha }}
-
-      - name: Update container_name in config.py
-        run: |
-          sed -i "s/container_name = \".*\"/container_name = \"vegaprotocol\/frontend\/trading:${{ inputs.github-sha }}\"/g" config.py
-
+        run: poetry run python -m vega_sim.tools.load_binaries --force
+      #----------------------------------------------
+      # install playwright
+      #----------------------------------------------
      - name: install playwright
        run: poetry run playwright install
        working-directory: ./console-test
-
-      - name: run tests
-        run: poetry run pytest --numprocesses auto
+      #----------------------------------------------
+      # run tests
+      #----------------------------------------------
+      - name: Run tests
        working-directory: ./console-test
-
+        run: poetry run pytest -v -s --numprocesses auto --dist loadfile --durations=20
+      - name: Check files
+        run: |
+          ls -al .
+          ls -al console-test
+      #----------------------------------------------
+      # upload traces
+      #----------------------------------------------
      - name: Upload Playwright Trace
        uses: actions/upload-artifact@v3
        if: always()
@@ -20,7 +20,7 @@ jobs:
        project: ${{ fromJSON(inputs.projects) }}
    name: ${{ matrix.project }}
    runs-on: self-hosted-runner
-    timeout-minutes: 100
+    timeout-minutes: 120
    steps:
      # Checks if skip cache was requested
      - name: Set skip-nx-cache flag
@@ -28,7 +28,13 @@ jobs:
          echo IS_MAINNET_RELEASE=false >> $GITHUB_ENV
          echo IS_TESTNET_RELEASE=false >> $GITHUB_ENV
          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
-          echo IS_S3_RELASE=false >> $GITHUB_ENV
+          echo IS_S3_RELEASE=false >> $GITHUB_ENV
+          echo IS_DEV_IMAGE=false >> $GITHUB_ENV
+
+      - name: Is dev image
+        if: ${{ contains(github.ref, 'develop') && github.event_name == 'push' && matrix.app == 'trading' }}
+        run: |
+          echo IS_DEV_IMAGE=true >> $GITHUB_ENV

      - name: Is PR
        if: ${{ github.event_name == 'pull_request' }}
@@ -36,7 +42,7 @@ jobs:
          echo IS_PR=true >> $GITHUB_ENV

      - name: Is mainnet release
-        if: ${{ contains(github.ref, 'release/mainnnet') && !contains(github.ref, 'mirror') }}
+        if: ${{ contains(github.ref, 'release/mainnet') && !contains(github.ref, 'mirror') }}
        run: |
          echo IS_MAINNET_RELEASE=true >> $GITHUB_ENV

@@ -51,9 +57,9 @@ jobs:
          echo IS_IPFS_RELEASE=true >> $GITHUB_ENV

      - name: Is S3 Release
-        if: ${{ env.IS_IPFS_RELASE == 'false' && github.event_name == 'push' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' && github.event_name == 'push' }}
        run: |
-          echo IS_S3_RELASE=true >> $GITHUB_ENV
+          echo IS_S3_RELEASE=true >> $GITHUB_ENV

      - name: Set up QEMU
        id: quemu
@@ -75,7 +81,7 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true' }}
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}
@@ -97,52 +103,13 @@ jobs:
      - name: Define dist variables
        if: ${{ github.event_name == 'push' }}
        run: |
-          envName=''
-          domain="vega.rocks"
-          bucketName=''
+          python3 tools/ci/define-dist-variables.py --github-ref="${{ github.ref }}" --app="${{ matrix.app }}"

-          if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-            # remove prefixing release/ and take the first string limited by - which is supposed to be name of the environment for releasing (format: release/testnet-trading)
-            envName="$(echo ${{ github.ref }} | sed -e "s|refs/heads/release/||" | cut -d '-' -f 1 )"
-          elif [[ "${{ github.ref }}" =~ .*develop$ ]]; then
-            envName="stagnet1"
-            if [[ "${{ matrix.app }}" = "multisig-signer" ]]; then
-              envName="mainnet"
-              bucketName="tools.vega.xyz"
-            fi
-            if [[ "${{ matrix.app }}" = "static" ]]; then
-              envName="mainnet"
-              bucketName="static.vega.xyz"
-            fi
-            if [[ "${{ matrix.app }}" = "ui-toolkit" ]]; then
-              envName="mainnet"
-              bucketName="ui.vega.rocks"
-            fi
-          elif [[ "${{ github.ref }}" =~ .*mainnet$ ]]; then
-            envName="mainnet"
-          fi
-
-          if [[ "${envName}" = "mainnet" ]]; then
-            domain="vega.xyz"
-            if [[ -z "${bucketName}" ]]; then
-              bucketName="${{ matrix.app }}.${domain}"
-            fi
-          elif [[ "${envName}" = "testnet" ]]; then
-            domain="fairground.wtf"
-            if [[ -z "${bucketName}" ]]; then
-              bucketName="${{ matrix.app }}.${domain}"
-            fi
-          fi
-
-          if [[ -z "${bucketName}" ]]; then
-            bucketName="${{ matrix.app }}.${envName}.${domain}"
-          fi
-
-          echo "bucket name: ${bucketName}"
-          echo "env name: ${envName}"
-
-          echo BUCKET_NAME=${bucketName} >> $GITHUB_ENV
-          echo ENV_NAME=${envName} >> $GITHUB_ENV
+      - name: Verify script result
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          echo "BUCKET_NAME=${{ env.BUCKET_NAME }}"
+          echo "ENV_NAME=${{ env.ENV_NAME }}"

      - name: Build local dist
        run: |
@@ -157,8 +124,12 @@ jobs:
          elif [ "${{ matrix.app }}" = "ui-toolkit" ]; then
            NODE_ENV=production yarn nx run ui-toolkit:build-storybook
            DIST_LOCATION=dist/storybook/ui-toolkit
+          elif [ "${{ matrix.app }}" = "static" ]; then
+            yarn nx build static || (yarn install && yarn nx build static)
          else
            $envCmd yarn nx build ${{ matrix.app }} || (yarn install && $envCmd yarn nx build ${{ matrix.app }})
+          fi
+          if [[ -z "$DIST_LOCATION" ]]; then
            DIST_LOCATION=dist/apps/${{ matrix.app }}
          fi
          mv $DIST_LOCATION dist-result
@@ -208,7 +179,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: dockerhub-push
-        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' || env.IS_DEV_IMAGE == 'true'  }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -218,7 +189,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || env.IS_DEV_IMAGE == 'true' && 'develop' || '' }}

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -251,7 +222,7 @@ jobs:
      - name: Publish dist to s3
        uses: jakejarvis/s3-sync-action@master
        # s3 releases are not happening for trading on mainnet - it's IPFS
-        if: ${{ env.IS_S3_RELASE == 'true' }}
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -262,11 +233,11 @@ jobs:
          SOURCE_DIR: 'dist-result'

      - name: Install aws CLI
-        if: ${{ env.IS_S3_RELASE == 'true' }}
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
        uses: unfor19/install-aws-cli-action@master

      - name: Perform cache invalidation
-        if: ${{ env.IS_S3_RELASE == 'true' }}
+        if: ${{ env.IS_S3_RELEASE == 'true' }}
        env:
          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -15,6 +15,7 @@ on:
          - types
          - utils
          - i18n
+          - wallet

 jobs:
  publish:
@@ -2,7 +2,7 @@
 . "$(dirname "$0")/_/husky.sh"

 # Lint commit messages to ensure they follow conventional commit standards
-yarn commitlint --edit "${1}"
+# yarn commitlint --edit "${1}"

 # Lint all staged files
-yarn lint-staged
+# yarn lint-staged
@@ -0,0 +1,5 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+# Lint all staged files
+# yarn lint-staged
@@ -0,0 +1,8 @@
+#!/bin/sh
+. "$(dirname "$0")/_/husky.sh"
+
+# Lint all staged files
+# yarn nx format:check
+
+# Test all projects with changes
+# yarn nx affected -t test --exclude trading
@@ -320,8 +320,8 @@ context(
      // 3001-VOTE-076
      cy.getByTestId(connectToVegaWalletButton)
        .should('be.visible')
-        .and('have.text', 'Connect Vega wallet');
-      cy.getByTestId(connectToVegaWalletButton).click();
+        .and('have.text', 'Connect Vega wallet')
+        .click();
      cy.getByTestId('connector-jsonRpc').click();
      cy.getByTestId(vegaWalletNameElement).should('be.visible');
      cy.getByTestId(connectToVegaWalletButton).should('not.exist');
@@ -161,7 +161,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('menu-drawer').should('be.visible');
    });

-    it('should have link for proposal page', function () {
+    it.skip('should have link for proposal page', function () {
      cy.getByTestId('menu-drawer').within(() => {
        cy.get('[href="/proposals"]')
          .should('exist')
@@ -1,12 +1,13 @@
 /// <reference types="cypress" />

 import {
+  navigateTo,
+  navigation,
  turnTelemetryOff,
  waitForSpinner,
 } from '../../support/common.functions';
 import {
-  createTenDigitUnixTimeStampForSpecifiedDays,
-  enterRawProposalBody,
+  enterUniqueFreeFormProposalBody,
  goToMakeNewProposal,
  governanceProposalType,
 } from '../../support/governance.functions';
@@ -46,11 +47,12 @@ context('View functionality with public key', { tags: '@smoke' }, function () {
      .and('contain.text', 'USDC (fake)');
  });

-  it('Unable to submit proposal with public key', function () {
+  it.skip('Unable to submit proposal with public key', function () {
    const expectedErrorTxt = `You are connected in a view only state for public key: ${vegaWalletPubKey}. In order to send transactions you must connect to a real wallet.`;

-    goToMakeNewProposal(governanceProposalType.RAW);
-    enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
+    navigateTo(navigation.proposals);
+    goToMakeNewProposal(governanceProposalType.FREEFORM);
+    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
    cy.getByTestId('dialog-content')
      .first()
      .within(() => {
@@ -78,7 +78,7 @@ context(
          cy.getByTestId('connector-jsonRpc')
            .should('be.visible')
            .and('have.text', 'Connect Vega wallet');
-          cy.getByTestId('connector-rest')
+          cy.getByTestId('connector-hosted')
            .should('be.visible')
            .and('have.text', 'Hosted Fairground wallet');
        });
@@ -94,7 +94,7 @@ context(
    describe('when rest connector form opened', function () {
      before('click hosted wallet app button', function () {
        cy.getByTestId(connectorsList).within(() => {
-          cy.getByTestId('connector-rest').click();
+          cy.getByTestId('connector-hosted').click();
        });
      });

@@ -2,8 +2,13 @@ import { Button } from '@vegaprotocol/ui-toolkit';
 import React from 'react';
 import { useTranslation } from 'react-i18next';
 import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
+import {
+  AppStateActionType,
+  useAppState,
+} from '../../contexts/app-state/app-state-context';

 export const ConnectToVega = () => {
+  const { appDispatch } = useAppState();
  const { t } = useTranslation();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
@@ -11,6 +16,10 @@ export const ConnectToVega = () => {
  return (
    <Button
      onClick={() => {
+        appDispatch({
+          type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+          isOpen: true,
+        });
        openVegaWalletDialog();
      }}
      data-testid="connect-to-vega-wallet-btn"
@@ -3,6 +3,11 @@ import { useVegaWallet, useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import React from 'react';
 import { useTranslation } from 'react-i18next';

+import {
+  AppStateActionType,
+  useAppState,
+} from '../../contexts/app-state/app-state-context';
+
 interface VegaWalletContainerProps {
  children: (key: string) => React.ReactElement;
 }
@@ -10,6 +15,7 @@ interface VegaWalletContainerProps {
 export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
+  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -19,6 +25,10 @@ export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
      <Button
        data-testid="connect-to-vega-wallet-btn"
        onClick={() => {
+          appDispatch({
+            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+            isOpen: true,
+          });
          openVegaWalletDialog();
        }}
      >
@@ -71,6 +71,7 @@ export const VegaWallet = () => {

 const VegaWalletNotConnected = () => {
  const { t } = useTranslation();
+  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -78,6 +79,10 @@ const VegaWalletNotConnected = () => {
    <>
      <Button
        onClick={() => {
+          appDispatch({
+            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+            isOpen: true,
+          });
          openVegaWalletDialog();
        }}
        fill={true}
@@ -28,6 +28,9 @@ export interface AppState {
  /** Total number of VEGA Tokens, both vesting and unlocked, associated for staking */
  totalAssociated: BigNumber;

+  /** Whether or not the connect to VEGA wallet overlay is open */
+  vegaWalletOverlay: boolean;
+
  /** Whether or not the manage VEGA wallet overlay is open */
  vegaWalletManageOverlay: boolean;

@@ -49,7 +52,9 @@ export enum AppStateActionType {
  SET_TOKEN,
  SET_ALLOWANCE,
  REFRESH_BALANCES,
+  SET_VEGA_WALLET_OVERLAY,
  SET_VEGA_WALLET_MANAGE_OVERLAY,
+  SET_DRAWER,
  REFRESH_ASSOCIATED_BALANCES,
  SET_ASSOCIATION_BREAKDOWN,
  SET_TRANSACTION_OVERLAY,
@@ -64,10 +69,18 @@ export type AppStateAction =
      totalSupply: BigNumber;
      totalAssociated: BigNumber;
    }
+  | {
+      type: AppStateActionType.SET_VEGA_WALLET_OVERLAY;
+      isOpen: boolean;
+    }
  | {
      type: AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY;
      isOpen: boolean;
    }
+  | {
+      type: AppStateActionType.SET_DRAWER;
+      isOpen: boolean;
+    }
  | {
      type: AppStateActionType.SET_TRANSACTION_OVERLAY;
      isOpen: boolean;
@@ -14,6 +14,7 @@ const initialAppState: AppState = {
  totalAssociated: new BigNumber(0),
  decimals: 0,
  totalSupply: new BigNumber(0),
+  vegaWalletOverlay: false,
  vegaWalletManageOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
@@ -30,10 +31,23 @@ function appStateReducer(state: AppState, action: AppStateAction): AppState {
        totalAssociated: action.totalAssociated,
      };
    }
+    case AppStateActionType.SET_VEGA_WALLET_OVERLAY: {
+      return {
+        ...state,
+        vegaWalletOverlay: action.isOpen,
+      };
+    }
    case AppStateActionType.SET_VEGA_WALLET_MANAGE_OVERLAY: {
      return {
        ...state,
        vegaWalletManageOverlay: action.isOpen,
+        vegaWalletOverlay: action.isOpen ? false : state.vegaWalletOverlay,
+      };
+    }
+    case AppStateActionType.SET_DRAWER: {
+      return {
+        ...state,
+        vegaWalletOverlay: false,
      };
    }
    case AppStateActionType.SET_TRANSACTION_OVERLAY: {
@@ -7,9 +7,9 @@ import {

 const urlParams = new URLSearchParams(window.location.search);

-export const injected = new InjectedConnector();
 export const rest = new RestConnector();
 export const jsonRpc = new JsonRpcConnector();
+export const injected = new InjectedConnector();
 export const view = new ViewConnector(urlParams.get('address'));

 export const Connectors = {
@@ -10,7 +10,10 @@ import {
 } from '@vegaprotocol/ui-toolkit';
 import { addDecimal, toBigNum } from '@vegaprotocol/utils';
 import { ProposalState, VoteValue } from '@vegaprotocol/types';
-import { useAppState } from '../../../../contexts/app-state/app-state-context';
+import {
+  AppStateActionType,
+  useAppState,
+} from '../../../../contexts/app-state/app-state-context';
 import { BigNumber } from '../../../../lib/bignumber';
 import { DATE_FORMAT_LONG } from '../../../../lib/date-formats';
 import { VoteState } from './use-user-vote';
@@ -70,6 +73,7 @@ export const VoteButtons = ({
  dialog: Dialog,
 }: VoteButtonsProps) => {
  const { t } = useTranslation();
+  const { appDispatch } = useAppState();
  const { pubKey } = useVegaWallet();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
@@ -94,6 +98,10 @@ export const VoteButtons = ({
        <div data-testid="connect-wallet">
          <ButtonLink
            onClick={() => {
+              appDispatch({
+                type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+                isOpen: true,
+              });
              openVegaWalletDialog();
            }}
          >
@@ -134,6 +142,7 @@ export const VoteButtons = ({
    minVoterBalance,
    spamProtectionMinTokens,
    t,
+    appDispatch,
    openVegaWalletDialog,
  ]);

@@ -14,6 +14,7 @@ const mockAppState: AppState = {
  totalAssociated: new BigNumber('50063005'),
  decimals: 18,
  totalSupply: mockTotalSupply,
+  vegaWalletOverlay: false,
  vegaWalletManageOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
@@ -2,9 +2,14 @@ import classNames from 'classnames';
 import { useTranslation } from 'react-i18next';
 import { useVegaWalletDialogStore } from '@vegaprotocol/wallet';
 import { Button } from '@vegaprotocol/ui-toolkit';
+import {
+  AppStateActionType,
+  useAppState,
+} from '../../contexts/app-state/app-state-context';
 import { SubHeading } from '../../components/heading';

 export const ConnectToSeeRewards = () => {
+  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -21,6 +26,10 @@ export const ConnectToSeeRewards = () => {
      <Button
        data-testid="connect-to-vega-wallet-btn"
        onClick={() => {
+          appDispatch({
+            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
+            isOpen: true,
+          });
          openVegaWalletDialog();
        }}
      >
@@ -8,9 +8,10 @@ import { TxState } from '../../../hooks/transaction-reducer';
 import { useTransaction } from '../../../hooks/use-transaction';
 import { BigNumber } from '../../../lib/bignumber';
 import { AssociateInfo } from './associate-info';
-import { removeDecimal, toBigNum } from '@vegaprotocol/utils';
+import { toBigNum } from '@vegaprotocol/utils';
 import type { EthereumConfig } from '@vegaprotocol/web3';
 import { useBalances } from '../../../lib/balances/balances-store';
+import { MaxUint256 } from '@ethersproject/constants';

 export const WalletAssociate = ({
  perform,
@@ -42,7 +43,7 @@ export const WalletAssociate = ({
  } = useTransaction(() => {
    return token.approve(
      ethereumConfig.staking_bridge_contract.address,
-      removeDecimal('1000000', decimals).toString()
+      MaxUint256.toString()
    );
  });

@@ -2,6 +2,7 @@ import { removeDecimal } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import {
  OrderStatusMapping,
+  OrderTimeInForceMapping,
  OrderTypeMapping,
  Side,
 } from '@vegaprotocol/types';
@@ -16,6 +17,7 @@ const orderStatus = 'status';
 const orderRemaining = 'remaining';
 const orderPrice = 'price';
 const orderTimeInForce = 'timeInForce';
+const orderCreatedAt = 'createdAt';
 const orderUpdatedAt = 'updatedAt';
 const assetSelectField = 'select[name="asset"]';
 const amountField = 'input[name="amount"]';
@@ -258,7 +260,10 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
            OrderStatusMapping.STATUS_ACTIVE
          );

-          cy.get(`[col-id='${orderRemaining}']`).should('contain.text', '0.00');
+          cy.get(`[col-id='${orderRemaining}']`).should(
+            'contain.text',
+            `0.00/${order.size}`
+          );

          cy.get(`[col-id='${orderPrice}']`).then(($price) => {
            expect(parseFloat($price.text())).to.equal(parseFloat(order.price));
@@ -266,10 +271,10 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {

          cy.get(`[col-id='${orderTimeInForce}']`).should(
            'contain.text',
-            'GTC'
+            OrderTimeInForceMapping[order.timeInForce]
          );

-          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
+          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderCreatedAt);
        });
    });
  });
@@ -68,15 +68,14 @@ describe('market info is displayed', { tags: '@smoke' }, () => {

    validateMarketDataRow(0, 'Name', 'BTCUSD Monthly (30 Jun 2022)');
    validateMarketDataRow(1, 'Market ID', 'market-0');
-    validateMarketDataRow(2, 'Parent Market ID', 'market-1');
    validateMarketDataRow(
-      3,
+      2,
      'Trading Mode',
      MarketTradingModeMapping.TRADING_MODE_CONTINUOUS
    );
-    validateMarketDataRow(4, 'Market Decimal Places', '5');
-    validateMarketDataRow(5, 'Position Decimal Places', '0');
-    validateMarketDataRow(6, 'Settlement Asset Decimal Places', '5');
+    validateMarketDataRow(3, 'Market Decimal Places', '5');
+    validateMarketDataRow(4, 'Position Decimal Places', '0');
+    validateMarketDataRow(5, 'Settlement Asset Decimal Places', '5');
  });

  it('instrument displayed', () => {
@@ -63,7 +63,7 @@ describe(
      cy.contains('Hosted Fairground wallet');

      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-rest"]')
+        .find('[data-testid="connector-hosted"]')
        .click();
      cy.getByTestId(form).find('#wallet').click().type('user');
      cy.getByTestId(form).find('#passphrase').click().type('pass');
@@ -89,7 +89,7 @@ describe(
      );
      cy.getByTestId(connectVegaBtn).click();
      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-rest"]')
+        .find('[data-testid="connector-hosted"]')
        .click();
      cy.getByTestId(form).find('#wallet').click().type('invalid name');
      cy.getByTestId(form).find('#passphrase').click().type('invalid password');
@@ -100,7 +100,7 @@ describe(
    it('doesnt connect with empty fields', () => {
      cy.getByTestId(connectVegaBtn).click();
      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-rest"]')
+        .find('[data-testid="connector-hosted"]')
        .click();

      cy.getByTestId('rest-connector-form').find('button[type=submit]').click();
@@ -14,4 +14,4 @@ NX_ANNOUNCEMENTS_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/annou
 NX_VEGA_INCIDENT_URL=https://blog.vega.xyz/tagged/vega-incident-reports
 NX_VEGA_CONSOLE_URL=https://console.vega.xyz
 # TAG name of the current app version - TODO: bump to the latest upon release
-NX_APP_VERSION=v0.20.21-core-0.71.6
+NX_APP_VERSION=v0.20.23-core-0.71.6
@@ -27,7 +27,6 @@ import {
 import { TradingViews } from './trade-views';
 import { MarketSelector } from './market-selector';
 import { HeaderStats } from './header-stats';
-import { MarketSuccessorBanner } from '../../components/market-banner';

 interface TradeGridProps {
  market: Market | null;
@@ -318,7 +317,6 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
        <HeaderStats market={market} />
      </div>
      <div className="col-span-2">
-        <MarketSuccessorBanner market={market} />
        <OracleBanner marketId={market?.id || ''} />
      </div>
      {sidebarOpen && (
@@ -21,7 +21,6 @@ import { HeaderStats } from './header-stats';
 import * as DialogPrimitives from '@radix-ui/react-dialog';
 import { HeaderTitle } from '../../components/header';
 import { MarketSelector } from './market-selector';
-import { MarketSuccessorBanner } from '../../components/market-banner';

 interface TradePanelsProps {
  market: Market | null;
@@ -93,7 +92,6 @@ export const TradePanels = ({
        <HeaderStats market={market} />
      </div>
      <div>
-        <MarketSuccessorBanner market={market} />
        <OracleBanner marketId={market?.id || ''} />
      </div>
      <div className="h-full">
@@ -1 +0,0 @@
-export * from './market-successor-banner';
@@ -1,188 +0,0 @@
-import { render, screen } from '@testing-library/react';
-import { MockedProvider } from '@apollo/react-testing';
-import * as dataProviders from '@vegaprotocol/data-provider';
-import { MarketSuccessorBanner } from './market-successor-banner';
-import * as Types from '@vegaprotocol/types';
-import * as allUtils from '@vegaprotocol/utils';
-import type { Market } from '@vegaprotocol/markets';
-import type { PartialDeep } from 'type-fest';
-
-const market = {
-  id: 'marketId',
-  tradableInstrument: {
-    instrument: {
-      metadata: {
-        tags: [],
-      },
-    },
-  },
-  marketTimestamps: {
-    close: null,
-  },
-  successorMarketID: 'successorMarketID',
-} as unknown as Market;
-
-let mockDataSuccessorMarket: PartialDeep<Market> | null = null;
-jest.mock('@vegaprotocol/data-provider', () => ({
-  ...jest.requireActual('@vegaprotocol/data-provider'),
-  useDataProvider: jest.fn().mockImplementation((args) => {
-    if (args.skip) {
-      return {
-        data: null,
-        error: null,
-      };
-    }
-    return {
-      data: mockDataSuccessorMarket,
-      error: null,
-    };
-  }),
-}));
-jest.mock('@vegaprotocol/utils', () => ({
-  ...jest.requireActual('@vegaprotocol/utils'),
-  getMarketExpiryDate: jest.fn(),
-}));
-let mockCandles = {};
-jest.mock('@vegaprotocol/markets', () => ({
-  ...jest.requireActual('@vegaprotocol/markets'),
-  useCandles: () => mockCandles,
-}));
-
-describe('MarketSuccessorBanner', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-    mockDataSuccessorMarket = {
-      id: 'successorMarketID',
-      state: Types.MarketState.STATE_ACTIVE,
-      tradingMode: Types.MarketTradingMode.TRADING_MODE_CONTINUOUS,
-      tradableInstrument: {
-        instrument: {
-          name: 'Successor Market Name',
-        },
-      },
-    };
-  });
-  describe('should be hidden', () => {
-    it('when no market', () => {
-      const { container } = render(<MarketSuccessorBanner market={null} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-    });
-
-    it('when no successorMarketID', () => {
-      const amendedMarket = {
-        ...market,
-        successorMarketID: null,
-      };
-      const { container } = render(
-        <MarketSuccessorBanner market={amendedMarket} />,
-        {
-          wrapper: MockedProvider,
-        }
-      );
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({ skip: true })
-      );
-    });
-
-    it('no successor market data', () => {
-      mockDataSuccessorMarket = null;
-      const { container } = render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({
-          variables: { marketId: 'successorMarketID' },
-          skip: false,
-        })
-      );
-    });
-
-    it('successor market not in continuous mode', () => {
-      mockDataSuccessorMarket = {
-        ...mockDataSuccessorMarket,
-        tradingMode: Types.MarketTradingMode.TRADING_MODE_NO_TRADING,
-      };
-      const { container } = render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({
-          variables: { marketId: 'successorMarketID' },
-          skip: false,
-        })
-      );
-      expect(allUtils.getMarketExpiryDate).toHaveBeenCalled();
-    });
-
-    it('successor market is not active', () => {
-      mockDataSuccessorMarket = {
-        ...mockDataSuccessorMarket,
-        state: Types.MarketState.STATE_PENDING,
-      };
-      const { container } = render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(container).toBeEmptyDOMElement();
-      expect(dataProviders.useDataProvider).lastCalledWith(
-        expect.objectContaining({
-          variables: { marketId: 'successorMarketID' },
-          skip: false,
-        })
-      );
-      expect(allUtils.getMarketExpiryDate).toHaveBeenCalled();
-    });
-  });
-
-  describe('should be displayed', () => {
-    it('should be rendered', () => {
-      render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(
-        screen.getByText('This market has been succeeded')
-      ).toBeInTheDocument();
-      expect(
-        screen.getByRole('link', { name: 'Successor Market Name' })
-      ).toHaveAttribute('href', '/#/markets/successorMarketID');
-    });
-
-    it('should display optionally successor volume', () => {
-      mockDataSuccessorMarket = {
-        ...mockDataSuccessorMarket,
-        positionDecimalPlaces: 3,
-      };
-      mockCandles = {
-        oneDayCandles: [
-          { volume: 123 },
-          { volume: 456 },
-          { volume: 789 },
-          { volume: 99999 },
-        ],
-      };
-
-      render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(screen.getByText('has 101.367 24h vol.')).toBeInTheDocument();
-    });
-
-    it('should display optionally duration', () => {
-      jest
-        .spyOn(allUtils, 'getMarketExpiryDate')
-        .mockReturnValue(
-          new Date(Date.now() + 24 * 60 * 60 * 1000 + 60 * 1000)
-        );
-      render(<MarketSuccessorBanner market={market} />, {
-        wrapper: MockedProvider,
-      });
-      expect(
-        screen.getByText(/^This market expires in 1 day/)
-      ).toBeInTheDocument();
-    });
-  });
-});
@@ -1,115 +0,0 @@
-import { useState } from 'react';
-import { isBefore, formatDuration, intervalToDuration } from 'date-fns';
-import { useDataProvider } from '@vegaprotocol/data-provider';
-import type { Market } from '@vegaprotocol/markets';
-import {
-  calcCandleVolume,
-  marketProvider,
-  useCandles,
-} from '@vegaprotocol/markets';
-import {
-  ExternalLink,
-  Intent,
-  NotificationBanner,
-} from '@vegaprotocol/ui-toolkit';
-import {
-  addDecimalsFormatNumber,
-  getMarketExpiryDate,
-  isNumeric,
-} from '@vegaprotocol/utils';
-import { t } from '@vegaprotocol/i18n';
-import * as Types from '@vegaprotocol/types';
-
-const getExpiryDate = (tags: string[], close?: string): Date | null => {
-  const expiryDate = getMarketExpiryDate(tags);
-  return expiryDate || (close && new Date(close)) || null;
-};
-
-export const MarketSuccessorBanner = ({
-  market,
-}: {
-  market: Market | null;
-}) => {
-  const { data: successorData } = useDataProvider({
-    dataProvider: marketProvider,
-    variables: {
-      marketId: market?.successorMarketID || '',
-    },
-    skip: !market?.successorMarketID,
-  });
-  const [visible, setVisible] = useState(true);
-
-  const expiry = market
-    ? getExpiryDate(
-        market.tradableInstrument.instrument.metadata.tags || [],
-        market.marketTimestamps.close
-      )
-    : null;
-
-  const duration =
-    expiry && isBefore(new Date(), expiry)
-      ? intervalToDuration({ start: new Date(), end: expiry })
-      : null;
-
-  const isInContinuesMode =
-    successorData?.state === Types.MarketState.STATE_ACTIVE &&
-    successorData?.tradingMode ===
-      Types.MarketTradingMode.TRADING_MODE_CONTINUOUS;
-
-  const { oneDayCandles } = useCandles({
-    marketId: successorData?.id,
-  });
-
-  const candleVolume = oneDayCandles?.length
-    ? calcCandleVolume(oneDayCandles)
-    : null;
-
-  const successorVolume =
-    candleVolume && isNumeric(successorData?.positionDecimalPlaces)
-      ? addDecimalsFormatNumber(
-          candleVolume,
-          successorData?.positionDecimalPlaces as number
-        )
-      : null;
-
-  if (isInContinuesMode && visible) {
-    return (
-      <NotificationBanner
-        intent={Intent.Primary}
-        onClose={() => {
-          setVisible(false);
-        }}
-      >
-        <div className="uppercase mb-1">
-          {t('This market has been succeeded')}
-        </div>
-        <div>
-          {duration && (
-            <span>
-              {t('This market expires in %s.', [
-                formatDuration(duration, {
-                  format: [
-                    'years',
-                    'months',
-                    'weeks',
-                    'days',
-                    'hours',
-                    'minutes',
-                  ],
-                }),
-              ])}
-            </span>
-          )}{' '}
-          {t('The successor market')}{' '}
-          <ExternalLink href={`/#/markets/${successorData?.id}`}>
-            {successorData?.tradableInstrument.instrument.name}
-          </ExternalLink>
-          {successorVolume && (
-            <span> {t('has %s 24h vol.', [successorVolume])}</span>
-          )}
-        </div>
-      </NotificationBanner>
-    );
-  }
-  return null;
-};
@@ -190,9 +190,6 @@ export const VegaWalletConnectButton = () => {
          >
            <DropdownMenuContent
              onInteractOutside={() => setDropdownOpen(false)}
-              sideOffset={20}
-              side="bottom"
-              align="end"
            >
              <div className="min-w-[340px]" data-testid="keypair-list">
                <DropdownMenuRadioGroup
@@ -180,4 +180,4 @@ export function useLiquidityProviderFeeShareLazyQuery(baseOptions?: Apollo.LazyQ
        }
 export type LiquidityProviderFeeShareQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareQuery>;
 export type LiquidityProviderFeeShareLazyQueryHookResult = ReturnType<typeof useLiquidityProviderFeeShareLazyQuery>;
-export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;
+export type LiquidityProviderFeeShareQueryResult = Apollo.QueryResult<LiquidityProviderFeeShareQuery, LiquidityProviderFeeShareQueryVariables>;
@@ -7,12 +7,12 @@ export type DataSourceFilterFragment = { __typename?: 'Filter', key: { __typenam

 export type DataSourceSpecFragment = { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } };

-export type MarketFieldsFragment = { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, successorMarketID?: string | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number, quantum: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } };
+export type MarketFieldsFragment = { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number, quantum: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } };

 export type MarketsQueryVariables = Types.Exact<{ [key: string]: never; }>;


-export type MarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, successorMarketID?: string | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number, quantum: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } } }> } | null };
+export type MarketsQuery = { __typename?: 'Query', marketsConnection?: { __typename?: 'MarketConnection', edges: Array<{ __typename?: 'MarketEdge', node: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number, quantum: string }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null, filters?: Array<{ __typename?: 'Filter', key: { __typename?: 'PropertyKey', name?: string | null, type: Types.PropertyKeyType, numberDecimalPlaces?: number | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } } }, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any } } }> } | null };

 export const DataSourceFilterFragmentDoc = gql`
    fragment DataSourceFilter on Filter {
@@ -104,7 +104,6 @@ export const MarketFieldsFragmentDoc = gql`
    open
    close
  }
-  successorMarketID
 }
    ${DataSourceSpecFragmentDoc}`;
 export const MarketsDocument = gql`
@@ -142,6 +142,5 @@ query MarketInfo($marketId: ID!) {
        }
      }
    }
-    parentMarketID
  }
 }
@@ -10,7 +10,7 @@ export type MarketInfoQueryVariables = Types.Exact<{
 }>;


-export type MarketInfoQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, lpPriceRange: string, parentMarketID?: string | null, proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } } } | null> | null } | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } }, marginCalculator?: { __typename?: 'MarginCalculator', scalingFactors: { __typename?: 'ScalingFactors', searchLevel: number, initialMargin: number, collateralRelease: number } } | null } } | null };
+export type MarketInfoQuery = { __typename?: 'Query', market?: { __typename?: 'Market', id: string, decimalPlaces: number, positionDecimalPlaces: number, state: Types.MarketState, tradingMode: Types.MarketTradingMode, lpPriceRange: string, proposal?: { __typename?: 'Proposal', id?: string | null, rationale: { __typename?: 'ProposalRationale', title: string, description: string } } | null, marketTimestamps: { __typename?: 'MarketTimestamps', open: any, close: any }, openingAuction: { __typename?: 'AuctionDuration', durationSecs: number, volume: number }, accountsConnection?: { __typename?: 'AccountsConnection', edges?: Array<{ __typename?: 'AccountEdge', node: { __typename?: 'AccountBalance', type: Types.AccountType, balance: string, asset: { __typename?: 'Asset', id: string } } } | null> | null } | null, fees: { __typename?: 'Fees', factors: { __typename?: 'FeeFactors', makerFee: string, infrastructureFee: string, liquidityFee: string } }, priceMonitoringSettings: { __typename?: 'PriceMonitoringSettings', parameters?: { __typename?: 'PriceMonitoringParameters', triggers?: Array<{ __typename?: 'PriceMonitoringTrigger', horizonSecs: number, probability: number, auctionExtensionSecs: number }> | null } | null }, riskFactors?: { __typename?: 'RiskFactor', market: string, short: string, long: string } | null, liquidityMonitoringParameters: { __typename?: 'LiquidityMonitoringParameters', triggeringRatio: string, targetStakeParameters: { __typename?: 'TargetStakeParameters', timeWindow: number, scalingFactor: number } }, tradableInstrument: { __typename?: 'TradableInstrument', instrument: { __typename?: 'Instrument', id: string, name: string, code: string, metadata: { __typename?: 'InstrumentMetadata', tags?: Array<string> | null }, product: { __typename?: 'Future', quoteName: string, settlementAsset: { __typename?: 'Asset', id: string, symbol: string, name: string, decimals: number }, dataSourceSpecForSettlementData: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecForTradingTermination: { __typename?: 'DataSourceSpec', id: string, data: { __typename?: 'DataSourceDefinition', sourceType: { __typename?: 'DataSourceDefinitionExternal', sourceType: { __typename?: 'DataSourceSpecConfiguration', signers?: Array<{ __typename?: 'Signer', signer: { __typename?: 'ETHAddress', address?: string | null } | { __typename?: 'PubKey', key?: string | null } }> | null } } | { __typename?: 'DataSourceDefinitionInternal' } } }, dataSourceSpecBinding: { __typename?: 'DataSourceSpecToFutureBinding', settlementDataProperty: string, tradingTerminationProperty: string } } }, riskModel: { __typename?: 'LogNormalRiskModel', tau: number, riskAversionParameter: number, params: { __typename?: 'LogNormalModelParams', r: number, sigma: number, mu: number } } | { __typename?: 'SimpleRiskModel', params: { __typename?: 'SimpleRiskModelParams', factorLong: number, factorShort: number } }, marginCalculator?: { __typename?: 'MarginCalculator', scalingFactors: { __typename?: 'ScalingFactors', searchLevel: number, initialMargin: number, collateralRelease: number } } | null } } | null };

 export const DataSourceFragmentDoc = gql`
    fragment DataSource on DataSourceDefinition {
@@ -158,7 +158,6 @@ export const MarketInfoDocument = gql`
        }
      }
    }
-    parentMarketID
  }
 }
    ${DataSourceFragmentDoc}`;
@@ -144,7 +144,6 @@ export const KeyDetailsInfoPanel = ({ market }: MarketInfoProps) => {
      data={{
        name: market.tradableInstrument.instrument.name,
        marketID: market.id,
-        parentMarketID: market.parentMarketID,
        tradingMode:
          market.tradingMode && MarketTradingModeMapping[market.tradingMode],
        marketDecimalPlaces: market.decimalPlaces,
@@ -191,7 +191,6 @@ export const marketInfoQuery = (
          },
        },
      },
-      parentMarketID: 'market-1',
    },
  };

@@ -102,5 +102,4 @@ export const tooltipMapping: Record<string, ReactNode> = {
    `The market's liquidity requirement which is derived from the maximum open interest observed over a rolling time window.`
  ),
  suppliedStake: t('The current amount of liquidity supplied for this market.'),
-  parentMarketID: t('The ID of the market this market succeeds'),
 };
@@ -85,7 +85,6 @@ fragment MarketFields on Market {
    open
    close
  }
-  successorMarketID
 }

 query Markets {
@@ -6,6 +6,7 @@ import type { Position } from './positions-data-providers';
 import * as Schema from '@vegaprotocol/types';
 import { PositionStatus, PositionStatusMapping } from '@vegaprotocol/types';
 import type { ICellRendererParams } from 'ag-grid-community';
+import { addDecimalsFormatNumber } from '@vegaprotocol/utils';

 jest.mock('./liquidation-price', () => ({
  LiquidationPrice: () => (
@@ -19,7 +20,7 @@ const singleRow: Position = {
  assetSymbol: 'BTC',
  averageEntryPrice: '133',
  currentLeverage: 1.1,
-  decimals: 2,
+  decimals: 2, // this is settlementAsset.decimals
  quantum: '0.1',
  lossSocializationAmount: '0',
  marginAccountBalance: '12345600',
@@ -177,12 +178,22 @@ it('displays allocated margin', async () => {
 });

 it('displays realised and unrealised PNL', async () => {
+  // pnl cells should be rendered with asset dps
+  const expectedRealised = addDecimalsFormatNumber(
+    singleRow.realisedPNL,
+    singleRow.decimals
+  );
+  const expectedUnrealised = addDecimalsFormatNumber(
+    singleRow.unrealisedPNL,
+    singleRow.decimals
+  );
+
  await act(async () => {
    render(<PositionsTable rowData={singleRowData} isReadOnly={false} />);
  });
  const cells = screen.getAllByRole('gridcell');
-  expect(cells[9].textContent).toEqual('12.3');
-  expect(cells[10].textContent).toEqual('45.6');
+  expect(cells[9].textContent).toEqual(expectedRealised);
+  expect(cells[10].textContent).toEqual(expectedUnrealised);
 });

 it('displays close button', async () => {
@@ -365,20 +365,14 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
                return !data
                  ? undefined
-                  : toBigNum(
-                      data.realisedPNL,
-                      data.marketDecimalPlaces
-                    ).toNumber();
+                  : toBigNum(data.realisedPNL, data.decimals).toNumber();
              },
              valueFormatter: ({
                data,
              }: VegaValueFormatterParams<Position, 'realisedPNL'>) => {
                return !data
                  ? ''
-                  : addDecimalsFormatNumber(
-                      data.realisedPNL,
-                      data.marketDecimalPlaces
-                    );
+                  : addDecimalsFormatNumber(data.realisedPNL, data.decimals);
              },
              headerTooltip: t(
                'Profit or loss is realised whenever your position is reduced to zero and the margin is released back to your collateral balance. P&L excludes any fees paid.'
@@ -396,20 +390,14 @@ export const PositionsTable = forwardRef<AgGridReact, Props>(
              valueGetter: ({ data }: VegaValueGetterParams<Position>) => {
                return !data
                  ? undefined
-                  : toBigNum(
-                      data.unrealisedPNL,
-                      data.marketDecimalPlaces
-                    ).toNumber();
+                  : toBigNum(data.unrealisedPNL, data.decimals).toNumber();
              },
              valueFormatter: ({
                data,
              }: VegaValueFormatterParams<Position, 'unrealisedPNL'>) =>
                !data
                  ? ''
-                  : addDecimalsFormatNumber(
-                      data.unrealisedPNL,
-                      data.marketDecimalPlaces
-                    ),
+                  : addDecimalsFormatNumber(data.unrealisedPNL, data.decimals),
              headerTooltip: t(
                'Unrealised profit is the current profit on your open position. Margin is still allocated to your position.'
              ),
@@ -356,13 +356,6 @@ export enum BusEventType {
  Withdrawal = 'Withdrawal'
 }

-/** Allows for cancellation of an existing governance transfer */
-export type CancelTransfer = {
-  __typename?: 'CancelTransfer';
-  /** The governance transfer to cancel */
-  transferId: Scalars['ID'];
-};
-
 /** Candle stick representation of trading */
 export type Candle = {
  __typename?: 'Candle';
@@ -374,8 +367,6 @@ export type Candle = {
  lastUpdateInPeriod: Scalars['Timestamp'];
  /** Low price (uint64) */
  low: Scalars['String'];
-  /** Total notional value of trades (uint64) */
-  notional: Scalars['String'];
  /** Open price (uint64) */
  open: Scalars['String'];
  /** RFC3339Nano formatted date and time for the candle start time */
@@ -1132,17 +1123,6 @@ export type FutureProduct = {
  settlementAsset: Asset;
 };

-export type GovernanceTransferKind = OneOffGovernanceTransfer | RecurringGovernanceTransfer;
-
-export enum GovernanceTransferType {
-  /** Transfers the specified amount or does not transfer anything */
-  GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING = 'GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING',
-  /** Transfers the specified amount or the max allowable amount if this is less than the specified amount */
-  GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT = 'GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT',
-  /** Default value, always invalid */
-  GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED = 'GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED'
-}
-
 /** A segment of data node history */
 export type HistorySegment = {
  __typename?: 'HistorySegment';
@@ -1154,17 +1134,6 @@ export type HistorySegment = {
  toHeight: Scalars['Int'];
 };

-/** Details of the iceberg order */
-export type IcebergOrder = {
-  __typename?: 'IcebergOrder';
-  /** If the visible size of the order falls below this value, it will be replenished back to the peak size using the reserved amount */
-  minimumVisibleSize: Scalars['String'];
-  /** Size of the order that will be made visible if the iceberg order is replenished after trading */
-  peakSize: Scalars['String'];
-  /** Size of the order that is reserved and used to restore the iceberg's peak when it is refreshed */
-  reservedRemaining: Scalars['String'];
-};
-
 /** Describes something that can be traded on Vega */
 export type Instrument = {
  __typename?: 'Instrument';
@@ -1336,12 +1305,10 @@ export type LiquidityProviderFeeShare = {
  averageEntryValuation: Scalars['String'];
  /** The average liquidity score */
  averageScore: Scalars['String'];
-  /** The share owned by this liquidity provider */
+  /** The share owned by this liquidity provider (float) */
  equityLikeShare: Scalars['String'];
  /** The liquidity provider party ID */
  party: Party;
-  /** The virtual stake for this liquidity provider */
-  virtualStake: Scalars['String'];
 };

 /** The command to be sent to the chain for a liquidity provision submission */
@@ -1356,7 +1323,7 @@ export type LiquidityProvision = {
  /** Nominated liquidity fee factor, which is an input to the calculation of liquidity fees on the market, as per setting fees and rewarding liquidity providers. */
  fee: Scalars['String'];
  /** Unique identifier for the order (set by the system after consensus) */
-  id: Scalars['ID'];
+  id?: Maybe<Scalars['ID']>;
  /** Market for the order */
  market: Market;
  /** The party making this commitment */
@@ -1405,7 +1372,7 @@ export type LiquidityProvisionUpdate = {
  /** Nominated liquidity fee factor, which is an input to the calculation of liquidity fees on the market, as per setting fees and rewarding liquidity providers. */
  fee: Scalars['String'];
  /** Unique identifier for the order (set by the system after consensus) */
-  id: Scalars['ID'];
+  id?: Maybe<Scalars['ID']>;
  /** Market for the order */
  marketID: Scalars['ID'];
  /** The party making this commitment */
@@ -1579,8 +1546,6 @@ export type Market = {
  fees: Fees;
  /** Market ID */
  id: Scalars['ID'];
-  /** Optional: When a successor market is created, a fraction of the parent market's insurance pool can be transferred to the successor market */
-  insurancePoolFraction?: Maybe<Scalars['String']>;
  /** Linear slippage factor is used to cap the slippage component of maintainence margin - it is applied to the slippage volume */
  linearSlippageFactor: Scalars['String'];
  /** Liquidity monitoring parameters for the market */
@@ -1598,11 +1563,6 @@ export type Market = {
  openingAuction: AuctionDuration;
  /** Orders on a market */
  ordersConnection?: Maybe<OrderConnection>;
-  /**
-   * Optional: Parent market ID. A market can be a successor to another market. If this market is a successor to a previous market,
-   * this field will be populated with the ID of the previous market.
-   */
-  parentMarketID?: Maybe<Scalars['ID']>;
  /**
   * The number of decimal places that an integer must be shifted in order to get a correct size (uint64).
   * i.e. 0 means there are no fractional orders for the market, and order sizes are always whole sizes.
@@ -1620,8 +1580,6 @@ export type Market = {
  riskFactors?: Maybe<RiskFactor>;
  /** Current state of the market */
  state: MarketState;
-  /** Optional: Market ID of the successor to this market if one exists */
-  successorMarketID?: Maybe<Scalars['ID']>;
  /** An instance of, or reference to, a tradable instrument. */
  tradableInstrument: TradableInstrument;
  /** @deprecated Simplify and consolidate trades query and remove nesting. Use trades query instead */
@@ -1714,16 +1672,12 @@ export type MarketData = {
  indicativePrice: Scalars['String'];
  /** Indicative volume if the auction ended now, 0 if not in auction mode */
  indicativeVolume: Scalars['String'];
-  /** The last traded price (an unsigned integer) */
-  lastTradedPrice: Scalars['String'];
  /** The equity like share of liquidity fee for each liquidity provider */
  liquidityProviderFeeShare?: Maybe<Array<LiquidityProviderFeeShare>>;
  /** The mark price (an unsigned integer) */
  markPrice: Scalars['String'];
  /** Market of the associated mark price */
  market: Market;
-  /** The market growth factor for the last market time window */
-  marketGrowth: Scalars['String'];
  /** Current state of the market */
  marketState: MarketState;
  /** What mode the market is in (auction, continuous, etc) */
@@ -1821,7 +1775,7 @@ export type MarketDepthUpdate = {
  sequenceNumber: Scalars['String'];
 };

-/** Edge type containing the market and cursor information returned by a MarketConnection */
+/** Edge type containing the order and cursor information returned by a OrderConnection */
 export type MarketEdge = {
  __typename?: 'MarketEdge';
  /** The cursor for this market */
@@ -1978,7 +1932,7 @@ export type NewMarket = {
  decimalPlaces: Scalars['Int'];
  /** New market instrument configuration */
  instrument: InstrumentConfiguration;
-  /** Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume */
+  /** Linear slippage factor is used to cap the slippage component of maintainence margin - it is applied to the slippage volume */
  linearSlippageFactor: Scalars['String'];
  /** Liquidity monitoring parameters */
  liquidityMonitoringParameters: LiquidityMonitoringParameters;
@@ -1990,34 +1944,10 @@ export type NewMarket = {
  positionDecimalPlaces: Scalars['Int'];
  /** Price monitoring parameters */
  priceMonitoringParameters: PriceMonitoringParameters;
-  /** Quadratic slippage factor is used to cap the slippage component of maintenance margin - it is applied to the square of the slippage volume */
+  /** Quadratic slippage factor is used to cap the slippage component of maintainence margin - it is applied to the square of the slippage volume */
  quadraticSlippageFactor: Scalars['String'];
  /** New market risk configuration */
  riskParameters: RiskModel;
-  /** Successor market configuration. If this proposed market is meant to succeed a given market, then this needs to be set. */
-  successorConfiguration?: Maybe<SuccessorConfiguration>;
-};
-
-export type NewTransfer = {
-  __typename?: 'NewTransfer';
-  /** The maximum amount to be transferred */
-  amount: Scalars['String'];
-  /** The asset to transfer */
-  asset: Asset;
-  /** The destination account */
-  destination: Scalars['String'];
-  /** The type of destination account */
-  destinationType: AccountType;
-  /** The fraction of the balance to be transferred */
-  fraction_of_balance: Scalars['String'];
-  /** The type of governance transfer being made, i.e. a one-off or recurring transfer */
-  kind: GovernanceTransferKind;
-  /** The source account */
-  source: Scalars['String'];
-  /** The type of source account */
-  sourceType: AccountType;
-  /** The type of the governance transfer */
-  transferType: GovernanceTransferType;
 };

 /** Information available for a node */
@@ -2231,14 +2161,10 @@ export type ObservableMarketData = {
  indicativePrice: Scalars['String'];
  /** Indicative volume if the auction ended now, 0 if not in auction mode */
  indicativeVolume: Scalars['String'];
-  /** The last traded price (an unsigned integer) */
-  lastTradedPrice: Scalars['String'];
  /** The equity like share of liquidity fee for each liquidity provider */
  liquidityProviderFeeShare?: Maybe<Array<ObservableLiquidityProviderFeeShare>>;
  /** The mark price (an unsigned integer) */
  markPrice: Scalars['String'];
-  /** The market growth factor for the last market time window */
-  marketGrowth: Scalars['String'];
  /** Market ID of the associated mark price */
  marketId: Scalars['ID'];
  /** Current state of the market */
@@ -2303,13 +2229,6 @@ export type ObservableMarketDepthUpdate = {
  sequenceNumber: Scalars['String'];
 };

-/** The specific details for a one-off governance transfer */
-export type OneOffGovernanceTransfer = {
-  __typename?: 'OneOffGovernanceTransfer';
-  /** An optional time when the transfer should be delivered */
-  deliverOn?: Maybe<Scalars['Timestamp']>;
-};
-
 /** The specific details for a one-off transfer */
 export type OneOffTransfer = {
  __typename?: 'OneOffTransfer';
@@ -2374,8 +2293,6 @@ export type Order = {
  createdAt: Scalars['Timestamp'];
  /** Expiration time of this order (ISO-8601 RFC3339+Nano formatted date) */
  expiresAt?: Maybe<Scalars['Timestamp']>;
-  /** Details of an iceberg order */
-  icebergOrder?: Maybe<IcebergOrder>;
  /** Hash of the order data */
  id: Scalars['ID'];
  /** The liquidity provision this order was created from */
@@ -2620,35 +2537,6 @@ export enum OrderStatus {
  STATUS_STOPPED = 'STATUS_STOPPED'
 }

-/** Details of the order that will be submitted when the stop order is triggered. */
-export type OrderSubmission = {
-  __typename?: 'OrderSubmission';
-  /** Expiration time of this order (ISO-8601 RFC3339+Nano formatted date) */
-  expiresAt: Scalars['Timestamp'];
-  /** Details of an iceberg order */
-  icebergOrder?: Maybe<IcebergOrder>;
-  /** Market the order is for. */
-  marketId: Scalars['ID'];
-  /** PeggedOrder contains the details about a pegged order */
-  peggedOrder?: Maybe<PeggedOrder>;
-  /** Is this a post only order */
-  postOnly?: Maybe<Scalars['Boolean']>;
-  /** The worst price the order will trade at (e.g. buy for price or less, sell for price or more) (uint64) */
-  price: Scalars['String'];
-  /** Is this a reduce only order */
-  reduceOnly?: Maybe<Scalars['Boolean']>;
-  /** The external reference (if available) for the order */
-  reference?: Maybe<Scalars['String']>;
-  /** Whether the order is to buy or sell */
-  side: Side;
-  /** Total number of units that may be bought or sold (immutable) (uint64) */
-  size: Scalars['String'];
-  /** The timeInForce of order (determines how and if it executes, and whether it persists on the book) */
-  timeInForce: OrderTimeInForce;
-  /** The order type */
-  type: OrderType;
-};
-
 /** Valid order types, these determine what happens when an order is added to the book */
 export enum OrderTimeInForce {
  /** Fill or Kill: The order either trades completely (remainingSize == 0 after adding) or not at all, does not remain on the book if it doesn't trade */
@@ -2688,8 +2576,6 @@ export type OrderUpdate = {
  createdAt: Scalars['Timestamp'];
  /** Expiration time of this order (ISO-8601 RFC3339+Nano formatted date) */
  expiresAt?: Maybe<Scalars['Timestamp']>;
-  /** Details of an iceberg order */
-  icebergOrder?: Maybe<IcebergOrder>;
  /** Hash of the order data */
  id: Scalars['ID'];
  /** The liquidity provision this order was created from */
@@ -3203,7 +3089,7 @@ export type Proposal = {
  votes: ProposalVotes;
 };

-export type ProposalChange = CancelTransfer | NewAsset | NewFreeform | NewMarket | NewTransfer | UpdateAsset | UpdateMarket | UpdateNetworkParameter;
+export type ProposalChange = NewAsset | NewFreeform | NewMarket | UpdateAsset | UpdateMarket | UpdateNetworkParameter;

 export type ProposalDetail = {
  __typename?: 'ProposalDetail';
@@ -3274,12 +3160,6 @@ export enum ProposalRejectionReason {
  PROPOSAL_ERROR_ENACT_TIME_TOO_SOON = 'PROPOSAL_ERROR_ENACT_TIME_TOO_SOON',
  /** The ERC-20 address specified by this proposal is already in use by another asset */
  PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE = 'PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE',
-  /** The proposal for cancellation of an active governance transfer has failed */
-  PROPOSAL_ERROR_GOVERNANCE_CANCEL_TRANSFER_PROPOSAL_INVALID = 'PROPOSAL_ERROR_GOVERNANCE_CANCEL_TRANSFER_PROPOSAL_INVALID',
-  /** The governance transfer proposal has failed */
-  PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_FAILED = 'PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_FAILED',
-  /** The governance transfer proposal is invalid */
-  PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_INVALID = 'PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_INVALID',
  /** Proposal terms timestamps are not compatible (Validation < Closing < Enactment) */
  PROPOSAL_ERROR_INCOMPATIBLE_TIMESTAMPS = 'PROPOSAL_ERROR_INCOMPATIBLE_TIMESTAMPS',
  /** The proposal is rejected because the party does not have enough equity like share in the market */
@@ -3304,10 +3184,6 @@ export enum ProposalRejectionReason {
  PROPOSAL_ERROR_INVALID_RISK_PARAMETER = 'PROPOSAL_ERROR_INVALID_RISK_PARAMETER',
  /** Market proposal has one or more invalid liquidity shapes */
  PROPOSAL_ERROR_INVALID_SHAPE = 'PROPOSAL_ERROR_INVALID_SHAPE',
-  /** Validation of spot market proposal failed */
-  PROPOSAL_ERROR_INVALID_SPOT = 'PROPOSAL_ERROR_INVALID_SPOT',
-  /** Validation of successor market has failed */
-  PROPOSAL_ERROR_INVALID_SUCCESSOR_MARKET = 'PROPOSAL_ERROR_INVALID_SUCCESSOR_MARKET',
  /** Proposal declined because the majority threshold was not reached */
  PROPOSAL_ERROR_MAJORITY_THRESHOLD_NOT_REACHED = 'PROPOSAL_ERROR_MAJORITY_THRESHOLD_NOT_REACHED',
  /** Market proposal is missing a liquidity commitment */
@@ -3623,12 +3499,6 @@ export type Query = {
  protocolUpgradeStatus?: Maybe<ProtocolUpgradeStatus>;
  /** Get statistics about the Vega node */
  statistics: Statistics;
-  /** Get stop order by ID */
-  stopOrder?: Maybe<StopOrder>;
-  /** Get a list of stop orders. If provided, the filter will be applied to the list of stop orders to restrict the results. */
-  stopOrders?: Maybe<StopOrderConnection>;
-  /** List markets in a succession line */
-  successorMarkets?: Maybe<SuccessorMarketConnection>;
  /** Get a list of all trades and apply any given filters to the results */
  trades?: Maybe<TradeConnection>;
  /** Get a list of all transfers for a public key */
@@ -3688,7 +3558,6 @@ export type QueryentitiesArgs = {

 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QueryepochArgs = {
-  block?: InputMaybe<Scalars['String']>;
  id?: InputMaybe<Scalars['ID']>;
 };

@@ -3934,27 +3803,6 @@ export type QueryprotocolUpgradeProposalsArgs = {
 };


-/** Queries allow a caller to read data and filter data via GraphQL. */
-export type QuerystopOrderArgs = {
-  id: Scalars['ID'];
-};
-
-
-/** Queries allow a caller to read data and filter data via GraphQL. */
-export type QuerystopOrdersArgs = {
-  filter?: InputMaybe<StopOrderFilter>;
-  pagination?: InputMaybe<Pagination>;
-};
-
-
-/** Queries allow a caller to read data and filter data via GraphQL. */
-export type QuerysuccessorMarketsArgs = {
-  fullHistory?: InputMaybe<Scalars['Boolean']>;
-  marketId: Scalars['ID'];
-  pagination?: InputMaybe<Pagination>;
-};
-
-
 /** Queries allow a caller to read data and filter data via GraphQL. */
 export type QuerytradesArgs = {
  dateRange?: InputMaybe<DateRange>;
@@ -3999,15 +3847,6 @@ export type RankingScore = {
  votingPower: Scalars['String'];
 };

-/** The specific details for a recurring governance transfer */
-export type RecurringGovernanceTransfer = {
-  __typename?: 'RecurringGovernanceTransfer';
-  /** An optional epoch at which this transfer will stop */
-  endEpoch?: Maybe<Scalars['Int']>;
-  /** The epoch at which this recurring transfer will start */
-  startEpoch: Scalars['Int'];
-};
-
 /** The specific details for a recurring transfer */
 export type RecurringTransfer = {
  __typename?: 'RecurringTransfer';
@@ -4343,117 +4182,6 @@ export type Statistics = {
  vegaTime: Scalars['Timestamp'];
 };

-/** A stop order in Vega */
-export type StopOrder = {
-  __typename?: 'StopOrder';
-  /** Time the stop order was created. */
-  createdAt: Scalars['Timestamp'];
-  /** Time at which the order will expire if an expiry time is set. */
-  expiresAt?: Maybe<Scalars['Timestamp']>;
-  /** If an expiry is set, what should the stop order do when it expires. */
-  expiryStrategy?: Maybe<StopOrderExpiryStrategy>;
-  /** Hash of the stop order data */
-  id: Scalars['ID'];
-  /** Market the stop order is for. */
-  marketId: Scalars['ID'];
-  /** If OCO (one-cancels-other) order, the ID of the associated order. */
-  ocoLinkId?: Maybe<Scalars['ID']>;
-  /** Party that submitted the stop order. */
-  partyId: Scalars['ID'];
-  /** Status of the stop order */
-  status: StopOrderStatus;
-  /** Order to submit when the stop order is triggered. */
-  submission: OrderSubmission;
-  /** Price movement that will trigger the stop order */
-  trigger?: Maybe<StopOrderTrigger>;
-  /** Direction the price is moving to trigger the stop order. */
-  triggerDirection: StopOrderTriggerDirection;
-  /** Time the stop order was last updated. */
-  updatedAt?: Maybe<Scalars['Timestamp']>;
-};
-
-/** Connection type for retrieving cursory-based paginated stop order information */
-export type StopOrderConnection = {
-  __typename?: 'StopOrderConnection';
-  /** The stop orders in this connection */
-  edges?: Maybe<Array<StopOrderEdge>>;
-  /** The pagination information */
-  pageInfo?: Maybe<PageInfo>;
-};
-
-/** Edge type containing the stop order and cursor information returned by a StopOrderConnection */
-export type StopOrderEdge = {
-  __typename?: 'StopOrderEdge';
-  /** The cursor for this stop order */
-  cursor?: Maybe<Scalars['String']>;
-  /** The stop order */
-  node?: Maybe<StopOrder>;
-};
-
-/** Valid stop order expiry strategies. The expiry strategy determines what happens to a stop order when it expires. */
-export enum StopOrderExpiryStrategy {
-  /** The stop order will be cancelled when it expires. */
-  EXPIRY_STRATEGY_CANCELS = 'EXPIRY_STRATEGY_CANCELS',
-  /** The stop order will be submitted when the expiry time is reached. */
-  EXPIRY_STRATEGY_SUBMIT = 'EXPIRY_STRATEGY_SUBMIT',
-  /** The stop order expiry strategy has not been specified by the trader. */
-  EXPIRY_STRATEGY_UNSPECIFIED = 'EXPIRY_STRATEGY_UNSPECIFIED'
-}
-
-/** Filter to be applied when querying a list of stop orders. If multiple criteria are specified, e.g. parties and markets, then the filter is applied as an AND. */
-export type StopOrderFilter = {
-  /** Date range to retrieve order from/to. Start and end time should be expressed as an integer value of nano-seconds past the Unix epoch */
-  dateRange?: InputMaybe<DateRange>;
-  /** Zero or more expiry strategies to filter by */
-  expiryStrategy?: InputMaybe<Array<StopOrderExpiryStrategy>>;
-  /** Zero or more market IDs to filter by */
-  markets?: InputMaybe<Array<Scalars['ID']>>;
-  /** Zero or more party IDs to filter by */
-  parties?: InputMaybe<Array<Scalars['ID']>>;
-  /** Zero or more order status to filter by */
-  status?: InputMaybe<Array<StopOrderStatus>>;
-};
-
-/** Price at which a stop order will trigger */
-export type StopOrderPrice = {
-  __typename?: 'StopOrderPrice';
-  price: Scalars['String'];
-};
-
-/** Valid stop order statuses, these determine several states for a stop order that cannot be expressed with other fields in StopOrder. */
-export enum StopOrderStatus {
-  /** Stop order has been cancelled. This could be by the trader or by the network. */
-  STATUS_CANCELLED = 'STATUS_CANCELLED',
-  /** Stop order has expired. This means the trigger conditions have not been met and the stop order has expired. */
-  STATUS_EXPIRED = 'STATUS_EXPIRED',
-  /** Stop order is pending. This means the stop order has been accepted in the network, but the trigger conditions have not been met. */
-  STATUS_PENDING = 'STATUS_PENDING',
-  /** Stop order has been rejected. This means the stop order was not accepted by the network. */
-  STATUS_REJECTED = 'STATUS_REJECTED',
-  /** Stop order has been stopped. This means the trigger conditions have been met, but the stop order was not executed, and stopped. */
-  STATUS_STOPPED = 'STATUS_STOPPED',
-  /** Stop order has been triggered. This means the trigger conditions have been met, and the stop order was executed. */
-  STATUS_TRIGGERED = 'STATUS_TRIGGERED',
-  /** Stop order has been submitted to the network but does not have a status yet */
-  STATUS_UNSPECIFIED = 'STATUS_UNSPECIFIED'
-}
-
-/** Percentage movement in the price at which a stop order will trigger. */
-export type StopOrderTrailingPercentOffset = {
-  __typename?: 'StopOrderTrailingPercentOffset';
-  trailingPercentOffset: Scalars['String'];
-};
-
-export type StopOrderTrigger = StopOrderPrice | StopOrderTrailingPercentOffset;
-
-/** Valid stop order trigger direction. The trigger direction determines whether the price should rise above or fall below the stop order trigger. */
-export enum StopOrderTriggerDirection {
-  /** The price should fall below the trigger. */
-  TRIGGER_DIRECTION_FALLS_BELOW = 'TRIGGER_DIRECTION_FALLS_BELOW',
-  /** The price should rise above the trigger. */
-  TRIGGER_DIRECTION_RISES_ABOVE = 'TRIGGER_DIRECTION_RISES_ABOVE'
-}
-
 /** Subscriptions allow a caller to receive new information as it is available from the Vega network. */
 export type Subscription = {
  __typename?: 'Subscription';
@@ -4586,40 +4314,6 @@ export type SubscriptionvotesArgs = {
  proposalId?: InputMaybe<Scalars['ID']>;
 };

-export type SuccessorConfiguration = {
-  __typename?: 'SuccessorConfiguration';
-  /** Decimal value between 0 and 1, specifying the fraction of the insurance pool balance is carried over from the parent market to the successor. */
-  insurancePoolFraction: Scalars['String'];
-  /** ID of the market this proposal will succeed */
-  parentMarketId: Scalars['String'];
-};
-
-export type SuccessorMarket = {
-  __typename?: 'SuccessorMarket';
-  /** The market */
-  market: Market;
-  /** Proposals for child markets */
-  proposals?: Maybe<Array<Maybe<Proposal>>>;
-};
-
-/** Connection type for retrieving cursor-based paginated market information */
-export type SuccessorMarketConnection = {
-  __typename?: 'SuccessorMarketConnection';
-  /** The markets in this connection */
-  edges: Array<SuccessorMarketEdge>;
-  /** The pagination information */
-  pageInfo: PageInfo;
-};
-
-/** Edge type containing the market and cursor information returned by a MarketConnection */
-export type SuccessorMarketEdge = {
-  __typename?: 'SuccessorMarketEdge';
-  /** The cursor for this market */
-  cursor: Scalars['String'];
-  /** The market */
-  node: SuccessorMarket;
-};
-
 /** TargetStakeParameters contains parameters used in target stake calculation */
 export type TargetStakeParameters = {
  __typename?: 'TargetStakeParameters';
@@ -4852,7 +4546,7 @@ export type TransferEdge = {
  node: Transfer;
 };

-export type TransferKind = OneOffGovernanceTransfer | OneOffTransfer | RecurringGovernanceTransfer | RecurringTransfer;
+export type TransferKind = OneOffTransfer | RecurringTransfer;

 export type TransferResponse = {
  __typename?: 'TransferResponse';
@@ -4899,10 +4593,6 @@ export enum TransferType {
  TRANSFER_TYPE_CLEAR_ACCOUNT = 'TRANSFER_TYPE_CLEAR_ACCOUNT',
  /** Funds deposited to general account */
  TRANSFER_TYPE_DEPOSIT = 'TRANSFER_TYPE_DEPOSIT',
-  /** An internal instruction to transfer a quantity corresponding to an active spot order from a general account into a party holding account */
-  TRANSFER_TYPE_HOLDING_LOCK = 'TRANSFER_TYPE_HOLDING_LOCK',
-  /** An internal instruction to transfer an excess quantity corresponding to an active spot order from a holding account into a party general account */
-  TRANSFER_TYPE_HOLDING_RELEASE = 'TRANSFER_TYPE_HOLDING_RELEASE',
  /** Infrastructure fee received into general account */
  TRANSFER_TYPE_INFRASTRUCTURE_FEE_DISTRIBUTE = 'TRANSFER_TYPE_INFRASTRUCTURE_FEE_DISTRIBUTE',
  /** Infrastructure fee paid from general account */
@@ -4929,8 +4619,6 @@ export enum TransferType {
  TRANSFER_TYPE_MTM_WIN = 'TRANSFER_TYPE_MTM_WIN',
  /** Reward payout received */
  TRANSFER_TYPE_REWARD_PAYOUT = 'TRANSFER_TYPE_REWARD_PAYOUT',
-  /** Spot trade delivery */
-  TRANSFER_TYPE_SPOT = 'TRANSFER_TYPE_SPOT',
  /** A network internal instruction for the collateral engine to move funds from the pending transfers pool account into the destination account */
  TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE = 'TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE',
  /** A network internal instruction for the collateral engine to move funds from a user's general account into the pending transfers pool */
@@ -321,15 +321,6 @@ export const ProposalRejectionReasonMapping: {
  PROPOSAL_ERROR_UNSUPPORTED_TRADING_MODE: 'Unsupported trading mode',
  PROPOSAL_ERROR_ERC20_ADDRESS_ALREADY_IN_USE:
    'ERC20 address already in use by an existing asset',
-  PROPOSAL_ERROR_GOVERNANCE_CANCEL_TRANSFER_PROPOSAL_INVALID:
-    'PROPOSAL_ERROR_GOVERNANCE_CANCEL_TRANSFER_PROPOSAL_INVALID',
-  PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_FAILED:
-    'PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_FAILED',
-  PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_INVALID:
-    'PROPOSAL_ERROR_GOVERNANCE_TRANSFER_PROPOSAL_INVALID',
-  PROPOSAL_ERROR_INVALID_SPOT: 'PROPOSAL_ERROR_INVALID_SPOT',
-  PROPOSAL_ERROR_INVALID_SUCCESSOR_MARKET:
-    'PROPOSAL_ERROR_INVALID_SUCCESSOR_MARKET',
 };

 /**
@@ -428,9 +419,6 @@ export const TransferTypeMapping: TransferTypeMap = {
  TRANSFER_TYPE_TRANSFER_FUNDS_DISTRIBUTE: 'Transfer received',
  TRANSFER_TYPE_CLEAR_ACCOUNT: 'Market accounts cleared',
  TRANSFER_TYPE_CHECKPOINT_BALANCE_RESTORE: 'Balances restored',
-  TRANSFER_TYPE_HOLDING_LOCK: 'TRANSFER_TYPE_HOLDING_LOCK',
-  TRANSFER_TYPE_HOLDING_RELEASE: 'TRANSFER_TYPE_HOLDING_RELEASE',
-  TRANSFER_TYPE_SPOT: 'TRANSFER_TYPE_SPOT',
 };

 export const DescriptionTransferTypeMapping: TransferTypeMap = {
@@ -458,9 +446,6 @@ export const DescriptionTransferTypeMapping: TransferTypeMap = {
  TRANSFER_TYPE_CLEAR_ACCOUNT: `Market-related accounts emptied, and balances moved, because the market has closed`,
  TRANSFER_TYPE_UNSPECIFIED: 'Default value, always invalid',
  TRANSFER_TYPE_CHECKPOINT_BALANCE_RESTORE: `Balances are being restored to the user's account following a checkpoint restart of the network`,
-  TRANSFER_TYPE_HOLDING_LOCK: '-',
-  TRANSFER_TYPE_HOLDING_RELEASE: '-',
-  TRANSFER_TYPE_SPOT: '-',
 };

 type DispatchMetricLabel = {
@@ -30,14 +30,14 @@ const primary = [
  'enabled:active:bg-vega-yellow-550 enabled:active:border-vega-yellow-550',
 ];
 const secondary = [
-  'text-white',
+  'text-white dark:text-black',
  'border-vega-pink',
  'dark:bg-vega-pink bg-vega-pink-550',
  'enabled:hover:bg-vega-pink enabled:hover:border-vega-pink',
  'enabled:active:bg-vega-pink enabled:active:border-vega-pink',
 ];
 const ternary = [
-  'text-black',
+  'text-white dark:text-black',
  'border-vega-green',
  'dark:bg-vega-green bg-vega-green-550',
  'enabled:hover:bg-vega-green enabled:hover:border-vega-green',
@@ -15,13 +15,6 @@ Default.args = {
  label: 'Regular checkbox',
 };

-export const Overflow = Template.bind({});
-Overflow.args = {
-  name: 'overflow',
-  label:
-    'Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.',
-};
-
 export const Disabled = Template.bind({});
 Disabled.args = {
  disabled: true,
@@ -20,7 +20,7 @@ export const Checkbox = ({
  disabled = false,
 }: CheckboxProps) => {
  const rootClasses = classNames(
-    'relative flex justify-center items-center w-[15px] h-[15px] mt-1',
+    'relative flex justify-center items-center w-[15px] h-[15px]',
    'border rounded-sm overflow-hidden',
    {
      'opacity-40 cursor-default': disabled,
@@ -30,7 +30,7 @@ export const Checkbox = ({
  );

  return (
-    <div className="flex gap-1">
+    <div className="flex gap-1 items-center">
      <CheckboxPrimitive.Root
        name={name}
        id={name}
@@ -45,7 +45,7 @@ export function Dialog({
    'dark:bg-black bg-white dark:text-white',
    getIntentBorder(intent),
    {
-      'w-[520px]': size === 'small',
+      'w-[620px]': size === 'small',
      'w-[720px] lg:w-[940px]': size === 'medium',
    }
  );
@@ -77,7 +77,7 @@ export function Dialog({
                className="absolute p-2 top-0 right-0 md:top-2 md:right-2"
                data-testid="dialog-close"
              >
-                <VegaIcon name={VegaIconNames.CROSS} size={24} />
+                <VegaIcon name={VegaIconNames.CROSS} />
              </DialogPrimitives.Close>
            )}
            <div className="flex gap-4 max-w-full">
@@ -74,11 +74,11 @@ export const DropdownMenuContent = forwardRef<
  React.ComponentProps<typeof DropdownMenuPrimitive.Content>
 >(({ className, ...contentProps }, forwardedRef) => (
  <DropdownMenuPrimitive.Content
+    {...contentProps}
    ref={forwardedRef}
-    sideOffset={10}
    className="min-w-[290px] bg-vega-light-100 dark:bg-vega-dark-100 p-2 rounded z-20 text-black dark:text-white border border-vega-light-200 dark:border-vega-dark-200"
    align="start"
-    {...contentProps}
+    sideOffset={10}
  />
 ));

@@ -8,11 +8,10 @@ export const defaultFormElement = (hasError?: boolean) =>
    'flex items-center w-full text-sm',
    'p-2 border-2 rounded',
    'bg-transparent',
-    'border',
+    'border border-vega-light-200 dark:border-vega-dark-200',
    'focus:border-vega-light-300 dark:focus:border-vega-dark-300',
    'disabled:opacity-60',
    {
-      'border-vega-pink text-vega-pink': hasError,
-      'border-vega-light-200 dark:border-vega-dark-200': !hasError,
+      'border-vega-pink': hasError,
    }
  );
@@ -47,6 +47,10 @@ export interface OrderSubmission {
  expiresAt?: string;
  postOnly?: boolean;
  reduceOnly?: boolean;
+  icebergOpts?: {
+    peakSize: string;
+    minimumVisibleSize: string;
+  };
 }

 export interface OrderCancellation {
@@ -31,7 +31,14 @@ export function useEagerConnect(Connectors: {
        return;
      }
      try {
-        await connect(Connectors[cfg.connector]);
+        if (cfg.connector === 'injected') {
+          const injectedInstance = Connectors[cfg.connector];
+          // @ts-ignore only injected wallet has connectWallet method
+          await injectedInstance.connectWallet();
+          await connect(injectedInstance);
+        } else {
+          await connect(Connectors[cfg.connector]);
+        }
      } catch {
        console.warn(`Failed to connect with connector: ${cfg.connector}`);
      } finally {
@@ -0,0 +1,110 @@
+from os import environ
+from subprocess import check_output
+from argparse import ArgumentParser
+import json
+
+projects = []
+projects_e2e = []
+
+previews = {
+  'governance': 'not deployed',
+  'explorer': 'not deployed',
+  'trading': 'not deployed',
+  'tools': 'not deployed',
+}
+
+main_apps = ['governance', 'explorer', 'trading']
+
+preview_governance="not deployed"
+preview_trading="not deployed"
+preview_explorer="not deployed"
+preview_tools="not deployed"
+
+# take input from the pipeline
+parser = ArgumentParser()
+
+# let's generate slug from bash spell for now
+parser.add_argument('--branch-slug', help='slug of branch')
+parser.add_argument('--github-ref', help='current github ref')
+parser.add_argument('--event-name', help='name of event in CI')
+args = parser.parse_args()
+
+# run yarn affected command
+affected=check_output(f'yarn nx print-affected --base={environ["NX_BASE"]} --head={environ["NX_HEAD"]} --select=projects'.split()).decode('utf-8')
+
+
+# print useful information
+print(">>>> debug")
+print(f"NX_BASE: { environ['NX_BASE'] }")
+print(f"NX_HEAD: { environ['NX_HEAD'] }")
+print(f"Branch slug: {args.branch_slug}")
+print(f"Current ref: {args.github_ref}")
+print(">> Affected output")
+print(affected)
+print(">>>> eof debug")
+
+# define affection actions -> add to projects arrays and generate preview link
+def affect_app(app, preview_name=None):
+  print(f"{app} is affected")
+  projects.append(app)
+  if not preview_name:
+    preview_name=app
+  previews[app] = f'https://{preview_name}.{args.branch_slug}.vega.rocks'
+
+# check appearance in the affected string for main apps
+for app in main_apps:
+  if app in affected:
+    affect_app(app)
+
+# if non of main apps is affected - test all of them
+if not projects:
+  for app in main_apps:
+    affect_app(app)
+
+# generate e2e targets
+projects_e2e = [f'{app}-e2e' for app in projects]
+
+# check affection for multisig-signer which is deployed only from develop and pull requests
+if args.event_name == 'pull_request' or 'develop' in args.github_ref:
+  if 'multisig-signer' in affected:
+    affect_app('multisig-signer', 'tools')
+
+# now parse apps that are deployed from develop but don't have previews
+if 'develop' in args.github_ref:
+  for app in ['static', 'ui-toolkit']:
+    if app in affected:
+      projects.append(app)
+
+# if ref is in format release/{env}-{app} then only {app} is deployed
+if 'release' in args.github_ref:
+  for app in main_apps:
+    if f'{args.github_ref}'.endswith(app):
+      projects = [app]
+      projects_e2e = [f'{app}-e2e']
+
+
+projects = json.dumps(projects)
+projects_e2e = json.dumps(projects_e2e)
+
+print(f'Projects: {projects}')
+print(f'Projects E2E: {projects_e2e}')
+
+print('>> Previews')
+for preview, preview_value in previews.items():
+  print(f'{preview}: {preview_value}')
+print('>> EOF Previews')
+
+
+lines_to_write = [
+  f'PREVIEW_GOVERNANCE={previews["governance"]}',
+  f'PREVIEW_EXPLORER={previews["explorer"]}',
+  f'PREVIEW_TRADING={previews["trading"]}',
+  f'PREVIEW_TOOLS={previews["tools"]}',
+  f'PROJECTS={projects}',
+  f'PROJECTS_E2E={projects_e2e}',
+]
+env_file = environ['GITHUB_ENV']
+print(f'Line to add to GITHUB_ENV file: {env_file}')
+print(lines_to_write)
+with open(env_file, 'a') as _f:
+  _f.write('\n'.join(lines_to_write))
@@ -0,0 +1,61 @@
+from argparse import ArgumentParser
+from os import environ
+
+# take input from the pipeline
+parser = ArgumentParser()
+
+# let's generate slug from bash spell for now
+parser.add_argument('--github-ref', help='current github ref')
+parser.add_argument('--app', help='current app')
+args = parser.parse_args()
+
+env_name = ''
+domain = 'vega.rocks'
+bucket_name = ''
+
+if 'release/' in args.github_ref:
+  # remove prefixing release/ and take the first string limited by - which is supposed to be name of the environment for releasing (format: release/testnet-trading)
+  env_name = args.github_ref.replace('refs/heads/release/', '').split('-')[0]
+elif 'develop' in args.github_ref:
+  env_name = 'stagnet1'
+  apps_deployed_from_develop_to_mainnet = {
+    'multisig-signer' :'tools.vega.xyz',
+    'static': 'static.vega.xyz',
+    'ui-toolkit' : 'ui.vega.rocks',
+  }
+  if args.app in apps_deployed_from_develop_to_mainnet:
+    env_name = 'mainnet'
+    bucket_name = apps_deployed_from_develop_to_mainnet[args.app]
+# endswith to avoid confusion with mirror env
+elif args.github_ref.endswith('mainnet'):
+  env_name = 'mainnet'
+
+
+other_domains_to_deploy = {
+  'mainnet': 'vega.xyz',
+  'testnet': 'fairground.wtf',
+}
+
+if env_name in other_domains_to_deploy:
+  domain = other_domains_to_deploy[env_name]
+  if not bucket_name:
+    bucket_name = f'{args.app}.{domain}'
+
+# testing envs on vega.rocks contain env_name in the url not like testnet / mainnet
+if not bucket_name:
+  bucket_name = f'{args.app}.{env_name}.{domain}'
+
+print(f'env name: {env_name}')
+print(f'domain: {domain}')
+print(f'bucket name: {bucket_name}')
+
+lines_to_write = [
+  f'ENV_NAME={env_name}',
+  f'BUCKET_NAME={bucket_name}',
+]
+
+env_file = environ['GITHUB_ENV']
+print(f'Line to add to GITHUB_ENV file: {env_file}')
+print(lines_to_write)
+with open(env_file, 'a') as _f:
+  _f.write('\n'.join(lines_to_write))