chore: update the PM action secret token

feat(ci): provide fixes for releasing individual apps
fix(ci): disable pull_request_target (#4315 )
2023-07-13 20:53:48 +01:00 · 2023-07-13 16:10:07 +02:00 · 2023-07-13 11:19:37 +02:00 · 2023-07-13 10:10:48 +01:00 · 2023-07-12 17:47:46 +02:00 · 2023-07-12 17:37:49 +02:00
108 changed files with 2322 additions and 1014 deletions
@@ -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 }}
@@ -5,10 +5,7 @@ on:
    branches:
      - release/*
      - develop
-      - main
-  # uncomment pull_request and comment pull_request_target to test CI changes against feature branch not target branch (develop)
-  # pull_request:
-  pull_request_target:
+  pull_request:
    types:
      - opened
      - ready_for_review
@@ -49,7 +46,7 @@ jobs:

  lint-pr-title:
    needs: node-modules
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' }}
    name: Verify PR title
    uses: ./.github/workflows/lint-pr.yml
    secrets: inherit
@@ -110,6 +107,7 @@ jobs:
          echo "NX_HEAD: ${{ env.NX_HEAD }}"
          echo "Affected: ${affected}"
          echo "Branch slug: ${branch_slug}"
+          echo "Current ref: ${{ github.ref }}"
          echo ">>>> eof debug"

          projects_array=()
@@ -180,6 +178,31 @@ jobs:
            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[@]}")
@@ -214,7 +237,7 @@ jobs:
  publish-dist:
    needs: lint-test-build
    name: '(CD) publish dist'
-    # if: ${{ needs.lint-test-build.outputs.projects != '[]' }}
+    if: ${{ (github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo') || github.event_name == 'push' }}
    uses: ./.github/workflows/publish-dist.yml
    secrets: inherit
    with:
@@ -225,7 +248,7 @@ jobs:
    needs:
      - publish-dist
      - lint-test-build
-    if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+    if: ${{ github.event_name == 'pull_request' &&  github.event.pull_request.head.repo.full_name == 'vegaprotocol/frontend-monorepo' }}
    timeout-minutes: 60
    name: '(CD) comment preview links'
    steps:
@@ -241,26 +264,26 @@ jobs:
          # https://stackoverflow.com/questions/3183444/check-for-valid-link-url
          regex='(https?|ftp|file)://[-[:alnum:]\+&@#/%?=~_|!:,.;]*[-[:alnum:]\+&@#/%=~_|]'
          if [[ "${{ needs.lint-test-build.outputs.preview_governance }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
-              echo "waiting for governance preview"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_governance }}"; do
+              echo "waiting for governance preview: ${{ needs.lint-test-build.outputs.preview_governance }}"
              sleep 5
            done
          fi
          if [[ "${{ needs.lint-test-build.outputs.preview_explorer }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
-              echo "waiting for explorer preview"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_explorer }}"; do
+              echo "waiting for explorer preview: ${{ needs.lint-test-build.outputs.preview_explorer }}"
              sleep 5
            done
          fi
          if [[ "${{ needs.lint-test-build.outputs.preview_trading }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
-              echo "waiting for trading preview"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_trading }}"; do
+              echo "waiting for trading preview: ${{ needs.lint-test-build.outputs.preview_trading }}"
              sleep 5
            done
          fi
          if [[ "${{ needs.lint-test-build.outputs.preview_tools }}" =~ $regex ]]; then
-            until curl -L --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
-              echo "waiting for tools preview"
+            until curl --insecure --location --fail "${{ needs.lint-test-build.outputs.preview_tools }}"; do
+              echo "waiting for tools preview: ${{ needs.lint-test-build.outputs.preview_tools }}"
              sleep 5
            done
          fi
@@ -271,7 +294,7 @@ jobs:
        with:
          issue-number: ${{ github.event.pull_request.number }}
          body: |
-            Previews:
+            Previews
            * governance: ${{ needs.lint-test-build.outputs.preview_governance }}
            * explorer: ${{ needs.lint-test-build.outputs.preview_explorer  }}
            * trading: ${{ needs.lint-test-build.outputs.preview_trading }}
@@ -0,0 +1,59 @@
+name: console-test-run
+on:
+  workflow_call:
+    inputs:
+      github-sha:
+        required: true
+        type: string
+jobs:
+  console-test:
+    timeout-minutes: 5
+    runs-on: self-hosted-runner
+    steps:
+      - name: Checkout console test repo
+        uses: actions/checkout@v3
+        with:
+          repository: vegaprotocol/console-test
+          path: './console-test'
+
+      - name: Set up Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10.11'
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+
+      - 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
+        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
+
+      - name: install playwright
+        run: poetry run playwright install
+        working-directory: ./console-test
+
+      - name: run tests
+        run: poetry run pytest --numprocesses auto
+        working-directory: ./console-test
+
+      - name: Upload Playwright Trace
+        uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-trace
+          path: ./traces/
+          retention-days: 15
@@ -22,6 +22,33 @@ jobs:
        with:
          ref: ${{ github.event.pull_request.head.sha || github.sha }}

+      - name: Init variables
+        run: |
+          echo IS_PR=false >> $GITHUB_ENV
+          echo IS_MAINNET_RELEASE=false >> $GITHUB_ENV
+          echo IS_TESTNET_RELEASE=false >> $GITHUB_ENV
+          echo IS_IPFS_RELEASE=false >> $GITHUB_ENV
+
+      - name: Is PR
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          echo IS_PR=true >> $GITHUB_ENV
+
+      - name: Is mainnet release
+        if: ${{ contains(github.ref, 'release/mainnnet') && !contains(github.ref, 'mirror') }}
+        run: |
+          echo IS_MAINNET_RELEASE=true >> $GITHUB_ENV
+
+      - name: Is testnet release
+        if: ${{ contains(github.ref, 'release/testnet') }}
+        run: |
+          echo IS_TESTNET_RELEASE=true >> $GITHUB_ENV
+
+      - name: Is IPFS Release
+        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( env.IS_MAINNET_RELEASE == 'true' || env.IS_TESTNET_RELEASE == 'true' ) }}
+        run: |
+          echo IS_IPFS_RELEASE=true >> $GITHUB_ENV
+
      - name: Set up QEMU
        id: quemu
        uses: docker/setup-qemu-action@v2
@@ -33,7 +60,7 @@ jobs:
        uses: docker/setup-buildx-action@v2

      - name: Log in to the Container registry (ghcr)
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ env.IS_PR == 'true' }}
        uses: docker/login-action@v2
        with:
          registry: ghcr.io
@@ -42,9 +69,8 @@ jobs:

      - name: Log in to the Container registry (docker hub)
        uses: docker/login-action@v2
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        with:
-          # registry: registry.hub.docker.com
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

@@ -70,7 +96,8 @@ jobs:
          bucketName=''

          if [[ "${{ github.ref }}" =~ .*release/.* ]]; then
-            envName="$(echo ${{ github.ref }} | rev | cut -d '/' -f 1 | rev)"
+            # 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
@@ -85,7 +112,7 @@ jobs:
              envName="mainnet"
              bucketName="ui.vega.rocks"
            fi
-          elif [[ "${{ github.ref }}" =~ .*main$ ]]; then
+          elif [[ "${{ github.ref }}" =~ .*mainnet$ ]]; then
            envName="mainnet"
          fi

@@ -145,7 +172,7 @@ jobs:
            ghcr.io/vegaprotocol/frontend/${{ matrix.app }}:local

      - name: Image digest
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ env.IS_PR == 'true' }}
        run: echo ${{ steps.docker_build.outputs.digest }}

      - name: Sanity check docker image
@@ -160,7 +187,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: ghcr-push
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ env.IS_PR == 'true' }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -175,7 +202,7 @@ jobs:
        uses: docker/build-push-action@v3
        continue-on-error: true
        id: dockerhub-push
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        with:
          context: .
          file: docker/node-outside-docker.Dockerfile
@@ -185,7 +212,7 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}

      - name: Publish dist as docker image (ghcr - retry)
        uses: docker/build-push-action@v3
@@ -212,13 +239,13 @@ jobs:
            ENV_NAME=${{ env.ENV_NAME }}
          tags: |
            vegaprotocol/${{ matrix.app }}:${{ github.sha }}
-            vegaprotocol/${{ matrix.app }}:${{ endsWith(github.ref, 'main') && 'mainnet' || endsWith(github.ref, 'release/testnet') && 'testnet' || '' }}
+            vegaprotocol/${{ matrix.app }}:${{ env.IS_MAINNET_RELEASE == 'true' && 'mainnet' || env.IS_TESTNET_RELEASE == 'true' && 'testnet' || '' }}

      # bucket creation in github.com/vegaprotocol/terraform//frontend
      - name: Publish dist to s3
        uses: jakejarvis/s3-sync-action@master
        # s3 releases are not happening for trading on mainnet - it's IPFS
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' }}
        with:
          args: --acl private --follow-symlinks --delete
        env:
@@ -229,11 +256,11 @@ jobs:
          SOURCE_DIR: 'dist-result'

      - name: Install aws CLI
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' }}
        uses: unfor19/install-aws-cli-action@master

      - name: Perform cache invalidation
-        if: ${{ github.event_name == 'push' && ( matrix.app != 'trading' || (matrix.app == 'trading' && !( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) ) ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'false' }}
        env:
          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -246,16 +273,16 @@ jobs:

      - name: Add preview label
        uses: actions-ecosystem/action-add-labels@v1
-        if: ${{ github.event_name == 'pull_request' || github.event_name == 'pull_request_target' }}
+        if: ${{ env.IS_PR == 'true' }}
        with:
          labels: ${{ matrix.app }}-preview
          number: ${{ github.event.number }}

      - name: Trigger fleek deployment
        # release to ipfs happens only on mainnet (represented by main branch) for trading
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'release/testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        run: |
-          if echo ${{ github.ref }} | grep -q main; then
+          if [[ "${{ env.IS_MAINNET_RELEASE }}" = "true" ]]; then
            # display info about app
            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
              -H "Content-Type: application/json" \
@@ -268,7 +295,7 @@ jobs:
              -d '{"query": "mutation{triggerDeploy(siteId:\"f8f2e051-f18e-49e6-b876-0a39369dc0d8\"){id status}}"}' \
              https://api.fleek.co/graphql

-          elif echo ${{ github.ref }} | grep -q release/testnet; then
+          elif [[ "${{ env.IS_TESTNET_RELEASE }}" = "true" ]]; then
            # display info about app
            curl --fail -H "Authorization: ${{ secrets.FLEEK_API_KEY }}" \
              -H "Content-Type: application/json" \
@@ -283,7 +310,7 @@ jobs:
          fi

      - name: Check out ipfs-redirect
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        uses: actions/checkout@v3
        with:
          repository: 'vegaprotocol/ipfs-redirect'
@@ -292,7 +319,7 @@ jobs:
          token: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}

      - name: Update interstitial page to point to the new console
-        if: ${{ matrix.app == 'trading' && github.event_name == 'push' && ( endsWith(github.ref, 'main') || endsWith(github.ref, 'testnet') ) }}
+        if: ${{ env.IS_IPFS_RELEASE == 'true' }}
        env:
          GH_TOKEN: ${{ secrets.VEGA_CI_BOT_GITHUB_TOKEN }}
        run: |
@@ -314,11 +341,11 @@ jobs:
            git config --global user.name "vega-ci-bot"

            # update CID files
-            if echo ${{ github.ref }} | grep -q main; then
+            if [[ "${{ env.IS_MAINNET_RELEASE }}" = "true" ]]; then
              echo $new_hash > cidv0-mainnet.txt
              echo $new_cid > cidv1-mainnet.txt
              git add cidv0-mainnet.txt cidv1-mainnet.txt
-            elif echo ${{ github.ref }} | grep -q release/testnet; then
+            elif [[ "${{ env.IS_TESTNET_RELEASE }}" = "true" ]]; then
              echo $new_hash > cidv0-fairground.txt
              echo $new_cid > cidv1-fairground.txt
              git add cidv0-fairground.txt cidv1-fairground.txt
@@ -31,7 +31,7 @@ context('Asset page', { tags: '@regression' }, () => {
      });
    });

-    it('should open details page when clicked on "View details"', () => {
+    it.skip('should open details page when clicked on "View details"', () => {
      cy.getAssets().then((assets) => {
        assets.forEach((asset) => {
          cy.get(`[row-id="${asset.id}"] [col-id="actions"] button`)
@@ -27,11 +27,6 @@ context('Home Page', function () {
        16: 'Chain ID',
      };

-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.get('[data-testid="stats-title"]')
        .each(($list, index) => {
          cy.wrap($list).should('contain.text', statTitles[index]);
@@ -34,11 +34,6 @@ context('Network parameters page', { tags: '@smoke' }, function () {
          const parameterName = network_parameter[0];
          const parameterValue = network_parameter[1];
          if (this.networkParameterFormat.json.includes(parameterName)) {
-            /**
-             * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-             * You should use .then() to chain commands instead.
-             * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-             **/
            cy.get(tableRows)
              .contains(parameterName)
              .should('be.visible')
@@ -70,11 +65,6 @@ context('Network parameters page', { tags: '@smoke' }, function () {
          if (this.networkParameterFormat.percentage.includes(parameterName)) {
            const formattedPercentageParameter =
              (parseFloat(parameterValue) * 100).toFixed(0) + '%';
-            /**
-             * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-             * You should use .then() to chain commands instead.
-             * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-             **/
            cy.get(tableRows)
              .contains(parameterName)
              .should('be.visible')
@@ -158,11 +148,6 @@ context('Network parameters page', { tags: '@smoke' }, function () {
            cy.convert_number_to_max_four_decimal(parameterValue)
              .add_commas_to_number_if_large_enough()
              .then((parameterValueFormatted) => {
-                /**
-                 * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-                 * You should use .then() to chain commands instead.
-                 * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-                 **/
                cy.get(tableRows)
                  .contains(parameterName)
                  .should('be.visible')
@@ -194,11 +179,6 @@ context('Network parameters page', { tags: '@smoke' }, function () {
            cy.convert_number_to_max_eighteen_decimal(parameterValue)
              .add_commas_to_number_if_large_enough()
              .then((parameterValueFormatted) => {
-                /**
-                 * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-                 * You should use .then() to chain commands instead.
-                 * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-                 **/
                cy.get(tableRows)
                  .contains(parameterName)
                  .should('be.visible')
@@ -169,12 +169,6 @@ context.skip('Parties page', { tags: '@regression' }, function () {
      const jsonFields = '.hljs';
      const sideMenuBackground = '.absolute';

-      // Engage dark mode if not allready set
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.get(sideMenuBackground)
        .should('have.css', 'background-color')
        .then((background_color) => {
@@ -60,31 +60,16 @@ context.skip('Transactions page', function () {
            });
          cy.get('block').should('not.be.empty');
          cy.get('encoded-tnx').should('not.be.empty');
-          /**
-           * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-           * You should use .then() to chain commands instead.
-           * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-           **/
          cy.get('tx-type')
            .should('not.be.empty')
            .invoke('text')
            .then((txTypeTxt) => {
              if (txTypeTxt == 'Order Submission') {
-                /**
-                 * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-                 * You should use .then() to chain commands instead.
-                 * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-                 **/
                cy.get('.hljs-attr')
                  .should('have.length.at.least', 8)
                  .each(($propertyName) => {
                    cy.wrap($propertyName).should('not.be.empty');
                  });
-                /**
-                 * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-                 * You should use .then() to chain commands instead.
-                 * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-                 **/
                cy.get('.hljs-string')
                  .should('have.length.at.least', 8)
                  .each(($propertyValue) => {
@@ -1,5 +1,5 @@
 # App configuration variables
-NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/tm
+NX_TENDERMINT_URL=https://tm.be.devnet1.vega.xyz/
 NX_TENDERMINT_WEBSOCKET_URL=wss://be.devnet1.vega.xyz/websocket
 NX_VEGA_CONFIG_URL=https://raw.githubusercontent.com/vegaprotocol/networks-internal/main/devnet1/vegawallet-devnet1.toml
 NX_VEGA_ENV=DEVNET
@@ -77,7 +77,7 @@
      "executor": "nx:run-commands",
      "options": {
        "commands": [
-          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/main/specs/v0.71.4/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
+          "npx openapi-typescript https://raw.githubusercontent.com/vegaprotocol/documentation/spec-update-v0.72.0-preview.2/specs/v0.72.0-preview.2/blockexplorer.openapi.json --output apps/explorer/src/types/explorer.d.ts --immutable-types"
        ]
      }
    },
@@ -6,10 +6,32 @@ import {
  SPECIAL_CASE_NETWORK_ID,
 } from '../../../../links/party-link/party-link';
 import SizeInAsset from '../../../../size-in-asset/size-in-asset';
-import { AccountTypeMapping } from '@vegaprotocol/types';
-import { AccountType } from '@vegaprotocol/types';
 import { headerClasses, wrapperClasses } from '../transfer-details';
-import type { Transfer } from '../transfer-details';
+import type { components } from '../../../../../../types/explorer';
+
+type Transfer = components['schemas']['commandsv1Transfer'];
+type AccountTypes = components['schemas']['vegaAccountType'];
+
+const AccountType: Record<AccountTypes, string> = {
+  ACCOUNT_TYPE_UNSPECIFIED: 'Unspecified',
+  ACCOUNT_TYPE_INSURANCE: 'Insurance',
+  ACCOUNT_TYPE_SETTLEMENT: 'Settlement',
+  ACCOUNT_TYPE_MARGIN: 'Margin',
+  ACCOUNT_TYPE_GENERAL: 'General',
+  ACCOUNT_TYPE_FEES_INFRASTRUCTURE: 'Infrastructure',
+  ACCOUNT_TYPE_FEES_LIQUIDITY: 'Liquidity',
+  ACCOUNT_TYPE_FEES_MAKER: 'Maker',
+  ACCOUNT_TYPE_BOND: 'Bond',
+  ACCOUNT_TYPE_EXTERNAL: 'External',
+  ACCOUNT_TYPE_GLOBAL_INSURANCE: 'Global Insurance',
+  ACCOUNT_TYPE_GLOBAL_REWARD: 'Global Reward',
+  ACCOUNT_TYPE_PENDING_TRANSFERS: 'Pending Transfers',
+  ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES: 'Maker Paid Fees',
+  ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: 'Maker Received Fees',
+  ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: 'LP Received Fees',
+  ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: 'Market Proposers',
+  ACCOUNT_TYPE_HOLDING: 'Holding',
+};

 interface TransferParticipantsProps {
  transfer: Transfer;
@@ -30,22 +52,22 @@ export function TransferParticipants({
 }: TransferParticipantsProps) {
  // This mapping is required as the global account types require a type to be set, while
  // the underlying protobufs allow for every field to be undefined.
-  const fromAcct =
+  const fromAcct: AccountTypes =
    transfer.fromAccountType &&
    transfer.fromAccountType !== 'ACCOUNT_TYPE_UNSPECIFIED'
-      ? AccountType[transfer.fromAccountType]
-      : AccountType.ACCOUNT_TYPE_GENERAL;
-  const fromAccountTypeLabel = transfer.fromAccountType
-    ? AccountTypeMapping[fromAcct]
+      ? transfer.fromAccountType
+      : 'ACCOUNT_TYPE_GENERAL';
+  const fromAccountTypeLabel: string = transfer.fromAccountType
+    ? AccountType[fromAcct]
    : 'Unknown';

-  const toAcct =
+  const toAcct: AccountTypes =
    transfer.toAccountType &&
    transfer.toAccountType !== 'ACCOUNT_TYPE_UNSPECIFIED'
-      ? AccountType[transfer.toAccountType]
-      : AccountType.ACCOUNT_TYPE_GENERAL;
+      ? transfer.toAccountType
+      : 'ACCOUNT_TYPE_GENERAL';
  const toAccountTypeLabel = transfer.fromAccountType
-    ? AccountTypeMapping[toAcct]
+    ? AccountType[toAcct]
    : 'Unknown';

  return (
@@ -27,9 +27,9 @@ export function TransferRepeat({ recurring }: TransferRepeatProps) {
    <div className={wrapperClasses}>
      <h2 className={headerClasses}>{t('Active epochs')}</h2>
      <div className="relative block rounded-lg py-6 text-center p-6">
-        <p>
+        <div>
          <EpochOverview id={recurring.startEpoch} />
-        </p>
+        </div>
        <p className="leading-10 my-2">
          <IconForEpoch
            start={recurring.startEpoch}
@@ -37,13 +37,13 @@ export function TransferRepeat({ recurring }: TransferRepeatProps) {
            current={data?.epoch.id}
          />
        </p>
-        <p>
+        <div>
          {recurring.endEpoch ? (
            <EpochOverview id={recurring.endEpoch} />
          ) : (
            <span>{t('Forever')}</span>
          )}
-        </p>
+        </div>
      </div>
    </div>
  );
@@ -8,7 +8,7 @@ import { DispatchMetricLabels } from '@vegaprotocol/types';
 export type Metric = components['schemas']['vegaDispatchMetric'];
 export type Strategy = components['schemas']['vegaDispatchStrategy'];

-const metricLabels = {
+const metricLabels: Record<Metric, string> = {
  DISPATCH_METRIC_UNSPECIFIED: 'Unknown metric',
  ...DispatchMetricLabels,
 };
@@ -3,7 +3,7 @@ import { TransferRepeat } from './blocks/transfer-repeat';
 import { TransferRewards } from './blocks/transfer-rewards';
 import { TransferParticipants } from './blocks/transfer-participants';

-export type Recurring = components['schemas']['v1RecurringTransfer'];
+export type Recurring = components['schemas']['commandsv1RecurringTransfer'];
 export type Metric = components['schemas']['vegaDispatchMetric'];

 export const wrapperClasses =
@@ -16,7 +16,7 @@ interface StringMap {
 const displayString: StringMap = {
  OrderSubmission: 'Order Submission',
  'Submit Order': 'Order',
-  OrderCancellation: 'Order Cancellation',
+  OrderCancellation: 'Cancel order',
  OrderAmendment: 'Order Amendment',
  VoteSubmission: 'Vote Submission',
  WithdrawSubmission: 'Withdraw Submission',
@@ -44,8 +44,27 @@ const displayString: StringMap = {
  ValidatorHeartbeat: 'Heartbeat',
  'Validator Heartbeat': 'Heartbeat',
  'Batch Market Instructions': 'Batch',
+  'Stop Orders Submission': 'Stop',
+  StopOrdersSubmission: 'Stop',
+  StopOrdersCancellation: 'Cancel stop',
+  'Stop Orders Cancellation': 'Cancel stop',
 };

+export function getLabelForOrderType(
+  orderType: string,
+  command: components['schemas']['v1InputData']
+): string {
+  if (command.orderSubmission) {
+    if (command.orderSubmission.peggedOrder) {
+      return 'Peg';
+    }
+    if (command.orderSubmission.icebergOpts) {
+      return 'Iceberg';
+    }
+  }
+  return 'Order';
+}
+
 /**
 * Given a proposal, will return a specific label
 * @param chainEvent
@@ -117,6 +136,8 @@ export function getLabelForChainEvent(
      return t('Signer threshold');
    }
    return t('Multisig update');
+  } else if (chainEvent.contractCall) {
+    return t('Contract call');
  }
  return t('Chain Event');
 }
@@ -3,7 +3,7 @@
 * Do not make direct changes to the file.
 */

-/** Type helpers */
+/** OneOf type helpers */
 type Without<T, U> = { [P in Exclude<keyof T, keyof U>]?: never };
 type XOR<T, U> = T | U extends object
  ? (Without<T, U> & U) | (Without<U, T> & T)
@@ -41,6 +41,8 @@ export interface paths {
  };
 }

+export type webhooks = Record<string, never>;
+
 export interface components {
  schemas: {
    /**
@@ -101,6 +103,17 @@ export interface components {
      | 'TIME_IN_FORCE_FOK'
      | 'TIME_IN_FORCE_GFA'
      | 'TIME_IN_FORCE_GFN';
+    /**
+     * @description  - EXPIRY_STRATEGY_UNSPECIFIED: Never valid
+     *  - EXPIRY_STRATEGY_CANCELS: Stop order should be cancelled if the expiry time is reached.
+     *  - EXPIRY_STRATEGY_SUBMIT: Order should be submitted if the expiry time is reached.
+     * @default EXPIRY_STRATEGY_UNSPECIFIED
+     * @enum {string}
+     */
+    readonly StopOrderExpiryStrategy:
+      | 'EXPIRY_STRATEGY_UNSPECIFIED'
+      | 'EXPIRY_STRATEGY_CANCELS'
+      | 'EXPIRY_STRATEGY_SUBMIT';
    /**
     * @default METHOD_UNSPECIFIED
     * @enum {string}
@@ -143,6 +156,36 @@ export interface components {
      /** Type of transaction */
      readonly type?: string;
    };
+    /** Request for cancelling a recurring transfer */
+    readonly commandsv1CancelTransfer: {
+      /** @description Transfer ID of the transfer to cancel. */
+      readonly transferId?: string;
+    };
+    /** Specific details for a one off transfer */
+    readonly commandsv1OneOffTransfer: {
+      /**
+       * Format: int64
+       * @description Timestamp in Unix nanoseconds for when the transfer should be delivered into the receiver's account.
+       */
+      readonly deliverOn?: string;
+    };
+    /** Specific details for a recurring transfer */
+    readonly commandsv1RecurringTransfer: {
+      /** @description Optional parameter defining how a transfer is dispatched. */
+      readonly dispatchStrategy?: components['schemas']['vegaDispatchStrategy'];
+      /**
+       * Format: uint64
+       * @description Last epoch at which this transfer shall be paid.
+       */
+      readonly endEpoch?: string;
+      /** @description Factor needs to be > 0. */
+      readonly factor?: string;
+      /**
+       * Format: uint64
+       * @description First epoch from which this transfer shall be paid.
+       */
+      readonly startEpoch?: string;
+    };
    /** Transfer initiated by a party */
    readonly commandsv1Transfer: {
      /** @description Amount to be taken from the source account. This field is an unsigned integer scaled to the asset's decimal places. */
@@ -154,8 +197,8 @@ export interface components {
       * should be taken.
       */
      readonly fromAccountType?: components['schemas']['vegaAccountType'];
-      readonly oneOff?: components['schemas']['v1OneOffTransfer'];
-      readonly recurring?: components['schemas']['v1RecurringTransfer'];
+      readonly oneOff?: components['schemas']['commandsv1OneOffTransfer'];
+      readonly recurring?: components['schemas']['commandsv1RecurringTransfer'];
      /** @description Reference to be attached to the transfer. */
      readonly reference?: string;
      /** @description Public key of the destination account. */
@@ -171,8 +214,19 @@ export interface components {
    };
    readonly protobufAny: {
      readonly '@type'?: string;
-      [key: string]: unknown | undefined;
+      [key: string]: unknown;
    };
+    /**
+     * @description `NullValue` is a singleton enumeration to represent the null value for the
+     * `Value` type union.
+     *
+     *  The JSON representation for `NullValue` is JSON `null`.
+     *
+     *  - NULL_VALUE: Null value.
+     * @default NULL_VALUE
+     * @enum {string}
+     */
+    readonly protobufNullValue: 'NULL_VALUE';
    /** Used to announce a node as a new pending validator */
    readonly v1AnnounceNode: {
      /** @description AvatarURL of the validator. */
@@ -225,18 +279,19 @@ export interface components {
      readonly amendments?: readonly components['schemas']['v1OrderAmendment'][];
      /** @description List of order cancellations to be processed sequentially. */
      readonly cancellations?: readonly components['schemas']['v1OrderCancellation'][];
+      /** @description List of stop order cancellations to be processed sequentially. */
+      readonly stopOrdersCancellation?: readonly components['schemas']['v1StopOrdersCancellation'][];
+      /** @description List of stop order submissions to be processed sequentially. */
+      readonly stopOrdersSubmission?: readonly components['schemas']['v1StopOrdersSubmission'][];
      /** @description List of order submissions to be processed sequentially. */
      readonly submissions?: readonly components['schemas']['v1OrderSubmission'][];
    };
-    /** Request for cancelling a recurring transfer */
-    readonly v1CancelTransfer: {
-      /** @description Transfer ID of the transfer to cancel. */
-      readonly transferId?: string;
-    };
    /** Event forwarded to the Vega network to provide information on events happening on other networks */
    readonly v1ChainEvent: {
      /** @description Built-in asset event. */
      readonly builtin?: components['schemas']['vegaBuiltinAssetEvent'];
+      /** Arbitrary contract call */
+      readonly contractCall?: components['schemas']['vegaEthContractCallEvent'];
      /** @description Ethereum ERC20 event. */
      readonly erc20?: components['schemas']['vegaERC20Event'];
      /** @description Ethereum ERC20 multisig event. */
@@ -301,6 +356,19 @@ export interface components {
      /** Transaction corresponding to the hash */
      readonly transaction?: components['schemas']['blockexplorerapiv1Transaction'];
    };
+    /** Iceberg order options */
+    readonly v1IcebergOpts: {
+      /**
+       * Format: uint64
+       * @description Minimum allowed remaining size of the order before it is replenished back to its peak size.
+       */
+      readonly minimumVisibleSize?: string;
+      /**
+       * Format: uint64
+       * @description Size of the order that is made visible and can be traded with during the execution of a single order.
+       */
+      readonly peakSize?: string;
+    };
    readonly v1InfoResponse: {
      /** Commit hash from which the data node was built */
      readonly commitHash?: string;
@@ -325,7 +393,7 @@ export interface components {
       */
      readonly blockHeight?: string;
      /** @description Command to request cancelling a recurring transfer. */
-      readonly cancelTransfer?: components['schemas']['v1CancelTransfer'];
+      readonly cancelTransfer?: components['schemas']['commandsv1CancelTransfer'];
      /**
       * @description Command used by a validator to submit an event forwarded to the Vega network to provide information
       * on events happening on other networks, to be used by a foreign chain
@@ -381,6 +449,10 @@ export interface components {
      readonly protocolUpgradeProposal?: components['schemas']['v1ProtocolUpgradeProposal'];
      /** @description Command used by a validator to submit a floating point value. */
      readonly stateVariableProposal?: components['schemas']['v1StateVariableProposal'];
+      /** @description Command to cancel stop orders. */
+      readonly stopOrdersCancellation?: components['schemas']['v1StopOrdersCancellation'];
+      /** @description Command to submit a pair of stop orders. */
+      readonly stopOrdersSubmission?: components['schemas']['v1StopOrdersSubmission'];
      /** @description Command to submit a transfer. */
      readonly transfer?: components['schemas']['commandsv1Transfer'];
      /** @description Command to remove tokens delegated to a validator. */
@@ -448,9 +520,9 @@ export interface components {
      readonly commitmentAmount?: string;
      /** @description Nominated liquidity fee factor, which is an input to the calculation of taker fees on the market, as per setting fees and rewarding liquidity providers. */
      readonly fee?: string;
-      /** @description Market ID for the order, required field. */
+      /** @description Market ID for the order. */
      readonly marketId?: string;
-      /** @description Reference to be added to every order created out of this liquidityProvisionSubmission. */
+      /** @description Reference to be added to every order created out of this liquidity provision submission. */
      readonly reference?: string;
      /** @description Set of liquidity sell orders to meet the liquidity provision obligation. */
      readonly sells?: readonly components['schemas']['vegaLiquidityOrder'][];
@@ -530,15 +602,6 @@ export interface components {
      | 'TYPE_STAKE_TOTAL_SUPPLY'
      | 'TYPE_SIGNER_THRESHOLD_SET'
      | 'TYPE_GOVERNANCE_VALIDATE_ASSET';
-    /** Specific details for a one off transfer */
-    readonly v1OneOffTransfer: {
-      /**
-       * Format: int64
-       * @description Unix timestamp in nanoseconds. Time at which the
-       * transfer should be delivered into the To account.
-       */
-      readonly deliverOn?: string;
-    };
    /** Command to submit new Oracle data from third party providers */
    readonly v1OracleDataSubmission: {
      /**
@@ -596,10 +659,12 @@ export interface components {
    readonly v1OrderSubmission: {
      /**
       * Format: int64
-       * @description Timestamp for when the order will expire, in nanoseconds,
+       * @description Timestamp in Unix nanoseconds for when the order will expire,
       * required field only for `Order.TimeInForce`.TIME_IN_FORCE_GTT`.
       */
      readonly expiresAt?: string;
+      /** @description Parameters used to specify an iceberg order. */
+      readonly icebergOpts?: components['schemas']['v1IcebergOpts'];
      /** @description Market ID for the order, required field. */
      readonly marketId?: string;
      /** @description Used to specify the details for a pegged order. */
@@ -699,23 +764,6 @@ export interface components {
    readonly v1PubKey: {
      readonly key?: string;
    };
-    /** Specific details for a recurring transfer */
-    readonly v1RecurringTransfer: {
-      /** @description Optional parameter defining how a transfer is dispatched. */
-      readonly dispatchStrategy?: components['schemas']['vegaDispatchStrategy'];
-      /**
-       * Format: uint64
-       * @description Last epoch at which this transfer shall be paid.
-       */
-      readonly endEpoch?: string;
-      /** @description Factor needs to be > 0. */
-      readonly factor?: string;
-      /**
-       * Format: uint64
-       * @description First epoch from which this transfer shall be paid.
-       */
-      readonly startEpoch?: string;
-    };
    /**
     * @description Signature to authenticate a transaction and to be verified by the Vega
     * network.
@@ -732,7 +780,7 @@ export interface components {
      readonly version?: number;
    };
    readonly v1Signer: {
-      /** In case of an open oracle - Ethereum address will be submitted */
+      /** @description In case of an open oracle - Ethereum address will be submitted. */
      readonly ethAddress?: components['schemas']['v1ETHAddress'];
      /**
       * @description List of authorized public keys that signed the data for this
@@ -746,6 +794,55 @@ export interface components {
      /** @description State value proposal details. */
      readonly proposal?: components['schemas']['vegaStateValueProposal'];
    };
+    /** Price and expiry configuration for a stop order */
+    readonly v1StopOrderSetup: {
+      /**
+       * Format: int64
+       * @description Optional expiry timestamp.
+       */
+      readonly expiresAt?: string;
+      /** @description Strategy to adopt if the expiry time is reached. */
+      readonly expiryStrategy?: components['schemas']['StopOrderExpiryStrategy'];
+      /** @description Order to be submitted once the trigger is breached. */
+      readonly orderSubmission?: components['schemas']['v1OrderSubmission'];
+      /** @description Fixed price at which the order will be submitted. */
+      readonly price?: string;
+      /** @description Trailing percentage at which the order will be submitted. */
+      readonly trailingPercentOffset?: string;
+    };
+    /**
+     * Cancel a stop order.
+     * The following combinations are available:
+     * Empty object will cancel all stop orders for the party
+     * Market ID alone will cancel all stop orders in a market
+     * Market ID and order ID will cancel a specific stop order in a market
+     * If the stop order is part of an OCO, both stop orders will be cancelled
+     */
+    readonly v1StopOrdersCancellation: {
+      /** @description Optional market ID. */
+      readonly marketId?: string;
+      /** @description Optional order ID. */
+      readonly stopOrderId?: string;
+    };
+    /**
+     * Stop order submission submits stops orders.
+     * It is possible to make a single stop order submission by
+     * specifying a single direction,
+     * or an OCO (One Cancels the Other) stop order submission
+     * by specifying a configuration for both directions
+     */
+    readonly v1StopOrdersSubmission: {
+      /**
+       * @description Stop order that will be triggered
+       * if the price falls below a given trigger price.
+       */
+      readonly fallsBelow?: components['schemas']['v1StopOrderSetup'];
+      /**
+       * @description Stop order that will be triggered
+       * if the price rises above a given trigger price.
+       */
+      readonly risesAbove?: components['schemas']['v1StopOrderSetup'];
+    };
    readonly v1UndelegateSubmission: {
      /**
       * @description Optional, if not specified = ALL.
@@ -822,6 +919,7 @@ export interface components {
     *  - ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES: Per asset reward account for fees received by makers
     *  - ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES: Per asset reward account for fees received by liquidity providers
     *  - ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS: Per asset reward account for market proposers when the market goes above some trading threshold
+     *  - ACCOUNT_TYPE_HOLDING: Per asset account for holding in-flight unfilled orders' funds
     * @default ACCOUNT_TYPE_UNSPECIFIED
     * @enum {string}
     */
@@ -842,7 +940,8 @@ export interface components {
      | 'ACCOUNT_TYPE_REWARD_MAKER_PAID_FEES'
      | 'ACCOUNT_TYPE_REWARD_MAKER_RECEIVED_FEES'
      | 'ACCOUNT_TYPE_REWARD_LP_RECEIVED_FEES'
-      | 'ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS';
+      | 'ACCOUNT_TYPE_REWARD_MARKET_PROPOSERS'
+      | 'ACCOUNT_TYPE_HOLDING';
    /** Vega representation of an external asset */
    readonly vegaAssetDetails: {
      /** @description Vega built-in asset. */
@@ -898,6 +997,14 @@ export interface components {
      /** @description Vega network internal asset ID. */
      readonly vegaAssetId?: string;
    };
+    readonly vegaCancelTransfer: {
+      /** Configuration for cancellation of a governance-initiated transfer */
+      readonly changes?: components['schemas']['vegaCancelTransferConfiguration'];
+    };
+    readonly vegaCancelTransferConfiguration: {
+      /** @description ID of the governance transfer proposal. */
+      readonly transferId?: string;
+    };
    /**
     * @description DataSourceDefinition represents the top level object that deals with data sources.
     * DataSourceDefinition can be external or internal, with whatever number of data sources are defined
@@ -912,6 +1019,7 @@ export interface components {
     * It contains one of any of the defined `SourceType` variants.
     */
    readonly vegaDataSourceDefinitionExternal: {
+      readonly ethCall?: components['schemas']['vegaEthCallSpec'];
      readonly oracle?: components['schemas']['vegaDataSourceSpecConfiguration'];
    };
    /**
@@ -1147,6 +1255,64 @@ export interface components {
      /** @description Address into which the bridge will release the funds. */
      readonly receiverAddress?: string;
    };
+    /** @description Specifies a data source that derives its content from calling a read method on an Ethereum contract. */
+    readonly vegaEthCallSpec: {
+      /** @description The ABI of that contract. */
+      readonly abi?: readonly Record<string, never>[];
+      /** @description Ethereum address of the contract to call. */
+      readonly address?: string;
+      /**
+       * @description List of arguments to pass to method call.
+       * Protobuf 'Value' wraps an arbitrary JSON type that is mapped to an Ethereum type according to the ABI.
+       */
+      readonly args?: readonly Record<string, never>[];
+      /** @description Name of the method on the contract to call. */
+      readonly method?: string;
+      /** @description Conditions for determining when to call the contract method. */
+      readonly trigger?: components['schemas']['vegaEthCallTrigger'];
+    };
+    /** @description Determines when the contract method should be called. */
+    readonly vegaEthCallTrigger: {
+      readonly timeTrigger?: components['schemas']['vegaEthTimeTrigger'];
+    };
+    /** Result of calling an arbitrary Ethereum contract method */
+    readonly vegaEthContractCallEvent: {
+      /**
+       * Format: uint64
+       * @description Ethereum block height.
+       */
+      readonly blockHeight?: string;
+      /**
+       * Format: uint64
+       * @description Ethereum block time in Unix seconds.
+       */
+      readonly blockTime?: string;
+      /**
+       * Format: byte
+       * @description Result of contract call, packed according to the ABI stored in the associated data source spec.
+       */
+      readonly result?: string;
+      /** @description ID of the data source spec that triggered this contract call. */
+      readonly specId?: string;
+    };
+    /** @description Trigger for an Ethereum call based on the Ethereum block timestamp. Can be one-off or repeating. */
+    readonly vegaEthTimeTrigger: {
+      /**
+       * Format: uint64
+       * @description Repeat the call every n seconds after the inital call. If no time for initial call was specified, begin repeating immediately.
+       */
+      readonly every?: string;
+      /**
+       * Format: uint64
+       * @description Trigger when the Ethereum time is greater or equal to this time, in Unix seconds.
+       */
+      readonly initial?: string;
+      /**
+       * Format: uint64
+       * @description If repeating, stop once Ethereum time is greater than this time, in Unix seconds. If not set, then repeat indefinitely.
+       */
+      readonly until?: string;
+    };
    /** Future product configuration */
    readonly vegaFutureProduct: {
      /** @description Binding between the data source spec and the settlement data. */
@@ -1160,6 +1326,14 @@ export interface components {
      /** @description Asset ID for the product's settlement asset. */
      readonly settlementAsset?: string;
    };
+    /**
+     * @default GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED
+     * @enum {string}
+     */
+    readonly vegaGovernanceTransferType:
+      | 'GOVERNANCE_TRANSFER_TYPE_UNSPECIFIED'
+      | 'GOVERNANCE_TRANSFER_TYPE_ALL_OR_NOTHING'
+      | 'GOVERNANCE_TRANSFER_TYPE_BEST_EFFORT';
    /** Instrument configuration */
    readonly vegaInstrumentConfiguration: {
      /** @description Instrument code, human-readable shortcode used to describe the instrument. */
@@ -1168,6 +1342,8 @@ export interface components {
      readonly future?: components['schemas']['vegaFutureProduct'];
      /** @description Instrument name. */
      readonly name?: string;
+      /** @description Spot. */
+      readonly spot?: components['schemas']['vegaSpotProduct'];
    };
    readonly vegaKeyValueBundle: {
      readonly key?: string;
@@ -1258,14 +1434,14 @@ export interface components {
      /** @description Configuration of the new market. */
      readonly changes?: components['schemas']['vegaNewMarketConfiguration'];
    };
-    /** Configuration for a new market on Vega */
+    /** Configuration for a new futures market on Vega */
    readonly vegaNewMarketConfiguration: {
      /**
       * Format: uint64
-       * @description Decimal places used for the new market, sets the smallest price increment on the book.
+       * @description Decimal places used for the new futures market, sets the smallest price increment on the book.
       */
      readonly decimalPlaces?: string;
-      /** @description New market instrument configuration. */
+      /** @description New futures market instrument configuration. */
      readonly instrument?: components['schemas']['vegaInstrumentConfiguration'];
      /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */
      readonly linearSlippageFactor?: string;
@@ -1278,11 +1454,11 @@ export interface components {
       * price levels over which automated liquidity provision orders will be deployed.
       */
      readonly lpPriceRange?: string;
-      /** @description Optional new market metadata, tags. */
+      /** @description Optional new futures market metadata, tags. */
      readonly metadata?: readonly string[];
      /**
       * Format: int64
-       * @description Decimal places for order sizes, sets what size the smallest order / position on the market can be.
+       * @description Decimal places for order sizes, sets what size the smallest order / position on the futures market can be.
       */
      readonly positionDecimalPlaces?: string;
      /** @description Price monitoring parameters. */
@@ -1291,6 +1467,80 @@ export interface components {
      readonly quadraticSlippageFactor?: string;
      /** @description Simple risk model parameters, valid only if MODEL_SIMPLE is selected. */
      readonly simple?: components['schemas']['vegaSimpleModelParams'];
+      /** @description Successor configuration. If this proposal is meant to succeed a given market, then this should be set. */
+      readonly successor?: components['schemas']['vegaSuccessorConfiguration'];
+    };
+    /** New spot market on Vega */
+    readonly vegaNewSpotMarket: {
+      /** @description Configuration of the new spot market. */
+      readonly changes?: components['schemas']['vegaNewSpotMarketConfiguration'];
+    };
+    /** Configuration for a new spot market on Vega */
+    readonly vegaNewSpotMarketConfiguration: {
+      /**
+       * Format: uint64
+       * @description Decimal places used for the new spot market, sets the smallest price increment on the book.
+       */
+      readonly decimalPlaces?: string;
+      /** @description New spot market instrument configuration. */
+      readonly instrument?: components['schemas']['vegaInstrumentConfiguration'];
+      /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
+      readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
+      /** @description Optional new spot market metadata, tags. */
+      readonly metadata?: readonly string[];
+      /**
+       * Format: int64
+       * @description Decimal places for order sizes, sets what size the smallest order / position on the spot market can be.
+       */
+      readonly positionDecimalPlaces?: string;
+      /** @description Price monitoring parameters. */
+      readonly priceMonitoringParameters?: components['schemas']['vegaPriceMonitoringParameters'];
+      /** @description Simple risk model parameters, valid only if MODEL_SIMPLE is selected. */
+      readonly simple?: components['schemas']['vegaSimpleModelParams'];
+      /** @description Specifies parameters related to target stake calculation. */
+      readonly targetStakeParameters?: components['schemas']['vegaTargetStakeParameters'];
+    };
+    /** New governance transfer */
+    readonly vegaNewTransfer: {
+      /** @description Configuration for a new transfer. */
+      readonly changes?: components['schemas']['vegaNewTransferConfiguration'];
+    };
+    readonly vegaNewTransferConfiguration: {
+      /** Maximum amount to transfer */
+      readonly amount?: string;
+      /** ID of asset to transfer */
+      readonly asset?: string;
+      /**
+       * Specifies the account to transfer to, depending on the account type:
+       * Network treasury: leave empty
+       * Party: party's public key
+       * Market insurance pool: market ID
+       */
+      readonly destination?: string;
+      /** Specifies the account type to transfer to: reward pool, party, network insurance pool, market insurance pool */
+      readonly destinationType?: components['schemas']['vegaAccountType'];
+      /** Maximum fraction of the source account's balance to transfer as a decimal - i.e. 0.1 = 10% of the balance */
+      readonly fractionOfBalance?: string;
+      readonly oneOff?: components['schemas']['vegaOneOffTransfer'];
+      readonly recurring?: components['schemas']['vegaRecurringTransfer'];
+      /** If network treasury, field is empty, otherwise uses the market ID */
+      readonly source?: string;
+      /** Source account type, such as network treasury, market insurance pool */
+      readonly sourceType?: components['schemas']['vegaAccountType'];
+      /**
+       * "All or nothing" or "best effort":
+       * All or nothing: Transfers the specified amount or does not transfer anything
+       * Best effort: Transfers the specified amount or the max allowable amount if this is less than the specified amount
+       */
+      readonly transferType?: components['schemas']['vegaGovernanceTransferType'];
+    };
+    /** Specific details for a one off transfer */
+    readonly vegaOneOffTransfer: {
+      /**
+       * Format: int64
+       * @description Timestamp in Unix nanoseconds for when the transfer should be delivered into the receiver's account.
+       */
+      readonly deliverOn?: string;
    };
    /**
     * Type values for an order
@@ -1369,6 +1619,8 @@ export interface components {
    };
    /** Terms for a governance proposal on Vega */
    readonly vegaProposalTerms: {
+      /** @description Cancel a governance transfer. */
+      readonly cancelTransfer?: components['schemas']['vegaCancelTransfer'];
      /**
       * Format: int64
       * @description Timestamp as Unix time in seconds when voting closes for this proposal,
@@ -1388,20 +1640,39 @@ export interface components {
       * and can be used to gauge community sentiment.
       */
      readonly newFreeform?: components['schemas']['vegaNewFreeform'];
-      /** @description Proposal change for creating new market on Vega. */
+      /** @description Proposal change for creating new futures market on Vega. */
      readonly newMarket?: components['schemas']['vegaNewMarket'];
+      /** @description Proposal change for creating new spot market on Vega. */
+      readonly newSpotMarket?: components['schemas']['vegaNewSpotMarket'];
+      /** @description Proposal change for a governance transfer. */
+      readonly newTransfer?: components['schemas']['vegaNewTransfer'];
      /** @description Proposal change for updating an asset. */
      readonly updateAsset?: components['schemas']['vegaUpdateAsset'];
-      /** @description Proposal change for modifying an existing market on Vega. */
+      /** @description Proposal change for modifying an existing futures market on Vega. */
      readonly updateMarket?: components['schemas']['vegaUpdateMarket'];
      /** @description Proposal change for updating Vega network parameters. */
      readonly updateNetworkParameter?: components['schemas']['vegaUpdateNetworkParameter'];
+      /** @description Proposal change for modifying an existing spot market on Vega. */
+      readonly updateSpotMarket?: components['schemas']['vegaUpdateSpotMarket'];
      /**
       * Format: int64
       * @description Validation timestamp as Unix time in seconds.
       */
      readonly validationTimestamp?: string;
    };
+    /** Specific details for a recurring transfer */
+    readonly vegaRecurringTransfer: {
+      /**
+       * Format: uint64
+       * @description Last epoch at which this transfer shall be paid.
+       */
+      readonly endEpoch?: string;
+      /**
+       * Format: uint64
+       * @description First epoch from which this transfer shall be paid.
+       */
+      readonly startEpoch?: string;
+    };
    readonly vegaScalarValue: {
      readonly value?: string;
    };
@@ -1442,6 +1713,15 @@ export interface components {
       */
      readonly probabilityOfTrading?: number;
    };
+    /** Spot product configuration */
+    readonly vegaSpotProduct: {
+      /** @description Base asset ID. */
+      readonly baseAsset?: string;
+      /** @description Product name. */
+      readonly name?: string;
+      /** @description Quote asset ID. */
+      readonly quoteAsset?: string;
+    };
    readonly vegaStakeDeposited: {
      /** @description Amount deposited as an unsigned base 10 integer scaled to the asset's decimal places. */
      readonly amount?: string;
@@ -1507,6 +1787,13 @@ export interface components {
      readonly scalarVal?: components['schemas']['vegaScalarValue'];
      readonly vectorVal?: components['schemas']['vegaVectorValue'];
    };
+    /** @description Configuration required to turn a new market proposal in to a successor market proposal. */
+    readonly vegaSuccessorConfiguration: {
+      /** @description A decimal value between or equal to 0 and 1, specifying the fraction of the insurance pool balance that is carried over from the parent market to the successor. */
+      readonly insurancePoolFraction?: string;
+      /** @description ID of the market that the successor should take over from. */
+      readonly parentMarketId?: string;
+    };
    /** TargetStakeParameters contains parameters used in target stake calculation */
    readonly vegaTargetStakeParameters: {
      /**
@@ -1547,14 +1834,14 @@ export interface components {
    };
    /** Update an existing market on Vega */
    readonly vegaUpdateMarket: {
-      /** @description Updated configuration of the market. */
+      /** @description Updated configuration of the futures market. */
      readonly changes?: components['schemas']['vegaUpdateMarketConfiguration'];
      /** @description Market ID the update is for. */
      readonly marketId?: string;
    };
-    /** Configuration to update a market on Vega */
+    /** Configuration to update a futures market on Vega */
    readonly vegaUpdateMarketConfiguration: {
-      /** @description Updated market instrument configuration. */
+      /** @description Updated futures market instrument configuration. */
      readonly instrument?: components['schemas']['vegaUpdateInstrumentConfiguration'];
      /** @description Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume. */
      readonly linearSlippageFactor?: string;
@@ -1567,7 +1854,7 @@ export interface components {
       * price levels over which automated liquidity provision orders will be deployed.
       */
      readonly lpPriceRange?: string;
-      /** @description Optional market metadata, tags. */
+      /** @description Optional futures market metadata, tags. */
      readonly metadata?: readonly string[];
      /** @description Price monitoring parameters. */
      readonly priceMonitoringParameters?: components['schemas']['vegaPriceMonitoringParameters'];
@@ -1581,6 +1868,26 @@ export interface components {
      /** @description The network parameter to update. */
      readonly changes?: components['schemas']['vegaNetworkParameter'];
    };
+    /** Update an existing spot market on Vega */
+    readonly vegaUpdateSpotMarket: {
+      /** @description Updated configuration of the spot market. */
+      readonly changes?: components['schemas']['vegaUpdateSpotMarketConfiguration'];
+      /** @description Market ID the update is for. */
+      readonly marketId?: string;
+    };
+    /** Configuration to update a spot market on Vega */
+    readonly vegaUpdateSpotMarketConfiguration: {
+      /** @description Log normal risk model parameters, valid only if MODEL_LOG_NORMAL is selected. */
+      readonly logNormal?: components['schemas']['vegaLogNormalRiskModel'];
+      /** @description Optional spot market metadata, tags. */
+      readonly metadata?: readonly string[];
+      /** @description Price monitoring parameters. */
+      readonly priceMonitoringParameters?: components['schemas']['vegaPriceMonitoringParameters'];
+      /** @description Simple risk model parameters, valid only if MODEL_SIMPLE is selected. */
+      readonly simple?: components['schemas']['vegaSimpleModelParams'];
+      /** @description Specifies parameters related to target stake calculation. */
+      readonly targetStakeParameters?: components['schemas']['vegaTargetStakeParameters'];
+    };
    readonly vegaVectorValue: {
      readonly value?: readonly string[];
    };
@@ -1609,12 +1916,12 @@ export interface components {
 export type external = Record<string, never>;

 export interface operations {
+  /**
+   * Info
+   * @description Get information about the block explorer.
+   * Response contains a semver formatted version of the data node and the commit hash, from which the block explorer was built
+   */
  BlockExplorer_Info: {
-    /**
-     * Info
-     * @description Get information about the block explorer.
-     * Response contains a semver formatted version of the data node and the commit hash, from which the block explorer was built
-     */
    responses: {
      /** @description A successful response. */
      200: {
@@ -1630,19 +1937,38 @@ export interface operations {
      };
    };
  };
+  /**
+   * List transactions
+   * @description List transactions from the Vega blockchain
+   */
  BlockExplorer_ListTransactions: {
-    /**
-     * List transactions
-     * @description List transactions from the Vega blockchain
-     */
-    parameters?: {
-      /** @description Number of transactions to be returned from the blockchain. */
-      /** @description Optional cursor to paginate the request. */
-      /** @description Optional cursor to paginate the request. */
-      readonly query?: {
+    parameters: {
+      query?: {
+        /**
+         * @description Number of transactions to be returned from the blockchain.
+         * This is deprecated, use first and last instead.
+         */
        limit?: number;
+        /** @description Optional cursor to paginate the request. */
        before?: string;
+        /** @description Optional cursor to paginate the request. */
        after?: string;
+        /** @description Transaction command types filter, for listing transactions with specified command types. */
+        cmdTypes?: readonly string[];
+        /** @description Transaction command types exclusion filter, for listing all the transactions except the ones with specified command types. */
+        excludeCmdTypes?: readonly string[];
+        /** @description Party IDs filter, can be sender or receiver. */
+        parties?: readonly string[];
+        /**
+         * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `after` cursor to paginate forwards.
+         * On its own, this will return the first `first` transactions.
+         */
+        first?: number;
+        /**
+         * @description Number of transactions to be returned from the blockchain. Use in conjunction with the `before` cursor to paginate backwards.
+         * On its own, this will return the last `last` transactions.
+         */
+        last?: number;
      };
    };
    responses: {
@@ -1660,14 +1986,14 @@ export interface operations {
      };
    };
  };
+  /**
+   * Get transaction
+   * @description Get a transaction from the Vega blockchain
+   */
  BlockExplorer_GetTransaction: {
-    /**
-     * Get transaction
-     * @description Get a transaction from the Vega blockchain
-     */
    parameters: {
-      /** @description Hash of the transaction */
-      readonly path: {
+      path: {
+        /** @description Hash of the transaction */
        hash: string;
      };
    };
@@ -15,5 +15,6 @@ module.exports = composePlugins(withNx(), withReact(), (config) => {
  return {
    ...config,
    plugins: [...additionalPlugins, ...config.plugins],
+    ignoreWarnings: [/Failed to parse source map/],
  };
 });
@@ -98,11 +98,6 @@ describe(
        .and('have.length', 64);
      cy.getByTestId(proposalTermsToggle).click();
      // 3001-VOTE-052 3001-VOTE-010
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.get('code.language-json')
        .should('exist')
        .within(() => {
@@ -320,8 +320,8 @@ context(
      // 3001-VOTE-076
      cy.getByTestId(connectToVegaWalletButton)
        .should('be.visible')
-        .and('have.text', 'Connect Vega wallet')
-        .click();
+        .and('have.text', 'Connect Vega wallet');
+      cy.getByTestId(connectToVegaWalletButton).click();
      cy.getByTestId('connector-jsonRpc').click();
      cy.getByTestId(vegaWalletNameElement).should('be.visible');
      cy.getByTestId(connectToVegaWalletButton).should('not.exist');
@@ -295,7 +295,7 @@ context(

    // Will fail if run after 'Able to submit update market proposal and vote for proposal'
    // 3002-PROP-022
-    it('Unable to submit update market proposal without equity-like share in the market', function () {
+    it.skip('Unable to submit update market proposal without equity-like share in the market', function () {
      switchVegaWalletPubKey();
      stakingPageAssociateTokens('1');
      goToMakeNewProposal(governanceProposalType.UPDATE_MARKET);
@@ -116,12 +116,6 @@ context(
          cy.getByTestId(amountInput).click().type('120');
          cy.getByTestId(submitWithdrawalButton).click();
        });
-        // assert withdrawal request
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId(toast)
          .first(txTimeout)
          .should('contain.text', 'Funds unlocked')
@@ -135,11 +129,6 @@ context(
            cy.getByTestId(toastClose).click();
          });
        // withdrawal complete
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId(toast)
          .first(txTimeout)
          .should('contain.text', 'The withdrawal has been approved.')
@@ -149,11 +138,6 @@ context(
              'Withdraw 120.00 tUSDC'
            );
          });
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId(toast)
          .last(txTimeout)
          .should('contain.text', 'Transaction confirmed')
@@ -161,11 +145,6 @@ context(
            cy.getByTestId('external-link').should('exist');
          });
        // withdrawal history for complete withdrawal displayed
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.get(tableWithdrawnStatus)
          .eq(1, txTimeout)
          .should('have.text', 'Completed')
@@ -207,11 +186,6 @@ context(
        cy.getByTestId(submitWithdrawalButton).click();
      });

-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(toast)
        .first(txTimeout)
        .should('contain.text', 'Funds unlocked')
@@ -223,11 +197,6 @@ context(
          );
          cy.getByTestId(toastClose).click();
        });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.get(tableTxHash)
        .eq(1)
        .should('have.text', 'Complete withdrawal')
@@ -243,33 +212,18 @@ context(
        });
      ethereumWalletConnect();
      cy.getByTestId(completeWithdrawalButton).first().click();
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(toast)
        .last(txTimeout)
        .should('contain.text', 'Awaiting confirmation')
        .within(() => {
          cy.getByTestId('external-link').should('exist');
        });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(toast)
        .first(txTimeout)
        .should('contain.text', 'The withdrawal has been approved.')
        .within(() => {
          cy.getByTestId(toastPanel).should('contain.text', '110.00', 'tUSDC');
        });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(toast)
        .last(txTimeout)
        .should('contain.text', 'Transaction confirmed')
@@ -293,11 +247,6 @@ context(
        cy.getByTestId(amountInput).click().type('50');
        cy.getByTestId(submitWithdrawalButton).click();
      });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(toast)
        .first(txTimeout)
        .should('contain.text', 'Funds unlocked')
@@ -16,11 +16,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    });

    it('should display announcement banner', function () {
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId('app-announcement')
        .should('contain.text', 'TEST ANNOUNCEMENT!')
        .within(() => {
@@ -40,11 +35,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
          waitForSpinner();
        }
      });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId('proposals-list-item')
        .should('have.length.at.least', 1)
        .first()
@@ -104,11 +94,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    });

    it('should contain link to specific validators', function () {
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId('validators')
        .should('have.length', '2')
        .each(($validator) => {
@@ -135,11 +120,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    });

    it('should display network data', function () {
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId('git-network-data')
        .should('contain.text', 'Reading network data from')
        .within(() => {
@@ -151,11 +131,6 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
    });

    it('should display eth data', function () {
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId('git-eth-data')
        .should('contain.text', 'Reading Ethereum data from')
        .within(() => {
@@ -186,7 +161,7 @@ context('Home Page - verify elements on page', { tags: '@smoke' }, function () {
      cy.getByTestId('menu-drawer').should('be.visible');
    });

-    it.skip('should have link for proposal page', function () {
+    it('should have link for proposal page', function () {
      cy.getByTestId('menu-drawer').within(() => {
        cy.get('[href="/proposals"]')
          .should('exist')
@@ -142,11 +142,6 @@ context(
      mockNetworkUpgradeProposal();
      navigateTo(navigation.proposals);
      cy.getByTestId('open-proposals').within(() => {
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.get('li')
          .eq(0)
          .should('have.attr', 'data-testid', networkUpgradeProposalListItem)
@@ -205,11 +200,6 @@ context(
          .should('contain.text', '99.98% approval (% validator voting power)')
          .and('contain.text', '(67% voting power required)');
        cy.get('h2').should('contain.text', 'Approvers (4/4 validators)');
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('validator-name')
          .should('have.length', 4)
          .each(($validator) => {
@@ -1,13 +1,12 @@
 /// <reference types="cypress" />

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

-  it.skip('Unable to submit proposal with public key', function () {
+  it('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.`;

-    navigateTo(navigation.proposals);
-    goToMakeNewProposal(governanceProposalType.FREEFORM);
-    enterUniqueFreeFormProposalBody('50', 'pub key proposal test');
+    goToMakeNewProposal(governanceProposalType.RAW);
+    enterRawProposalBody(createTenDigitUnixTimeStampForSpecifiedDays(8));
    cy.getByTestId('dialog-content')
      .first()
      .within(() => {
@@ -42,11 +42,6 @@ context(
      // Skipping due to bug #3471 causing flaky failuress
      it.skip('should have option to view go to next and previous page', function () {
        waitForBeginningOfEpoch();
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('page-info')
          .should('contain.text', 'Page ')
          .invoke('text')
@@ -21,11 +21,6 @@ context(
    // 1005-VEST-001
    // 1005-VEST-002
    it('Able to view tranches', function () {
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId('tranche-item')
        .should('have.length', 2)
        .first()
@@ -56,11 +51,6 @@ context(
        cy.get('span').eq(1).should('have.text', 0);
      });
      cy.getByTestId('key-value-table').within(() => {
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('link')
          .should('have.length', 8)
          .each((ethLink) => {
@@ -68,11 +58,6 @@ context(
              .should('have.attr', 'href')
              .and('contain', 'https://sepolia.etherscan.io/address/');
          });
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('redeem-link')
          .should('have.length', 8)
          .each((redeemLink) => {
@@ -86,11 +71,6 @@ context(
    it('Able to view tranches with less than 10 vega', function () {
      navigateTo(navigation.supply);
      cy.getByTestId('show-all-tranches').click();
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId('tranche-item')
        .should('have.length', 8)
        .first()
@@ -74,11 +74,6 @@ context('Validators Page - verify elements on page', function () {
    function () {
      // 1002-STKE-050
      it('Should be able to see validator names', function () {
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.get('[col-id="validator"] > div > span')
          .should('have.length.at.least', 1)
          .each(($name) => {
@@ -87,11 +82,6 @@ context('Validators Page - verify elements on page', function () {
      });

      it('Should be able to see validator stake', function () {
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('total-stake')
          .should('have.length.at.least', 1)
          .each(($stake) => {
@@ -115,11 +105,6 @@ context('Validators Page - verify elements on page', function () {
      });

      it('Should be able to see validator normalised voting power', function () {
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('normalised-voting-power')
          .should('have.length.at.least', 1)
          .each(($vPower) => {
@@ -141,11 +126,6 @@ context('Validators Page - verify elements on page', function () {

      // 2002-SINC-018
      it('Should be able to see validator total penalties', function () {
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('total-penalty')
          .should('have.length.at.least', 1)
          .each(($penalties) => {
@@ -166,11 +146,6 @@ context('Validators Page - verify elements on page', function () {
      });

      it('Should be able to see validator pending stake', function () {
-        /**
-         * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-         * You should use .then() to chain commands instead.
-         * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-         **/
        cy.getByTestId('total-pending-stake')
          .should('have.length.at.least', 1)
          .each(($pendingStake) => {
@@ -78,7 +78,7 @@ context(
          cy.getByTestId('connector-jsonRpc')
            .should('be.visible')
            .and('have.text', 'Connect Vega wallet');
-          cy.getByTestId('connector-hosted')
+          cy.getByTestId('connector-rest')
            .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-hosted').click();
+          cy.getByTestId('connector-rest').click();
        });
      });

@@ -340,7 +340,7 @@ context(
                .contains(name)
                .parent()
                .siblings()
-                .then((elementAmount) => {
+                .should((elementAmount) => {
                  const displayedAmount = parseFloat(elementAmount.text());
                  expect(displayedAmount).be.gte(expectedAmount);
                });
@@ -2,13 +2,8 @@ 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,
@@ -16,10 +11,6 @@ export const ConnectToVega = () => {
  return (
    <Button
      onClick={() => {
-        appDispatch({
-          type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
-          isOpen: true,
-        });
        openVegaWalletDialog();
      }}
      data-testid="connect-to-vega-wallet-btn"
@@ -3,11 +3,6 @@ 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;
 }
@@ -15,7 +10,6 @@ interface VegaWalletContainerProps {
 export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
  const { t } = useTranslation();
  const { pubKey } = useVegaWallet();
-  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -25,10 +19,6 @@ export const VegaWalletContainer = ({ children }: VegaWalletContainerProps) => {
      <Button
        data-testid="connect-to-vega-wallet-btn"
        onClick={() => {
-          appDispatch({
-            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
-            isOpen: true,
-          });
          openVegaWalletDialog();
        }}
      >
@@ -13,12 +13,6 @@ export const VegaWalletDialogs = () => {
    <>
      <VegaConnectDialog
        connectors={Connectors}
-        onChangeOpen={(open) =>
-          appDispatch({
-            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
-            isOpen: open,
-          })
-        }
        riskMessage={<RiskMessage />}
      />

@@ -71,7 +71,6 @@ export const VegaWallet = () => {

 const VegaWalletNotConnected = () => {
  const { t } = useTranslation();
-  const { appDispatch } = useAppState();
  const { openVegaWalletDialog } = useVegaWalletDialogStore((store) => ({
    openVegaWalletDialog: store.openVegaWalletDialog,
  }));
@@ -79,10 +78,6 @@ const VegaWalletNotConnected = () => {
    <>
      <Button
        onClick={() => {
-          appDispatch({
-            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
-            isOpen: true,
-          });
          openVegaWalletDialog();
        }}
        fill={true}
@@ -28,9 +28,6 @@ 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;

@@ -52,9 +49,7 @@ 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,
@@ -69,18 +64,10 @@ 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,7 +14,6 @@ const initialAppState: AppState = {
  totalAssociated: new BigNumber(0),
  decimals: 0,
  totalSupply: new BigNumber(0),
-  vegaWalletOverlay: false,
  vegaWalletManageOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
@@ -31,23 +30,10 @@ 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: {
@@ -2,15 +2,18 @@ import {
  RestConnector,
  JsonRpcConnector,
  ViewConnector,
+  InjectedConnector,
 } from '@vegaprotocol/wallet';

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

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

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

@@ -14,7 +14,6 @@ const mockAppState: AppState = {
  totalAssociated: new BigNumber('50063005'),
  decimals: 18,
  totalSupply: mockTotalSupply,
-  vegaWalletOverlay: false,
  vegaWalletManageOverlay: false,
  transactionOverlay: false,
  bannerMessage: '',
@@ -2,14 +2,9 @@ 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,
  }));
@@ -26,10 +21,6 @@ export const ConnectToSeeRewards = () => {
      <Button
        data-testid="connect-to-vega-wallet-btn"
        onClick={() => {
-          appDispatch({
-            type: AppStateActionType.SET_VEGA_WALLET_OVERLAY,
-            isOpen: true,
-          });
          openVegaWalletDialog();
        }}
      >
@@ -14,5 +14,6 @@ module.exports = composePlugins(withNx(), withReact(), (config, context) => {
  return {
    ...config,
    plugins: [...additionalPlugins, ...config.plugins],
+    ignoreWarnings: [/Failed to parse source map/],
  };
 });
@@ -2,7 +2,6 @@ import { removeDecimal } from '@vegaprotocol/cypress';
 import * as Schema from '@vegaprotocol/types';
 import {
  OrderStatusMapping,
-  OrderTimeInForceMapping,
  OrderTypeMapping,
  Side,
 } from '@vegaprotocol/types';
@@ -17,7 +16,6 @@ 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"]';
@@ -92,16 +90,14 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {

    cy.highlight('deposit verification');

-    cy.getByTestId('asset', txTimeout).should('contain.text', btcSymbol);
+    cy.get('[col-id="asset.symbol"]', txTimeout).should(
+      'contain.text',
+      btcSymbol
+    );
    cy.getByTestId(depositsTab).click();
    cy.get('.ag-cell-value', txTimeout).should('contain.text', btcSymbol);
    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);

-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.get('[col-id="txHash"]')
      .should('have.length.above', 2)
      .eq(1)
@@ -149,7 +145,6 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
    // 1002-WITH-022
    // 1002-WITH-023
    // 0003-WTXN-011
-
    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();
    selectAsset(0);
@@ -160,18 +155,9 @@ describe('capsule - without MultiSign', { tags: '@slow' }, () => {
      'contain.text',
      'Funds unlocked'
    );
-    cy.getByTestId(toastCloseBtn).click();
-    cy.getByTestId('tab-withdrawals').within(() => {
-      cy.get('.ag-center-cols-container')
-        .children()
-        .first()
-        .within(() => {
-          cy.get('[col-id="status"]').should('contain.text', 'Pending');
-        });
-    });
-
+    // cy.getByTestId(toastCloseBtn).click();
    cy.highlight('withdrawals verification');
-    cy.getByTestId('toast-complete-withdrawal').click();
+    cy.getByTestId('toast-complete-withdrawal').last().click();

    cy.getByTestId(toastContent, txTimeout).should(
      'contain.text',
@@ -228,9 +214,12 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
      timeInForce: Schema.OrderTimeInForce.TIME_IN_FORCE_GTC,
    };
    const rawPrice = removeDecimal(order.price, market.decimalPlaces);
-
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId('Collateral').click();
-    cy.getByTestId('asset', txTimeout).should('contain.text', usdcSymbol);
+    cy.get('[col-id="asset.symbol"]', txTimeout).should(
+      'contain.text',
+      usdcSymbol
+    );

    createOrder(order);

@@ -269,10 +258,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
            OrderStatusMapping.STATUS_ACTIVE
          );

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

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

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

-          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderCreatedAt);
+          checkIfDataAndTimeOfCreationAndUpdateIsEqual(orderUpdatedAt);
        });
    });
  });
  it('can edit order', function () {
    const market = this.market;
    cy.visit(`/#/markets/${market.id}`);
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId(openOrdersTab).click();
+    cy.getByTestId('edit', txTimeout).should('be.visible');
    cy.getByTestId('edit').first().should('be.visible').click();
    cy.getByTestId('dialog-title').should('contain.text', 'Edit order');
    cy.get('#limitPrice').focus().clear().type(newPrice);
@@ -318,6 +306,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
  it('can cancel order', function () {
    const market = this.market;
    cy.visit(`/#/markets/${market.id}`);
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId(openOrdersTab).click();
    cy.getByTestId('cancel').first().click();
    cy.getByTestId(toastContent).should(
@@ -354,7 +343,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {

    cy.visit('/#/portfolio');
    cy.get('main[data-testid="/portfolio"]').should('exist');
-
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId('Withdrawals').click();
    cy.getByTestId('withdraw-dialog-button').click();
    connectEthereumWallet('Unknown');
@@ -365,14 +354,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
      'contain.text',
      'Funds unlocked'
    );
-    cy.getByTestId('tab-withdrawals').within(() => {
-      cy.get('.ag-center-cols-container')
-        .children()
-        .first()
-        .within(() => {
-          cy.get('[col-id="status"]').should('contain.text', 'Pending');
-        });
-    });

    cy.highlight('withdrawals verification');
    cy.getByTestId('toast-complete-withdrawal').click();
@@ -420,11 +401,6 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
      .eq(0, txTimeout)
      .should('contain.text', 'Completed');

-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.get('[col-id="txHash"]', txTimeout)
      .should('have.length.above', 1)
      .eq(1)
@@ -454,6 +430,7 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    // 1001-DEPO-007
    cy.visit('/#/portfolio');
    cy.get('main[data-testid="/portfolio"]').should('exist');
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId(depositsTab).click();
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
@@ -474,8 +451,8 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    // 1002-WITH-007

    cy.visit('/#/portfolio');
-    cy.get('main[data-testid="/portfolio"]').should('exist');
-
+    cy.get('main[data-testid="/portfolio"]', txTimeout).should('exist');
+    cy.getByTestId(toastCloseBtn, txTimeout).click();
    cy.getByTestId(depositsTab).click();
    cy.getByTestId('deposit-button').click();
    connectEthereumWallet('Unknown');
@@ -497,16 +474,14 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {

    cy.highlight('deposit verification');

-    cy.getByTestId('asset', txTimeout).should('contain.text', vegaSymbol);
+    cy.get('[col-id="asset.symbol"]', txTimeout).should(
+      'contain.text',
+      vegaSymbol
+    );
    cy.getByTestId(depositsTab).click();
    cy.get('.ag-cell-value', txTimeout).should('contain.text', vegaSymbol);
    cy.get('[col-id="status"]').should('not.have.text', 'Open', txTimeout);

-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.get('[col-id="txHash"]')
      .should('have.length.above', 2)
      .eq(1)
@@ -535,6 +510,16 @@ describe('capsule', { tags: '@slow', testIsolation: true }, () => {
    cy.getByTestId(toastCloseBtn).click();
    cy.getByTestId(completeWithdrawalBtn).first().should('be.visible').click();
    cy.getByTestId(toastContent, txTimeout).should('contain.text', 'Delayed');
+    cy.getByTestId('tab-withdrawals').within(() => {
+      cy.get('.ag-center-cols-container')
+        .children()
+        .first()
+        .within(() => {
+          cy.get('[col-id="status"]').contains(
+            /Delayed \(ready in (\d{1,2}:\d{2}:\d{2}:\d{2})\)/
+          );
+        });
+    });
  });
 });

@@ -68,14 +68,15 @@ 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(
-      2,
+      3,
      'Trading Mode',
      MarketTradingModeMapping.TRADING_MODE_CONTINUOUS
    );
-    validateMarketDataRow(3, 'Market Decimal Places', '5');
-    validateMarketDataRow(4, 'Position Decimal Places', '0');
-    validateMarketDataRow(5, 'Settlement Asset Decimal Places', '5');
+    validateMarketDataRow(4, 'Market Decimal Places', '5');
+    validateMarketDataRow(5, 'Position Decimal Places', '0');
+    validateMarketDataRow(6, 'Settlement Asset Decimal Places', '5');
  });

  it('instrument displayed', () => {
@@ -137,11 +137,6 @@ describe('Market trading page', () => {
            .realHover();
        });
      });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(expirtyTooltip)
        .eq(0)
        .should(
@@ -175,11 +170,6 @@ describe('Market trading page', () => {
            .realHover();
        });
      });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(tradingModeTooltip)
        .should(
          'contain.text',
@@ -206,11 +196,6 @@ describe('Market trading page', () => {
          cy.getByTestId(itemValue).realHover();
        });
      });
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.getByTestId(liquiditySuppliedTooltip)
        .should('contain.text', 'Supplied stake')
        .and('contain.text', 'Target stake')
@@ -16,7 +16,7 @@ const orderStatus = 'status';
 const orderRemaining = 'remaining';
 const orderPrice = 'price';
 const orderTimeInForce = 'timeInForce';
-const orderCreatedAt = 'createdAt';
+const orderUpdatedAt = 'updatedAt';
 const cancelOrderBtn = 'cancel';
 const cancelAllOrdersBtn = 'cancelAll';
 const editOrderBtn = 'edit';
@@ -46,6 +46,10 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
            cy.wrap($symbol).invoke('text').should('not.be.empty');
          });

+          cy.get(`[col-id='${orderRemaining}']`).each(($remaining) => {
+            cy.wrap($remaining).invoke('text').should('not.be.empty');
+          });
+
          cy.get(`[col-id='${orderSize}']`).each(($size) => {
            cy.wrap($size).invoke('text').should('not.be.empty');
          });
@@ -58,10 +62,6 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
            cy.wrap($status).invoke('text').should('not.be.empty');
          });

-          cy.get(`[col-id='${orderRemaining}']`).each(($remaining) => {
-            cy.wrap($remaining).invoke('text').should('not.be.empty');
-          });
-
          cy.get(`[col-id='${orderPrice}']`).each(($price) => {
            cy.wrap($price).invoke('text').should('not.be.empty');
          });
@@ -70,7 +70,7 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
            cy.wrap($timeInForce).invoke('text').should('not.be.empty');
          });

-          cy.get(`[col-id='${orderCreatedAt}']`).each(($dateTime) => {
+          cy.get(`[col-id='${orderUpdatedAt}']`).each(($dateTime) => {
            cy.wrap($dateTime).invoke('text').should('not.be.empty');
          });
        });
@@ -96,7 +96,8 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
          'have.text',
          'Partially Filled'
        );
-        cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7/10');
+        cy.get(`[col-id='${orderRemaining}']`).should('have.text', '7');
+        cy.get(`[col-id='${orderSize}']`).should('have.text', '-10');
        cy.getByTestId(cancelOrderBtn).should('not.exist');
        cy.getByTestId(editOrderBtn).should('not.exist');
      });
@@ -118,11 +119,6 @@ describe('orders list', { tags: '@smoke', testIsolation: true }, () => {
    cy.contains('Reset').click();
    cy.getByTestId('All').click();

-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.getByTestId('tab-orders')
      .get(`.ag-center-cols-container [col-id='${orderSymbol}']`)
      .should('have.length.at.least', expectedOrderList.length)
@@ -219,7 +215,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
    cy.getByTestId(`order-status-${orderId}`)
      .parentsUntil(`.ag-row`)
      .siblings(`[col-id=${orderRemaining}]`)
-      .should('have.text', '4/5');
+      .should('have.text', '4');
  });

  it('must see a filled order', () => {
@@ -267,7 +263,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
      status: Schema.OrderStatus.STATUS_ACTIVE,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find('[col-id="size"]')
+      .find(`[col-id="${orderSize}"]`)
      .should('have.text', '-15');
  });

@@ -281,7 +277,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
      status: Schema.OrderStatus.STATUS_ACTIVE,
    });
    cy.get(`[row-id=${orderId}]`)
-      .find('[col-id="size"]')
+      .find(`[col-id="${orderSize}"]`)
      .should('have.text', '+5');
  });

@@ -364,7 +360,7 @@ describe('subscribe orders', { tags: '@smoke' }, () => {
    });
    cy.get(`[row-id=${orderId}]`)
      .find(`[col-id='${orderTimeInForce}']`)
-      .should('have.text', "Good 'til Cancelled (GTC)");
+      .should('have.text', 'GTC');
  });

  it('for Active order when is part of a liquidity or peg shape, must not see an option to amend the individual order ', () => {
@@ -446,11 +442,6 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      peggedOrder: null,
      liquidityProvisionId: null,
    });
-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.get(`[row-id=${orderId}]`)
      .find('[data-testid="edit"]')
      .should('have.text', 'Edit')
@@ -480,11 +471,6 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      peggedOrder: null,
      liquidityProvisionId: null,
    });
-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.get(`[row-id=${orderId}]`)
      .find(`[data-testid="cancel"]`)
      .should('have.text', 'Cancel')
@@ -507,11 +493,6 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      peggedOrder: null,
      liquidityProvisionId: null,
    });
-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.get(`[data-testid="cancelAll"]`)
      .should('have.text', 'Cancel all')
      .then(($btn) => {
@@ -528,11 +509,6 @@ describe('amend and cancel order', { tags: '@smoke' }, () => {
      peggedOrder: null,
      liquidityProvisionId: null,
    });
-    /**
-     * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-     * You should use .then() to chain commands instead.
-     * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-     **/
    cy.get(`[row-id=${orderId}]`)
      .find('[data-testid="edit"]')
      .should('have.text', 'Edit')
@@ -47,11 +47,6 @@ describe('Portfolio page', { tags: '@smoke' }, () => {
      cy.get(
        '[role="columnheader"][col-id="fromAccountType"] .ag-header-cell-menu-button'
      ).click();
-      /**
-       * TODO(@nx/cypress): Nesting Cypress commands in a should assertion now throws.
-       * You should use .then() to chain commands instead.
-       * More Info: https://docs.cypress.io/guides/references/migration-guide#-should
-       **/
      cy.get('fieldset.ag-simple-filter-body-wrapper')
        .should('be.visible')
        .within((fields) => {
@@ -267,22 +267,22 @@ describe('positions', { tags: '@regression', testIsolation: true }, () => {
    cy.get('.ag-center-cols-container').within(() => {
      assertPNLColor(
        '[col-id="realisedPNL"]',
-        'text-vega-green',
-        'text-vega-pink'
+        'text-market-green-600',
+        'text-market-red'
      );
    });
    cy.get('.ag-center-cols-container').within(() => {
      assertPNLColor(
        '[col-id="unrealisedPNL"]',
-        'text-vega-green',
-        'text-vega-pink'
+        'text-market-green-600',
+        'text-market-red'
      );
    });
    cy.get('.ag-center-cols-container').within(() => {
      assertPNLColor(
        '[col-id="openVolume"]',
-        'text-vega-green',
-        'text-vega-pink'
+        'text-market-green-600',
+        'text-market-red'
      );
    });
  });
@@ -63,7 +63,7 @@ describe(
      cy.contains('Hosted Fairground wallet');

      cy.getByTestId('connectors-list')
-        .find('[data-testid="connector-hosted"]')
+        .find('[data-testid="connector-rest"]')
        .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-hosted"]')
+        .find('[data-testid="connector-rest"]')
        .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-hosted"]')
+        .find('[data-testid="connector-rest"]')
        .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.19-core-0.71.6
+NX_APP_VERSION=v0.20.21-core-0.71.6
@@ -11,7 +11,7 @@ cp .env.[environment] .env.local
 Starting the app:

 ```bash
-yarn nx serve explorer
+yarn nx serve trading
 ```

 ### Configuration
@@ -26,7 +26,7 @@ Example configurations are provided here:
 For convenience, you can boot the app injecting one of the configurations above by running:

 ```bash
-yarn env-cmd -f .\apps\token\.env.{env} yarn nx run token:serve # e.g. stagnet1
+yarn env-cmd -f .\apps\trading\.env.{env} yarn nx run trading:serve # e.g. stagnet1
 ```

 There are a few different configuration options offered for this app:
@@ -160,8 +160,9 @@ const DataRow = ({
 const PriceChange = ({ candles }: { candles: string[] }) => {
  const priceChange = candles ? priceChangePercentage(candles) : undefined;
  const priceChangeClasses = classNames('text-xs', {
-    'text-vega-pink': priceChange && priceChange < 0,
-    'text-vega-green': priceChange && priceChange > 0,
+    'text-market-red': priceChange && priceChange < 0,
+    'text-market-green-600 dark:text-market-green':
+      priceChange && priceChange > 0,
  });
  let prefix = '';
  if (priceChange && priceChange > 0) {
@@ -27,6 +27,7 @@ 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;
@@ -316,7 +317,8 @@ export const TradeGrid = ({ market, pinnedAsset }: TradeGridProps) => {
      <div className="border-b border-default min-w-0">
        <HeaderStats market={market} />
      </div>
-      <div className="col-span-2 bg-vega-green">
+      <div className="col-span-2">
+        <MarketSuccessorBanner market={market} />
        <OracleBanner marketId={market?.id || ''} />
      </div>
      {sidebarOpen && (
@@ -21,6 +21,7 @@ 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;
@@ -92,6 +93,7 @@ export const TradePanels = ({
        <HeaderStats market={market} />
      </div>
      <div>
+        <MarketSuccessorBanner market={market} />
        <OracleBanner marketId={market?.id || ''} />
      </div>
      <div className="h-full">
@@ -0,0 +1 @@
+export * from './market-successor-banner';
@@ -0,0 +1,188 @@
+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();
+    });
+  });
+});
@@ -0,0 +1,115 @@
+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,6 +190,9 @@ export const VegaWalletConnectButton = () => {
          >
            <DropdownMenuContent
              onInteractOutside={() => setDropdownOpen(false)}
+              sideOffset={20}
+              side="bottom"
+              align="end"
            >
              <div className="min-w-[340px]" data-testid="keypair-list">
                <DropdownMenuRadioGroup
@@ -2,10 +2,12 @@ import {
  RestConnector,
  JsonRpcConnector,
  ViewConnector,
+  InjectedConnector,
 } from '@vegaprotocol/wallet';

 export const rest = new RestConnector();
 export const jsonRpc = new JsonRpcConnector();
+export const injected = new InjectedConnector();

 let view: ViewConnector;
 if (typeof window !== 'undefined') {
@@ -16,6 +18,7 @@ if (typeof window !== 'undefined') {
 }

 export const Connectors = {
+  injected,
  rest,
  jsonRpc,
  view,
@@ -29,51 +29,57 @@ html.dark {

 /* PENNANT */

-html [data-theme='dark'] {
-  --pennant-color-danger: theme('colors.vega.pink.DEFAULT');
-
-  /* candles */
-  --pennant-color-buy-fill: theme('colors.vega.green.650');
-  --pennant-color-buy-stroke: theme('colors.vega.green.500');
+html [data-theme='dark'],
+html [data-theme='light'] {
  /* sell candles only use stroke as the candle is solid (without border) */
-  --pennant-color-sell-stroke: theme('colors.vega.pink.500');
+  --pennant-color-sell-stroke: theme('colors.market.red.500');

  /* studies */
-  --pennant-color-eldar-ray-bear-power: theme('colors.vega.pink.500');
-  --pennant-color-eldar-ray-bull-power: theme('colors.vega.green.650');
+  --pennant-color-eldar-ray-bear-power: theme('colors.market.red.500');
+  --pennant-color-eldar-ray-bull-power: theme('colors.market.green.600');

-  --pennant-color-macd-divergence-buy: theme('colors.vega.green.650');
-  --pennant-color-macd-divergence-sell: theme('colors.vega.pink.500');
+  --pennant-color-macd-divergence-buy: theme('colors.market.green.600');
+  --pennant-color-macd-divergence-sell: theme('colors.market.red.500');
  --pennant-color-macd-signal: theme('colors.vega.blue.500');
  --pennant-color-macd-macd: theme('colors.vega.yellow.500');

-  --pennant-color-volume-buy: theme('colors.vega.green.650');
-  --pennant-color-volume-sell: theme('colors.vega.pink.500');
-
-  /* depth chart */
-  --pennant-color-depth-buy-fill: theme('colors.vega.green.650');
-  --pennant-color-depth-buy-stroke: theme('colors.vega.green.500');
-  --pennant-color-depth-sell-fill: theme('colors.vega.pink.650');
-  --pennant-color-depth-sell-stroke: theme('colors.vega.pink.500');
+  --pennant-color-volume-sell: theme('colors.market.red.500');
 }

 html [data-theme='light'] {
-  --pennant-color-danger: theme('colors.vega.pink.500');
-
  /* candles */
-  --pennant-color-buy-fill: theme('colors.vega.green.400');
-  --pennant-color-buy-stroke: theme('colors.vega.green.550');
-  /* sell candles only use stroke as the candle is solid (without border) */
-  --pennant-color-sell-stroke: theme('colors.vega.pink.400');
+  --pennant-color-buy-fill: theme(colors.market.green.500);
+  --pennant-color-buy-stroke: theme(colors.market.green.600);

-  --pennant-color-volume-buy: theme('colors.vega.green.400');
-  --pennant-color-volume-sell: theme('colors.vega.pink.400');
+  /* sell uses stroke for fill and stroke */
+  --pennant-color-sell-stroke: theme(colors.market.red.500);

  /* depth chart */
-  --pennant-color-depth-buy-fill: theme('colors.vega.green.400');
-  --pennant-color-depth-buy-stroke: theme('colors.vega.green.550');
-  --pennant-color-depth-sell-fill: theme('colors.vega.pink.400');
-  --pennant-color-depth-sell-stroke: theme('colors.vega.pink.550');
+  --pennant-color-depth-buy-fill: theme(colors.market.green.500);
+  --pennant-color-depth-buy-stroke: theme(colors.market.green.600);
+  --pennant-color-depth-sell-fill: theme(colors.market.red.500);
+  --pennant-color-depth-sell-stroke: theme(colors.market.red.600);
+
+  --pennant-color-volume-buy: theme(colors.market.green.400);
+  --pennant-color-volume-sell: theme(colors.market.red.400);
+}
+
+html [data-theme='dark'] {
+  /* candles */
+  --pennant-color-buy-fill: theme(colors.market.green.600);
+  --pennant-color-buy-stroke: theme(colors.market.green.500);
+
+  /* sell uses stroke for fill and stroke */
+  --pennant-color-sell-stroke: theme(colors.market.red.500);
+
+  /* depth chart */
+  --pennant-color-depth-buy-fill: theme(colors.market.green.600);
+  --pennant-color-depth-buy-stroke: theme(colors.market.green.500);
+  --pennant-color-depth-sell-fill: theme(colors.market.red.600);
+  --pennant-color-depth-sell-stroke: theme(colors.market.red.500);
+
+  --pennant-color-volume-buy: theme(colors.market.green.600);
+  --pennant-color-volume-sell: theme(colors.market.red.600);
 }

 /* AG GRID - Do not edit without updating other global stylesheets for each app */
@@ -33,7 +33,7 @@ const colorClass = (percentageUsed: number, neutral = false) => {
  return classNames('text-right', {
    'text-neutral-500 dark:text-neutral-400': percentageUsed < 75 && !neutral,
    'text-vega-orange': percentageUsed >= 75 && percentageUsed < 90,
-    'text-vega-pink': percentageUsed >= 90,
+    'text-vega-red': percentageUsed >= 90,
  });
 };

@@ -189,7 +189,7 @@ export const MarginHealthChart = ({
        >
          <div
            data-testid="margin-health-chart-red"
-            className="bg-vega-pink-550"
+            className="bg-vega-red-550"
            style={{
              height: '100%',
              width: `${red * 100}%`,
@@ -1,6 +1,9 @@
 import { useEffect, useState } from 'react';
 import type { AppNameType, Announcement } from './schema';
-import { useAnnouncement } from './hooks/use-announcement';
+import {
+  useAnnouncement,
+  useDismissedAnnouncement,
+} from './hooks/use-announcement';
 import {
  AnnouncementBanner as Banner,
  ExternalLink,
@@ -36,6 +39,7 @@ export const AnnouncementBanner = ({
 }: AnnouncementBannerProps) => {
  const [isVisible, setVisible] = useState(false);
  const { data, reload } = useAnnouncement(app, configUrl);
+  const [, setDismissed] = useDismissedAnnouncement();

  useEffect(() => {
    const now = new Date();
@@ -88,7 +92,10 @@ export const AnnouncementBanner = ({
      <button
        className="absolute right-0 top-0 p-4 w-10 h-full flex items-center justify-center text-white"
        data-testid="app-announcement-close"
-        onClick={() => setVisible(false)}
+        onClick={() => {
+          setVisible(false);
+          setDismissed(data);
+        }}
      >
        <VegaIcon name={VegaIconNames.CROSS} size={24} />
      </button>
@@ -1,6 +1,8 @@
 import { useCallback, useEffect, useState } from 'react';
 import type { AppNameType, Announcement } from '../schema';
 import { AnnouncementsSchema } from '../schema';
+import { sha256 } from 'ethers/lib/utils';
+import { useLocalStorageSnapshot } from '@vegaprotocol/react-helpers';

 const getData = async (name: AppNameType, url: string) => {
  const now = new Date();
@@ -31,6 +33,22 @@ type State = {
  error: null | string;
 };

+const checksum = (data: object) => sha256(Buffer.from(JSON.stringify(data)));
+
+export const useDismissedAnnouncement = (): [
+  string | null | undefined,
+  (data: object) => void
+] => {
+  const [dismissed, setDismissedInStorage] = useLocalStorageSnapshot(
+    'dismissed-announcement'
+  );
+  const setDismissed = useCallback(
+    (data: object) => setDismissedInStorage(checksum(data)),
+    [setDismissedInStorage]
+  );
+  return [dismissed, setDismissed];
+};
+
 export const useAnnouncement = (name: AppNameType, url: string) => {
  const [state, setState] = useState<State>({
    loading: true,
@@ -38,12 +56,14 @@ export const useAnnouncement = (name: AppNameType, url: string) => {
    error: null,
  });

+  const [dismissed] = useDismissedAnnouncement();
+
  const fetchData = useCallback(() => {
    let mounted = true;

    getData(name, url)
      .then((data) => {
-        if (mounted) {
+        if (mounted && dismissed !== checksum(data)) {
          setState({
            loading: false,
            data,
@@ -64,7 +84,7 @@ export const useAnnouncement = (name: AppNameType, url: string) => {
    return () => {
      mounted = false;
    };
-  }, [name, url, setState]);
+  }, [name, url, dismissed]);

  useEffect(() => {
    fetchData();
@@ -1,5 +1,6 @@
-export const positiveClassNames = 'text-vega-green-550 dark:text-vega-green';
-export const negativeClassNames = 'text-vega-pink dark:text-vega-pink';
+export const positiveClassNames =
+  'text-market-green-600 dark:text-market-green';
+export const negativeClassNames = 'text-market-red dark:text-market-red';

 const isPositive = ({ value }: { value: string | bigint | number }) =>
  !!value &&
@@ -71,8 +71,8 @@ export const FlashCell = memo(({ children, value }: FlashCellProps) => {
    if (value < previousValue) {
      ref.current?.animate(
        [
-          { color: theme.colors.vega.pink.DEFAULT },
-          { color: theme.colors.vega.pink.DEFAULT, offset: 0.8 },
+          { color: theme.colors.market.red.DEFAULT },
+          { color: theme.colors.market.red.DEFAULT, offset: 0.8 },
          { color: 'inherit' },
        ],
        FLASH_DURATION
@@ -80,8 +80,8 @@ export const FlashCell = memo(({ children, value }: FlashCellProps) => {
    } else if (value > previousValue) {
      ref.current?.animate(
        [
-          { color: theme.colors.vega.green.DEFAULT },
-          { color: theme.colors.vega.green.DEFAULT, offset: 0.8 },
+          { color: theme.colors.market.green.DEFAULT },
+          { color: theme.colors.market.green.DEFAULT, offset: 0.8 },
          { color: 'inherit' },
        ],
        FLASH_DURATION
@@ -19,19 +19,14 @@ export const Size = ({
      data-testid="size"
      className={classNames('text-right', {
        // BUY
-        'text-vega-green-550 dark:text-vega-green':
+        'text-market-green-600 dark:text-market-green':
          side === Schema.Side.SIDE_BUY && !forceTheme,
-        'text-vega-green-550':
+        'text-market-green-600':
          side === Schema.Side.SIDE_BUY && forceTheme === 'light',
-        'text-vega-green':
+        'text-market-green':
          side === Schema.Side.SIDE_BUY && forceTheme === 'dark',
        // SELL
-        'text-vega-pink-550 dark:text-vega-pink':
-          side === Schema.Side.SIDE_SELL && !forceTheme,
-        'text-vega-pink-550':
-          side === Schema.Side.SIDE_SELL && forceTheme === 'light',
-        'text-vega-pink':
-          side === Schema.Side.SIDE_SELL && forceTheme === 'dark',
+        'text-market-red': side === Schema.Side.SIDE_SELL,
      })}
    >
      {side === Schema.Side.SIDE_BUY
@@ -1,17 +1,24 @@
 import { t } from '@vegaprotocol/i18n';
-import type { ButtonVariant } from '@vegaprotocol/ui-toolkit';
-import { Button } from '@vegaprotocol/ui-toolkit';
+import { Side } from '@vegaprotocol/types';
+import classNames from 'classnames';

 interface Props {
-  variant: ButtonVariant;
+  side: Side;
 }

-export const DealTicketButton = ({ variant }: Props) => {
+export const DealTicketButton = ({ side }: Props) => {
+  const buttonClasses = classNames(
+    'px-10 py-2 uppercase rounded-md text-white w-full',
+    {
+      'bg-market-red-500': side === Side.SIDE_SELL,
+      'bg-market-green-550': side === Side.SIDE_BUY,
+    }
+  );
  return (
    <div className="mb-2">
-      <Button variant={variant} fill type="submit" data-testid="place-order">
+      <button type="submit" data-testid="place-order" className={buttonClasses}>
        {t('Place order')}
-      </Button>
+      </button>
    </div>
  );
 };
@@ -476,11 +476,7 @@ export const DealTicket = ({
          pubKey={pubKey}
          onClickCollateral={onClickCollateral}
        />
-        <DealTicketButton
-          variant={
-            order.side === Schema.Side.SIDE_BUY ? 'ternary' : 'secondary'
-          }
-        />
+        <DealTicketButton side={order.side} />
        <DealTicketFeeDetails
          onMarketClick={onMarketClick}
          feeEstimate={feeEstimate}
@@ -85,7 +85,7 @@ describe('FillsTable', () => {
    });

    const amountCell = cells.find((c) => c.getAttribute('col-id') === 'size');
-    expect(amountCell).toHaveClass('text-vega-green-550');
+    expect(amountCell).toHaveClass('text-market-green-600');
  });

  it('should format cells correctly for seller fill', async () => {
@@ -120,7 +120,7 @@ describe('FillsTable', () => {
    });

    const amountCell = cells.find((c) => c.getAttribute('col-id') === 'size');
-    expect(amountCell).toHaveClass('text-vega-pink');
+    expect(amountCell).toHaveClass('text-market-red');
  });

  it('should format cells correctly for side unspecified', async () => {
@@ -155,7 +155,7 @@ describe('FillsTable', () => {
    });

    const amountCell = cells.find((c) => c.getAttribute('col-id') === 'size');
-    expect(amountCell).toHaveClass('text-vega-pink');
+    expect(amountCell).toHaveClass('text-market-red');
  });

  it('should render correct maker or taker role', async () => {
@@ -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>;
@@ -28,8 +28,8 @@ const CumulationBar = ({
      className={classNames(
        'absolute top-0 left-0 h-full transition-all',
        type === VolumeType.bid
-          ? 'bg-vega-green/20 dark:bg-vega-green/50'
-          : 'bg-vega-pink/20 dark:bg-vega-pink/30'
+          ? 'bg-market-green-300 dark:bg-market-green/50'
+          : 'bg-market-red-300 dark:bg-market-red/30'
      )}
      style={{
        width: `${cumulativeValue}%`,
@@ -93,8 +93,8 @@ export const OrderbookRow = React.memo(
            valueFormatted={addDecimalsFixedFormatNumber(price, decimalPlaces)}
            className={
              type === VolumeType.ask
-                ? '!text-vega-pink dark:text-vega-pink'
-                : 'text-vega-green-550 dark:text-vega-green'
+                ? 'text-market-red dark:text-market-red'
+                : 'text-market-green-600 dark:text-market-green'
            }
          />
          <NumericCell
@@ -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, 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, 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 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, 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, 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 const DataSourceFilterFragmentDoc = gql`
    fragment DataSourceFilter on Filter {
@@ -104,6 +104,7 @@ export const MarketFieldsFragmentDoc = gql`
    open
    close
  }
+  successorMarketID
 }
    ${DataSourceSpecFragmentDoc}`;
 export const MarketsDocument = gql`
@@ -142,5 +142,6 @@ 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, 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, 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 const DataSourceFragmentDoc = gql`
    fragment DataSource on DataSourceDefinition {
@@ -158,6 +158,7 @@ export const MarketInfoDocument = gql`
        }
      }
    }
+    parentMarketID
  }
 }
    ${DataSourceFragmentDoc}`;
@@ -144,6 +144,7 @@ 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,6 +191,7 @@ export const marketInfoQuery = (
          },
        },
      },
+      parentMarketID: 'market-1',
    },
  };

@@ -102,4 +102,5 @@ 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'),
 };
@@ -104,7 +104,7 @@ export const OracleBasicProfile = ({
              'text-vega-blue': intent === Intent.Primary,
              'text-vega-green dark:text-vega-green': intent === Intent.Success,
              'text-yellow-600 dark:text-yellow': intent === Intent.Warning,
-              'text-vega-pink': intent === Intent.Danger,
+              'text-vega-red': intent === Intent.Danger,
            },
            'flex items-start align-text-bottom p-1'
          )}
@@ -40,7 +40,7 @@ export const OracleProfileTitle = ({ provider }: { provider: Provider }) => {
            'text-vega-blue': intent === Intent.Primary,
            'text-vega-green dark:text-vega-green': intent === Intent.Success,
            'text-yellow-600 dark:text-yellow': intent === Intent.Warning,
-            'text-vega-pink': intent === Intent.Danger,
+            'text-vega-red': intent === Intent.Danger,
          },
          'flex items-start align-text-bottom p-1'
        )}
@@ -85,6 +85,7 @@ fragment MarketFields on Market {
    open
    close
  }
+  successorMarketID
 }

 query Markets {
@@ -76,54 +76,4 @@ describe('order data provider', () => {
      )?.length
    ).toEqual(5);
  });
-  it('add only data matching date range filter', () => {
-    const data = [
-      {
-        id: '1',
-        createdAt: new Date('2022-01-29').toISOString(),
-      },
-      {
-        id: '2',
-        createdAt: new Date('2022-01-30').toISOString(),
-      },
-    ] as OrderFieldsFragment[];
-
-    const delta = [
-      // this one should be ignored because it does not match date range
-      {
-        id: '0',
-        createdAt: new Date('2022-02-02').toISOString(),
-      },
-      // this one should be updated
-      {
-        id: '2',
-        updatedAt: new Date('2022-01-31').toISOString(),
-        createdAt: new Date('2022-01-30').toISOString(),
-      },
-      // this should be added
-      {
-        id: '4',
-        createdAt: new Date('2022-01-31').toISOString(),
-      },
-    ] as OrderUpdateFieldsFragment[];
-
-    const updatedData = update(
-      data,
-      filterOrderUpdates(delta),
-      {
-        partyId: '0x123',
-        filter: {
-          dateRange: { end: new Date('2022-02-01').toISOString() },
-        },
-      },
-      mapOrderUpdateToOrder
-    );
-    expect(updatedData?.findIndex((node) => node.id === delta[0].id)).toEqual(
-      -1
-    );
-    expect(updatedData && updatedData[0].id).toEqual(delta[2].id);
-    expect(updatedData && updatedData[0].updatedAt).toEqual(delta[2].updatedAt);
-    expect(updatedData && updatedData[2].id).toEqual(delta[1].id);
-    expect(updatedData && updatedData[2].updatedAt).toEqual(delta[1].updatedAt);
-  });
 });
@@ -39,13 +39,6 @@ const orderMatchFilters = (
    return true;
  }

-  if (
-    variables?.filter?.status &&
-    !(order.status && variables.filter.status.includes(order.status))
-  ) {
-    return false;
-  }
-
  if (
    variables?.filter?.liveOnly &&
    !(order.status && liveOnlyOrderStatuses.includes(order.status))
@@ -53,34 +46,6 @@ const orderMatchFilters = (
    return false;
  }

-  if (
-    variables?.filter?.types &&
-    !(order.type && variables.filter.types.includes(order.type))
-  ) {
-    return false;
-  }
-  if (
-    variables?.filter?.timeInForce &&
-    !variables.filter.timeInForce.includes(order.timeInForce)
-  ) {
-    return false;
-  }
-  if (variables?.filter?.excludeLiquidity && order.liquidityProvisionId) {
-    return false;
-  }
-  if (
-    variables?.filter?.dateRange?.start &&
-    !(order.createdAt && variables.filter.dateRange.start < order.createdAt)
-  ) {
-    return false;
-  }
-  if (
-    variables?.filter?.dateRange?.end &&
-    !(order.createdAt && variables.filter.dateRange.end > order.createdAt)
-  ) {
-    return false;
-  }
-
  return true;
 };

@@ -50,13 +50,12 @@ describe('OrderListTable', () => {
    });
    const expectedHeaders = [
      'Market',
+      'Filled',
      'Size',
      'Type',
      'Status',
-      'Filled',
      'Price',
      'Time In Force',
-      'Created At',
      'Updated At',
      '', // no cell header for edit/cancel
    ];
@@ -73,14 +72,13 @@ describe('OrderListTable', () => {
    const cells = screen.getAllByRole('gridcell');
    const expectedValues: string[] = [
      marketOrder.market?.tradableInstrument.instrument.code || '',
-      '+0.10',
+      '0.05',
+      '0.10',
      Schema.OrderTypeMapping[marketOrder.type as Schema.OrderType] || '',
      Schema.OrderStatusMapping[marketOrder.status],
-      '5',
      '-',
-      Schema.OrderTimeInForceMapping[marketOrder.timeInForce],
+      Schema.OrderTimeInForceCode[marketOrder.timeInForce],
      getDateTimeFormat().format(new Date(marketOrder.createdAt)),
-      '-',
      'Edit',
    ];
    expectedValues.forEach((expectedValue, i) =>
@@ -96,16 +94,15 @@ describe('OrderListTable', () => {

    const expectedValues: string[] = [
      limitOrder.market?.tradableInstrument.instrument.code || '',
-      '+0.10',
+      '0.05',
+      '0.10',
      Schema.OrderTypeMapping[limitOrder.type || Schema.OrderType.TYPE_LIMIT],
      Schema.OrderStatusMapping[limitOrder.status],
-      '5',
      '-',
      `${
-        Schema.OrderTimeInForceMapping[limitOrder.timeInForce]
+        Schema.OrderTimeInForceCode[limitOrder.timeInForce]
      }: ${getDateTimeFormat().format(new Date(limitOrder.expiresAt ?? ''))}`,
      getDateTimeFormat().format(new Date(limitOrder.createdAt)),
-      '-',
      'Edit',
    ];
    expectedValues.forEach((expectedValue, i) =>
@@ -124,7 +121,7 @@ describe('OrderListTable', () => {
      render(generateJsx({ rowData: [rejectedOrder] }));
    });
    const cells = screen.getAllByRole('gridcell');
-    expect(cells[3]).toHaveTextContent(
+    expect(cells[4]).toHaveTextContent(
      `${Schema.OrderStatusMapping[rejectedOrder.status]}: ${
        Schema.OrderRejectionReasonMapping[rejectedOrder.rejectionReason]
      }`
@@ -193,7 +190,7 @@ describe('OrderListTable', () => {
      });

      const amendCell = getAmendCell();
-      const typeCell = screen.getAllByRole('gridcell')[2];
+      const typeCell = screen.getAllByRole('gridcell')[3];
      expect(typeCell).toHaveTextContent('Liquidity provision');
      expect(amendCell.queryByTestId('edit')).not.toBeInTheDocument();
      expect(amendCell.queryByTestId('cancel')).not.toBeInTheDocument();
@@ -215,7 +212,7 @@ describe('OrderListTable', () => {
      });

      const amendCell = getAmendCell();
-      const typeCell = screen.getAllByRole('gridcell')[2];
+      const typeCell = screen.getAllByRole('gridcell')[3];
      expect(typeCell).toHaveTextContent('Mid - 10.0 Peg limit');
      expect(amendCell.queryByTestId('edit')).toBeInTheDocument();
      expect(amendCell.queryByTestId('cancel')).toBeInTheDocument();
@@ -63,6 +63,38 @@ export const OrderListTable = memo<
            cellRendererParams: { idPath: 'market.id', onMarketClick },
            minWidth: 150,
          },
+          {
+            headerName: t('Filled'),
+            field: 'remaining',
+            cellClass: 'font-mono text-right',
+            type: 'rightAligned',
+            valueGetter: ({ data }: VegaValueGetterParams<Order>) => {
+              return data?.size && data.market
+                ? toBigNum(
+                    (BigInt(data.size) - BigInt(data.remaining)).toString(),
+                    data.market.positionDecimalPlaces ?? 0
+                  ).toNumber()
+                : undefined;
+            },
+            valueFormatter: ({
+              data,
+              value,
+            }: VegaValueFormatterParams<Order, 'remaining'>): string => {
+              if (!data) {
+                return '';
+              }
+              if (!data?.market || !isNumeric(value) || !isNumeric(data.size)) {
+                return '-';
+              }
+              return addDecimalsFormatNumber(
+                (BigInt(data.size) - BigInt(data.remaining)).toString(),
+                data.market.positionDecimalPlaces
+              );
+            },
+            minWidth: 50,
+            width: 90,
+            flex: 0,
+          },
          {
            headerName: t('Size'),
            field: 'size',
@@ -103,7 +135,9 @@ export const OrderListTable = memo<
                )
              );
            },
-            minWidth: 80,
+            minWidth: 50,
+            width: 80,
+            flex: 0,
          },
          {
            field: 'type',
@@ -150,38 +184,6 @@ export const OrderListTable = memo<
            ),
            minWidth: 100,
          },
-          {
-            headerName: t('Filled'),
-            field: 'remaining',
-            cellClass: 'font-mono text-right',
-            type: 'rightAligned',
-            valueGetter: ({ data }: VegaValueGetterParams<Order>) => {
-              return data?.size && data.market
-                ? toBigNum(
-                    (BigInt(data.size) - BigInt(data.remaining)).toString(),
-                    data.market.positionDecimalPlaces ?? 0
-                  ).toNumber()
-                : undefined;
-            },
-            valueFormatter: ({
-              data,
-              value,
-            }: VegaValueFormatterParams<Order, 'remaining'>): string => {
-              if (!data) {
-                return '';
-              }
-              if (!data?.market || !isNumeric(value) || !isNumeric(data.size)) {
-                return '-';
-              }
-              const { positionDecimalPlaces } = data.market;
-              const filled = BigInt(data.size) - BigInt(data.remaining);
-              return `${addDecimalsFormatNumber(
-                filled.toString(),
-                positionDecimalPlaces
-              )}/${addDecimalsFormatNumber(data.size, positionDecimalPlaces)}`;
-            },
-            minWidth: 100,
-          },
          {
            field: 'price',
            type: 'rightAligned',
@@ -221,12 +223,10 @@ export const OrderListTable = memo<
                const expiry = getDateTimeFormat().format(
                  new Date(data.expiresAt)
                );
-                return `${Schema.OrderTimeInForceMapping[value]}: ${expiry}`;
+                return `${Schema.OrderTimeInForceCode[value]}: ${expiry}`;
              }

-              const tifLabel = value
-                ? Schema.OrderTimeInForceMapping[value]
-                : '';
+              const tifLabel = value ? Schema.OrderTimeInForceCode[value] : '';
              const label = `${tifLabel}${
                data?.postOnly ? t('. Post Only') : ''
              }${data?.reduceOnly ? t('. Reduce only') : ''}`;
@@ -235,29 +235,18 @@ export const OrderListTable = memo<
            },
            minWidth: 150,
          },
-          {
-            field: 'createdAt',
-            filter: DateRangeFilter,
-            cellRenderer: ({
-              value,
-            }: VegaICellRendererParams<Order, 'createdAt'>) => {
-              return (
-                <span data-value={value}>
-                  {value ? getDateTimeFormat().format(new Date(value)) : value}
-                </span>
-              );
-            },
-            minWidth: 150,
-          },
          {
            field: 'updatedAt',
+            filter: DateRangeFilter,
+            valueGetter: ({ data }: VegaValueGetterParams<Order>) =>
+              data?.updatedAt || data?.createdAt,
            cellRenderer: ({
              data,
-              value,
            }: VegaICellRendererParams<Order, 'updatedAt'>) => {
              if (!data) {
                return undefined;
              }
+              const value = data.updatedAt || data.createdAt;
              return (
                <span data-value={value}>
                  {value ? getDateTimeFormat().format(new Date(value)) : '-'}
@@ -102,8 +102,8 @@ it('add color and sign to amount, displays positive notional value', async () =>
  });
  let cells = screen.getAllByRole('gridcell');

-  expect(cells[2].classList.contains('text-vega-green-550')).toBeTruthy();
-  expect(cells[2].classList.contains('text-vega-pink')).toBeFalsy();
+  expect(cells[2].classList.contains('text-market-green-600')).toBeTruthy();
+  expect(cells[2].classList.contains('text-market-red')).toBeFalsy();
  expect(cells[2].textContent).toEqual('+100');
  expect(cells[1].textContent).toEqual('1,230.0');
  await act(async () => {
@@ -115,8 +115,8 @@ it('add color and sign to amount, displays positive notional value', async () =>
    );
  });
  cells = screen.getAllByRole('gridcell');
-  expect(cells[2].classList.contains('text-vega-green-550')).toBeFalsy();
-  expect(cells[2].classList.contains('text-vega-pink')).toBeTruthy();
+  expect(cells[2].classList.contains('text-market-green-600')).toBeFalsy();
+  expect(cells[2].classList.contains('text-market-red')).toBeTruthy();
  expect(cells[2].textContent?.startsWith('-100')).toBeTruthy();
  expect(cells[1].textContent).toEqual('1,230.0');
 });
@@ -13,6 +13,28 @@ module.exports = {
    current: 'currentColor',
    black: '#000000',
    white: '#FFFFFF',
+    market: {
+      red: {
+        // same as vega-red
+        700: '#2F000C',
+        600: '#7B001F',
+        550: '#B3002E',
+        DEFAULT: '#EC003C',
+        500: '#EC003C',
+        400: '#F57382',
+        300: '#FDD9DC',
+      },
+      green: {
+        // same as vega-green
+        700: '#012915',
+        600: '#01914B',
+        550: '#01C566',
+        DEFAULT: '#00F780',
+        500: '#00F780',
+        400: '#74BE8E',
+        300: '#DDFEE8',
+      },
+    },
    vega: {
      // YELLOW
      yellow: {
@@ -32,7 +54,7 @@ module.exports = {
      green: {
        700: '#012915',
        650: '#015D30',
-        600: '#01914B',
+        600: '#008545',
        550: '#01C566',
        DEFAULT: '#00F780',
        500: '#00F780',
@@ -84,6 +106,20 @@ module.exports = {
        300: '#FFD7EA',
      },

+      // RED
+      red: {
+        700: '#2F000C',
+        650: '#550016',
+        600: '#7B001F',
+        550: '#B3002E',
+        DEFAULT: '#EC003C',
+        500: '#EC003C',
+        450: '#F03D6B',
+        400: '#F4668A',
+        350: '#F78FA9',
+        300: '#F8A3B9',
+      },
+
      // ORANGE
      orange: {
        700: '#2A1701',
@@ -19,8 +19,8 @@ import type { AgGridReactProps } from 'ag-grid-react';
 import type { Trade } from './trades-data-provider';
 import { Side } from '@vegaprotocol/types';

-export const BUY_CLASS = 'text-vega-green dark:text-vega-green';
-export const SELL_CLASS = 'text-vega-pink dark:text-vega-pink';
+export const BUY_CLASS = 'text-market-green-600 dark:text-market-green';
+export const SELL_CLASS = 'text-market-red dark:text-market-red';

 const changeCellClass = ({ node }: CellClassParams) => {
  let colorClass = '';
@@ -356,6 +356,13 @@ 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';
@@ -367,6 +374,8 @@ 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 */
@@ -1123,6 +1132,17 @@ 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';
@@ -1134,6 +1154,17 @@ 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';
@@ -1305,10 +1336,12 @@ export type LiquidityProviderFeeShare = {
  averageEntryValuation: Scalars['String'];
  /** The average liquidity score */
  averageScore: Scalars['String'];
-  /** The share owned by this liquidity provider (float) */
+  /** The share owned by this liquidity provider */
  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 */
@@ -1323,7 +1356,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?: Maybe<Scalars['ID']>;
+  id: Scalars['ID'];
  /** Market for the order */
  market: Market;
  /** The party making this commitment */
@@ -1372,7 +1405,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?: Maybe<Scalars['ID']>;
+  id: Scalars['ID'];
  /** Market for the order */
  marketID: Scalars['ID'];
  /** The party making this commitment */
@@ -1546,6 +1579,8 @@ 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 */
@@ -1563,6 +1598,11 @@ 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.
@@ -1580,6 +1620,8 @@ 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 */
@@ -1672,12 +1714,16 @@ 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) */
@@ -1775,7 +1821,7 @@ export type MarketDepthUpdate = {
  sequenceNumber: Scalars['String'];
 };

-/** Edge type containing the order and cursor information returned by a OrderConnection */
+/** Edge type containing the market and cursor information returned by a MarketConnection */
 export type MarketEdge = {
  __typename?: 'MarketEdge';
  /** The cursor for this market */
@@ -1932,7 +1978,7 @@ export type NewMarket = {
  decimalPlaces: Scalars['Int'];
  /** New market instrument configuration */
  instrument: InstrumentConfiguration;
-  /** Linear slippage factor is used to cap the slippage component of maintainence margin - it is applied to the slippage volume */
+  /** Linear slippage factor is used to cap the slippage component of maintenance margin - it is applied to the slippage volume */
  linearSlippageFactor: Scalars['String'];
  /** Liquidity monitoring parameters */
  liquidityMonitoringParameters: LiquidityMonitoringParameters;
@@ -1944,10 +1990,34 @@ export type NewMarket = {
  positionDecimalPlaces: Scalars['Int'];
  /** Price monitoring parameters */
  priceMonitoringParameters: PriceMonitoringParameters;
-  /** Quadratic slippage factor is used to cap the slippage component of maintainence margin - it is applied to the square of the slippage volume */
+  /** Quadratic slippage factor is used to cap the slippage component of maintenance 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 */
@@ -2161,10 +2231,14 @@ 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 */
@@ -2229,6 +2303,13 @@ 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';
@@ -2293,6 +2374,8 @@ 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 */
@@ -2537,6 +2620,35 @@ 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 */
@@ -2576,6 +2688,8 @@ 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 */
@@ -3089,7 +3203,7 @@ export type Proposal = {
  votes: ProposalVotes;
 };

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

 export type ProposalDetail = {
  __typename?: 'ProposalDetail';
@@ -3160,6 +3274,12 @@ 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 */
@@ -3184,6 +3304,10 @@ 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 */
@@ -3499,6 +3623,12 @@ 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 */
@@ -3558,6 +3688,7 @@ 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']>;
 };

@@ -3803,6 +3934,27 @@ 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>;
@@ -3847,6 +3999,15 @@ 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';
@@ -4182,6 +4343,117 @@ 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';
@@ -4314,6 +4586,40 @@ 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';
@@ -4546,7 +4852,7 @@ export type TransferEdge = {
  node: Transfer;
 };

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

 export type TransferResponse = {
  __typename?: 'TransferResponse';
@@ -4593,6 +4899,10 @@ 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 */
@@ -4619,6 +4929,8 @@ 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,6 +321,15 @@ 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',
 };

 /**
@@ -419,6 +428,9 @@ 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 = {
@@ -446,6 +458,9 @@ 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 = {
@@ -45,7 +45,7 @@ export function Dialog({
    'dark:bg-black bg-white dark:text-white',
    getIntentBorder(intent),
    {
-      'w-[620px]': size === 'small',
+      'w-[520px]': 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} />
+                <VegaIcon name={VegaIconNames.CROSS} size={24} />
              </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"
-    sideOffset={10}
+    {...contentProps}
  />
 ));

@@ -0,0 +1,7 @@
+export const IconChevronLeft = ({ size = 16 }: { size: number }) => {
+  return (
+    <svg width={size} height={size} viewBox="0 0 16 16">
+      <path d="M10.38 1.62L11.13 2.38L5.5 8L11.13 13.62L10.38 14.38L4 8L10.38 1.62Z" />
+    </svg>
+  );
+};
@@ -2,6 +2,7 @@ import { IconArrowDown } from './svg-icons/icon-arrow-down';
 import { IconArrowRight } from './svg-icons/icon-arrow-right';
 import { IconBreakdown } from './svg-icons/icon-breakdown';
 import { IconChevronDown } from './svg-icons/icon-chevron-down';
+import { IconChevronLeft } from './svg-icons/icon-chevron-left';
 import { IconChevronUp } from './svg-icons/icon-chevron-up';
 import { IconCopy } from './svg-icons/icon-copy';
 import { IconCross } from './svg-icons/icon-cross';
@@ -26,6 +27,7 @@ export enum VegaIconNames {
  ARROW_RIGHT = 'arrow-right',
  BREAKDOWN = 'breakdown',
  CHEVRON_DOWN = 'chevron-down',
+  CHEVRON_LEFT = 'chevron-left',
  CHEVRON_UP = 'chevron-up',
  COPY = 'copy',
  CROSS = 'cross',
@@ -53,6 +55,7 @@ export const VegaIconNameMap: Record<
  'arrow-down': IconArrowDown,
  'arrow-right': IconArrowRight,
  'chevron-down': IconChevronDown,
+  'chevron-left': IconChevronLeft,
  'chevron-up': IconChevronUp,
  'open-external': IconOpenExternal,
  'question-mark': IconQuestionMark,
@@ -25,7 +25,7 @@ export const NotificationBanner = ({
          'bg-vega-green-300 dark:bg-vega-green-700': intent === Intent.Success,
          'bg-vega-orange-300 dark:bg-vega-orange-700':
            intent === Intent.Warning,
-          'bg-vega-pink-300 dark:bg-vega-pink-700': intent === Intent.Danger,
+          'bg-vega-red-300 dark:bg-vega-red-700': intent === Intent.Danger,
        },
        {
          'border-b-vega-light-200 dark:border-b-vega-dark-200 ':
@@ -40,7 +40,7 @@ export const NotificationBanner = ({
          'border-b-vega-orange-500 dark:border-b-vega-orange-500':
            intent === Intent.Warning,

-          'border-b-vega-pink-500 dark:border-b-vega-pink-500':
+          'border-b-vega-red-500 dark:border-b-vega-red-500':
            intent === Intent.Danger,
        }
      )}
@@ -59,7 +59,7 @@ export const NotificationBanner = ({
            'text-vega-orange-500 dark:text-vega-orange-500':
              intent === Intent.Warning,

-            'text-vega-pink-500 dark:text-vega-pink-500':
+            'text-vega-red-500 dark:text-vega-red-500':
              intent === Intent.Danger,
          })}
        />
@@ -36,7 +36,7 @@ it('Renders a red line if the last value is less than the first', () => {
  const paths = screen.getAllByTestId('sparkline-path');
  const path = paths[0];
  expect(path).toHaveClass(
-    '[vector-effect:non-scaling-stroke] stroke-vega-pink dark:stroke-vega-pink'
+    '[vector-effect:non-scaling-stroke] stroke-market-red dark:stroke-market-red'
  );
 });

@@ -48,7 +48,7 @@ it('Renders a green line if the last value is greater than the first', () => {
  const paths = screen.getAllByTestId('sparkline-path');
  const path = paths[0];
  expect(path).toHaveClass(
-    '[vector-effect:non-scaling-stroke] stroke-vega-green dark:stroke-vega-green'
+    '[vector-effect:non-scaling-stroke] stroke-market-green-600 dark:stroke-market-green'
  );
 });

@@ -9,8 +9,8 @@ function colorByChange(a: number, b: number) {
  return a === b
    ? 'stroke-black/40 dark:stroke-white/40'
    : a < b
-    ? 'stroke-vega-green dark:stroke-vega-green'
-    : 'stroke-vega-pink dark:stroke-vega-pink';
+    ? 'stroke-market-green-600 dark:stroke-market-green'
+    : 'stroke-market-red dark:stroke-market-red';
 }

 export interface SparklineProps {
@@ -38,14 +38,12 @@ export const Toggle = ({
    'relative inline-flex w-full h-full text-center items-center justify-center',
    'peer-checked:rounded-full',
    {
-      'peer-checked:bg-neutral-400 dark:peer-checked:bg-white dark:peer-checked:text-black':
+      'peer-checked:bg-neutral-400 dark:peer-checked:bg-white peer-checked:text-white dark:peer-checked:text-black':
        type === 'primary',
-      'dark:peer-checked:bg-vega-green peer-checked:bg-vega-green-550':
+      'peer-checked:bg-market-green-550 peer-checked:text-white':
        type === 'buy',
-      'dark:peer-checked:bg-vega-pink peer-checked:bg-vega-pink-550':
-        type === 'sell',
+      'peer-checked:bg-market-red-500 peer-checked:text-white': type === 'sell',
    },
-    'peer-checked:text-white dark:peer-checked:text-black',
    'cursor-pointer peer-checked:cursor-auto select-none',
    {
      'px-10 py-2': size === 'lg',
@@ -1,7 +1,10 @@
 import { DocsLinks, ExternalLinks } from '@vegaprotocol/environment';
 import { t } from '@vegaprotocol/i18n';
 import { Link } from '@vegaprotocol/ui-toolkit';
+import classNames from 'classnames';
 import type { ReactNode } from 'react';
+import type { VegaConnector } from '../connectors';
+import { RestConnector } from '../connectors';

 export const ConnectDialogTitle = ({ children }: { children: ReactNode }) => {
  return (
@@ -18,11 +21,35 @@ export const ConnectDialogContent = ({ children }: { children: ReactNode }) => {
  return <div>{children}</div>;
 };

-export const ConnectDialogFooter = ({ children }: { children?: ReactNode }) => {
+export const ConnectDialogFooter = ({
+  connector,
+}: {
+  connector: VegaConnector | undefined;
+}) => {
+  const wrapperClasses = classNames(
+    'flex justify-center gap-4',
+    'px-4 md:px-8 pt-4 md:pt-6',
+    'border-t border-vega-light-200 dark:border-vega-dark-200',
+    'text-vega-light-400 dark:text-vega-dark-400'
+  );
+  const isHostedWalletSelected = connector instanceof RestConnector;
  return (
-    <footer className="flex justify-center gap-4 px-4 md:px-8 pt-4 md:pt-6 -mx-4 md:-mx-8 border-t border-neutral-500 text-neutral-500 dark:text-neutral-400 mt-6">
-      {children ? (
-        children
+    <footer className={wrapperClasses}>
+      {isHostedWalletSelected ? (
+        <p className="text-center">
+          {t('For demo purposes get a ')}
+          <Link
+            href={ExternalLinks.VEGA_WALLET_HOSTED_URL}
+            target="_blank"
+            rel="noreferrer"
+          >
+            {t('hosted wallet')}
+          </Link>
+          {t(', or for the real experience create a wallet in the ')}
+          <Link href={ExternalLinks.VEGA_WALLET_URL}>
+            {t('Vega wallet app')}
+          </Link>
+        </p>
      ) : (
        <>
          <Link href={ExternalLinks.VEGA_WALLET_URL}>
@@ -16,6 +16,7 @@ import {
 import type { VegaConnectDialogProps } from '..';
 import {
  ClientErrors,
+  InjectedConnector,
  JsonRpcConnector,
  RestConnector,
  ViewConnector,
@@ -24,6 +25,12 @@ import {
 import { useEnvironment } from '@vegaprotocol/environment';
 import type { ChainIdQuery } from './__generated__/ChainId';
 import { ChainIdDocument } from './__generated__/ChainId';
+import {
+  mockBrowserWallet,
+  clearBrowserWallet,
+  delayedReject,
+  delayedResolve,
+} from '../test-helpers';

 const mockUpdateDialogOpen = jest.fn();
 const mockCloseVegaDialog = jest.fn();
@@ -49,10 +56,12 @@ const INITIAL_KEY = 'some-key';
 const rest = new RestConnector();
 const jsonRpc = new JsonRpcConnector();
 const view = new ViewConnector(INITIAL_KEY);
+const injected = new InjectedConnector();
 const connectors = {
  rest,
  jsonRpc,
  view,
+  injected,
 };
 beforeEach(() => {
  jest.clearAllMocks();
@@ -105,7 +114,7 @@ describe('VegaConnectDialog', () => {
    expect(screen.getByTestId('connector-jsonRpc')).toHaveTextContent(
      'Connect Vega wallet'
    );
-    expect(screen.getByTestId('connector-hosted')).toHaveTextContent(
+    expect(screen.getByTestId('connector-rest')).toHaveTextContent(
      'Hosted Fairground wallet'
    );
    expect(screen.getByTestId('connector-view')).toHaveTextContent(
@@ -113,6 +122,17 @@ describe('VegaConnectDialog', () => {
    );
  });

+  it('displays browser wallet option if detected on window object', async () => {
+    mockBrowserWallet();
+    render(generateJSX());
+    const list = await screen.findByTestId('connectors-list');
+    expect(list.children).toHaveLength(4);
+    expect(screen.getByTestId('connector-injected')).toHaveTextContent(
+      'Connect Web wallet'
+    );
+    clearBrowserWallet();
+  });
+
  describe('RestConnector', () => {
    it('connects', async () => {
      const spy = jest
@@ -229,17 +249,19 @@ describe('VegaConnectDialog', () => {
    beforeEach(() => {
      spyOnCheckCompat = jest
        .spyOn(connectors.jsonRpc, 'checkCompat')
-        .mockImplementation(() => delayedResolve(true));
+        .mockImplementation(() => delayedResolve(true, delay));
      spyOnGetChainId = jest
        .spyOn(connectors.jsonRpc, 'getChainId')
-        .mockImplementation(() => delayedResolve({ chainID: mockChainId }));
+        .mockImplementation(() =>
+          delayedResolve({ chainID: mockChainId }, delay)
+        );
      spyOnConnectWallet = jest
        .spyOn(connectors.jsonRpc, 'connectWallet')
-        .mockImplementation(() => delayedResolve(null));
+        .mockImplementation(() => delayedResolve(null, delay));
      spyOnConnect = jest
        .spyOn(connectors.jsonRpc, 'connect')
        .mockImplementation(() =>
-          delayedResolve([{ publicKey: 'pubkey', name: 'test key 1' }])
+          delayedResolve([{ publicKey: 'pubkey', name: 'test key 1' }], delay)
        );
    });

@@ -351,18 +373,6 @@ describe('VegaConnectDialog', () => {
      expect(screen.getByText('An unknown error occurred')).toBeInTheDocument();
    });

-    function delayedResolve<T>(result: T): Promise<T> {
-      return new Promise((resolve) => {
-        setTimeout(() => resolve(result), delay);
-      });
-    }
-
-    function delayedReject<T>(result: T): Promise<T> {
-      return new Promise((_, reject) => {
-        setTimeout(() => reject(result), delay);
-      });
-    }
-
    async function selectJsonRpc() {
      expect(await screen.findByRole('dialog')).toBeInTheDocument();
      fireEvent.click(await screen.findByTestId('connector-jsonRpc'));
@@ -439,4 +449,109 @@ describe('VegaConnectDialog', () => {
      });
    });
  });
+
+  describe('InjectedConnector', () => {
+    beforeAll(() => {
+      jest.useFakeTimers();
+    });
+
+    afterAll(() => {
+      jest.useRealTimers();
+      localStorage.clear();
+    });
+
+    afterEach(() => {
+      clearBrowserWallet();
+    });
+
+    it('connects', async () => {
+      const delay = 100;
+      const vegaWindow = {
+        getChainId: jest.fn(() =>
+          delayedResolve({ chainID: mockChainId }, delay)
+        ),
+        connectWallet: jest.fn(() => delayedResolve(null, delay)),
+        disconnectWallet: jest.fn(() => delayedResolve(undefined, delay)),
+        listKeys: jest.fn(() =>
+          delayedResolve(
+            {
+              keys: [{ name: 'test key', publicKey: '0x123' }],
+            },
+            100
+          )
+        ),
+      };
+      mockBrowserWallet(vegaWindow);
+      render(generateJSX());
+      await selectInjected();
+
+      // Chain check
+      expect(screen.getByText('Verifying chain')).toBeInTheDocument();
+      expect(vegaWindow.getChainId).toHaveBeenCalled();
+      await act(async () => {
+        jest.advanceTimersByTime(delay);
+      });
+
+      // Await user connect
+      expect(screen.getByText('Connecting...')).toBeInTheDocument();
+      expect(vegaWindow.connectWallet).toHaveBeenCalled();
+      await act(async () => {
+        jest.advanceTimersByTime(delay);
+      });
+
+      // Connect (list keys)
+      expect(vegaWindow.listKeys).toHaveBeenCalled();
+      await act(async () => {
+        jest.advanceTimersByTime(delay);
+      });
+      expect(screen.getByText('Successfully connected')).toBeInTheDocument();
+
+      await act(async () => {
+        jest.advanceTimersByTime(CLOSE_DELAY);
+      });
+      expect(mockCloseVegaDialog).toHaveBeenCalledWith();
+    });
+
+    it('handles invalid chain', async () => {
+      const delay = 100;
+      const invalidChain = 'invalid chain';
+      const vegaWindow = {
+        getChainId: jest.fn(() =>
+          delayedResolve({ chainID: invalidChain }, delay)
+        ),
+        connectWallet: jest.fn(() => delayedResolve(null, delay)),
+        disconnectWallet: jest.fn(() => delayedResolve(undefined, delay)),
+        listKeys: jest.fn(() =>
+          delayedResolve(
+            {
+              keys: [{ name: 'test key', publicKey: '0x123' }],
+            },
+            100
+          )
+        ),
+      };
+      mockBrowserWallet(vegaWindow);
+      render(generateJSX());
+      await selectInjected();
+
+      // Chain check
+      expect(screen.getByText('Verifying chain')).toBeInTheDocument();
+      expect(vegaWindow.getChainId).toHaveBeenCalled();
+      await act(async () => {
+        jest.advanceTimersByTime(delay);
+      });
+
+      expect(screen.getByText('Wrong network')).toBeInTheDocument();
+      expect(
+        screen.getByText(
+          new RegExp(`set your wallet network in your app to "${mockChainId}"`)
+        )
+      ).toBeInTheDocument();
+    });
+
+    async function selectInjected() {
+      expect(await screen.findByRole('dialog')).toBeInTheDocument();
+      fireEvent.click(await screen.findByTestId('connector-injected'));
+    }
+  });
 });
@@ -3,45 +3,50 @@ import {
  Button,
  Dialog,
  FormGroup,
-  Icon,
  Input,
-  Link,
-  Loader,
+  VegaIcon,
+  VegaIconNames,
 } from '@vegaprotocol/ui-toolkit';
 import { useCallback, useState } from 'react';
 import type { WalletClientError } from '@vegaprotocol/wallet-client';
 import { t } from '@vegaprotocol/i18n';
 import type { VegaConnector } from '../connectors';
+import { InjectedConnector } from '../connectors';
 import { ViewConnector } from '../connectors';
 import { JsonRpcConnector, RestConnector } from '../connectors';
 import { RestConnectorForm } from './rest-connector-form';
 import { JsonRpcConnectorForm } from './json-rpc-connector-form';
-import {
-  Networks,
-  useEnvironment,
-  ExternalLinks,
-} from '@vegaprotocol/environment';
+import { Networks, useEnvironment } from '@vegaprotocol/environment';
 import {
  ConnectDialogContent,
  ConnectDialogFooter,
  ConnectDialogTitle,
 } from './connect-dialog-elements';
-import type { Status } from '../use-json-rpc-connect';
+import type { Status as JsonRpcStatus } from '../use-json-rpc-connect';
+import type { Status as InjectedStatus } from '../use-injected-connector';
 import { useJsonRpcConnect } from '../use-json-rpc-connect';
 import { ViewConnectorForm } from './view-connector-form';
 import { useChainIdQuery } from './__generated__/ChainId';
 import { useVegaWallet } from '../use-vega-wallet';
+import { useInjectedConnector } from '../use-injected-connector';
+import { InjectedConnectorForm } from './injected-connector-form';

 export const CLOSE_DELAY = 1700;
 type Connectors = { [key: string]: VegaConnector };
-type WalletType = 'jsonRpc' | 'hosted' | 'view';
+export type WalletType = 'injected' | 'jsonRpc' | 'rest' | 'view';

 export interface VegaConnectDialogProps {
  connectors: Connectors;
-  onChangeOpen?: (open: boolean) => void;
  riskMessage?: React.ReactNode;
 }

+export interface VegaWalletDialogStore {
+  vegaWalletDialogOpen: boolean;
+  updateVegaWalletDialog: (open: boolean) => void;
+  openVegaWalletDialog: () => void;
+  closeVegaWalletDialog: () => void;
+}
+
 export const useVegaWalletDialogStore = create<VegaWalletDialogStore>()(
  (set) => ({
    vegaWalletDialogOpen: false,
@@ -52,32 +57,20 @@ export const useVegaWalletDialogStore = create<VegaWalletDialogStore>()(
  })
 );

-export interface VegaWalletDialogStore {
-  vegaWalletDialogOpen: boolean;
-  updateVegaWalletDialog: (open: boolean) => void;
-  openVegaWalletDialog: () => void;
-  closeVegaWalletDialog: () => void;
-}
-
 export const VegaConnectDialog = ({
  connectors,
-  onChangeOpen,
  riskMessage,
 }: VegaConnectDialogProps) => {
+  const { disconnect, acknowledgeNeeded } = useVegaWallet();
  const vegaWalletDialogOpen = useVegaWalletDialogStore(
    (store) => store.vegaWalletDialogOpen
  );
  const updateVegaWalletDialog = useVegaWalletDialogStore(
    (store) => (open: boolean) => {
      store.updateVegaWalletDialog(open);
-      onChangeOpen?.(open);
    }
  );
-  const closeVegaWalletDialog = useVegaWalletDialogStore((store) => () => {
-    store.closeVegaWalletDialog();
-    onChangeOpen?.(false);
-  });
-  const { disconnect, acknowledgeNeeded } = useVegaWallet();
+
  const onVegaWalletDialogChange = useCallback(
    (open: boolean) => {
      updateVegaWalletDialog(open);
@@ -88,41 +81,9 @@ export const VegaConnectDialog = ({
    [updateVegaWalletDialog, acknowledgeNeeded, disconnect]
  );

-  const { data, error, loading } = useChainIdQuery();
-
-  const renderContent = () => {
-    if (error) {
-      return (
-        <ConnectDialogContent>
-          <ConnectDialogTitle>
-            {t('Could not retrieve chain id')}
-          </ConnectDialogTitle>
-          <ConnectDialogFooter />
-        </ConnectDialogContent>
-      );
-    }
-
-    if (loading || !data) {
-      return (
-        <ConnectDialogContent>
-          <ConnectDialogTitle>{t('Fetching chain ID')}</ConnectDialogTitle>
-          <div className="flex justify-center items-center my-6">
-            <Loader />
-          </div>
-          <ConnectDialogFooter />
-        </ConnectDialogContent>
-      );
-    }
-
-    return (
-      <ConnectDialogContainer
-        connectors={connectors}
-        closeDialog={closeVegaWalletDialog}
-        appChainId={data.statistics.chainId}
-        riskMessage={riskMessage}
-      />
-    );
-  };
+  // Ensure we have a chain Id so we can compare with wallet chain id.
+  // This value will already be in the cache, if it failed the app wont render
+  const { data } = useChainIdQuery();

  return (
    <Dialog
@@ -130,29 +91,35 @@ export const VegaConnectDialog = ({
      size="small"
      onChange={onVegaWalletDialogChange}
    >
-      {renderContent()}
+      {data && (
+        <ConnectDialogContainer
+          connectors={connectors}
+          appChainId={data.statistics.chainId}
+          riskMessage={riskMessage}
+        />
+      )}
    </Dialog>
  );
 };

 const ConnectDialogContainer = ({
  connectors,
-  closeDialog,
  appChainId,
  riskMessage,
 }: {
  connectors: Connectors;
-  closeDialog: () => void;
  appChainId: string;
  riskMessage?: React.ReactNode;
 }) => {
  const { VEGA_WALLET_URL, VEGA_ENV, HOSTED_WALLET_URL } = useEnvironment();
+  const closeDialog = useVegaWalletDialogStore(
+    (store) => store.closeVegaWalletDialog
+  );
  const [selectedConnector, setSelectedConnector] = useState<VegaConnector>();
  const [walletUrl, setWalletUrl] = useState(VEGA_WALLET_URL || '');
-  const [walletType, setWalletType] = useState<WalletType>();
+
  const reset = useCallback(() => {
    setSelectedConnector(undefined);
-    setWalletType(undefined);
  }, []);

  const delayedOnConnect = useCallback(() => {
@@ -161,52 +128,59 @@ const ConnectDialogContainer = ({
    }, CLOSE_DELAY);
  }, [closeDialog]);

-  const { connect, ...jsonRpcState } = useJsonRpcConnect(delayedOnConnect);
+  const { connect: jsonRpcConnect, ...jsonRpcState } =
+    useJsonRpcConnect(delayedOnConnect);
+  const { connect: injectedConnect, ...injectedState } =
+    useInjectedConnector(delayedOnConnect);

-  const handleSelect = (type: WalletType, isHosted = false) => {
-    let connector;
+  const handleSelect = (type: WalletType) => {
+    const connector = connectors[type];

-    if (isHosted) {
-      // If the user has selected hosted wallet ensure that we are connecting to https://vega-hosted-wallet.on.fleek.co/
-      // otherwise use the default walletUrl or what has been put in the input
-      connector = connectors['rest'];
-      connector.url = HOSTED_WALLET_URL || walletUrl;
-    } else {
-      connector = connectors[type];
-      connector.url = walletUrl;
-    }
+    // If type is rest user has selected the hosted wallet option. So here
+    // we ensure that we are connecting to https://vega-hosted-wallet.on.fleek.co/
+    // otherwise use walletUrl which defaults to the localhost:1789
+    connector.url = type === 'rest' ? HOSTED_WALLET_URL : walletUrl;

    if (!connector) {
+      // we should never get here unless connectors are not configured correctly
      throw new Error(`Connector type: ${type} not configured`);
    }

    setSelectedConnector(connector);
-    setWalletType(type);

    // Immediately connect on selection if jsonRpc is selected, we can't do this
    // for rest because we need to show an authentication form
    if (connector instanceof JsonRpcConnector) {
-      connect(connector, appChainId);
+      jsonRpcConnect(connector, appChainId);
+    } else if (connector instanceof InjectedConnector) {
+      injectedConnect(connector, appChainId);
    }
  };

-  return selectedConnector !== undefined && walletType !== undefined ? (
-    <SelectedForm
-      type={walletType}
-      connector={selectedConnector}
-      jsonRpcState={jsonRpcState}
-      onConnect={closeDialog}
-      appChainId={appChainId}
-      reset={reset}
-      riskMessage={riskMessage}
-    />
-  ) : (
-    <ConnectorList
-      walletUrl={walletUrl}
-      setWalletUrl={setWalletUrl}
-      onSelect={handleSelect}
-      isMainnet={VEGA_ENV === Networks.MAINNET}
-    />
+  return (
+    <>
+      <ConnectDialogContent>
+        {selectedConnector !== undefined ? (
+          <SelectedForm
+            connector={selectedConnector}
+            jsonRpcState={jsonRpcState}
+            injectedState={injectedState}
+            onConnect={closeDialog}
+            appChainId={appChainId}
+            reset={reset}
+            riskMessage={riskMessage}
+          />
+        ) : (
+          <ConnectorList
+            walletUrl={walletUrl}
+            setWalletUrl={setWalletUrl}
+            onSelect={handleSelect}
+            isMainnet={VEGA_ENV === Networks.MAINNET}
+          />
+        )}
+      </ConnectDialogContent>
+      <ConnectDialogFooter connector={selectedConnector} />
+    </>
  );
 };

@@ -216,136 +190,129 @@ const ConnectorList = ({
  setWalletUrl,
  isMainnet,
 }: {
-  onSelect: (type: WalletType, isHosted?: boolean) => void;
+  onSelect: (type: WalletType) => void;
  walletUrl: string;
  setWalletUrl: (value: string) => void;
  isMainnet: boolean;
 }) => {
  return (
    <>
-      <ConnectDialogContent>
-        <ConnectDialogTitle>{t('Connect')}</ConnectDialogTitle>
-        <CustomUrlInput walletUrl={walletUrl} setWalletUrl={setWalletUrl} />
-        <ul data-testid="connectors-list" className="mb-6">
+      <ConnectDialogTitle>{t('Connect')}</ConnectDialogTitle>
+      <CustomUrlInput walletUrl={walletUrl} setWalletUrl={setWalletUrl} />
+      <ul data-testid="connectors-list" className="mb-6">
+        <li className="mb-4 last:mb-0">
+          <ConnectionOption
+            type="jsonRpc"
+            text={t('Connect Vega wallet')}
+            onClick={() => onSelect('jsonRpc')}
+          />
+        </li>
+        {'vega' in window && (
          <li className="mb-4 last:mb-0">
            <ConnectionOption
-              type="jsonRpc"
-              text={t('Connect Vega wallet')}
-              onClick={() => onSelect('jsonRpc')}
+              type="injected"
+              text={t('Connect Web wallet')}
+              onClick={() => onSelect('injected')}
            />
          </li>
-          {!isMainnet && (
-            <li className="mb-4 last:mb-0">
-              <ConnectionOption
-                type="hosted"
-                text={t('Hosted Fairground wallet')}
-                onClick={() => onSelect('hosted', true)}
-              />
-            </li>
-          )}
+        )}
+        {!isMainnet && (
          <li className="mb-4 last:mb-0">
-            <div className="my-4 text-center text-vega-dark-400">{t('OR')}</div>
            <ConnectionOption
-              type="view"
-              text={t('View as vega user')}
-              onClick={() => onSelect('view')}
+              type="rest"
+              text={t('Hosted Fairground wallet')}
+              onClick={() => onSelect('rest')}
            />
          </li>
-        </ul>
-      </ConnectDialogContent>
-      <ConnectDialogFooter />
+        )}
+        <li className="mb-4 last:mb-0">
+          <div className="my-4 text-center">{t('OR')}</div>
+          <ConnectionOption
+            type="view"
+            text={t('View as vega user')}
+            onClick={() => onSelect('view')}
+          />
+        </li>
+      </ul>
    </>
  );
 };

 const SelectedForm = ({
-  type,
  connector,
  appChainId,
  jsonRpcState,
+  injectedState,
  reset,
  onConnect,
  riskMessage,
 }: {
-  type: WalletType;
  connector: VegaConnector;
  appChainId: string;
  jsonRpcState: {
-    status: Status;
+    status: JsonRpcStatus;
    error: WalletClientError | null;
  };
+  injectedState: {
+    status: InjectedStatus;
+    error: Error | null;
+  };
  reset: () => void;
  onConnect: () => void;
  riskMessage?: React.ReactNode;
 }) => {
+  if (connector instanceof InjectedConnector) {
+    return (
+      <InjectedConnectorForm
+        status={injectedState.status}
+        error={injectedState.error}
+        onConnect={onConnect}
+        appChainId={appChainId}
+        reset={reset}
+        riskMessage={riskMessage}
+      />
+    );
+  }
+
  if (connector instanceof RestConnector) {
    return (
      <>
-        <ConnectDialogContent>
-          <button
-            onClick={reset}
-            className="absolute p-2 top-0 left-0 md:top-2 md:left-2"
-            data-testid="back-button"
-          >
-            <Icon name={'chevron-left'} ariaLabel="back" size={4} />
-          </button>
-          <ConnectDialogTitle>{t('Connect')}</ConnectDialogTitle>
-          <div className="mb-2">
-            <RestConnectorForm connector={connector} onConnect={onConnect} />
-          </div>
-        </ConnectDialogContent>
-        {type === 'hosted' ? (
-          <ConnectDialogFooter>
-            <p className="text-center">
-              {t('For demo purposes get a ')}
-              <Link
-                href={ExternalLinks.VEGA_WALLET_HOSTED_URL}
-                target="_blank"
-                rel="noreferrer"
-              >
-                {t('hosted wallet')}
-              </Link>
-              {t(', or for the real experience create a wallet in the ')}
-              <Link href={ExternalLinks.VEGA_WALLET_URL}>
-                {t('Vega wallet app')}
-              </Link>
-            </p>
-          </ConnectDialogFooter>
-        ) : (
-          <ConnectDialogFooter />
-        )}
+        <button
+          onClick={reset}
+          className="absolute p-2 top-0 left-0 md:top-2 md:left-2"
+          data-testid="back-button"
+        >
+          <VegaIcon name={VegaIconNames.CHEVRON_LEFT} />
+        </button>
+        <ConnectDialogTitle>{t('Connect')}</ConnectDialogTitle>
+        <div className="mb-2">
+          <RestConnectorForm connector={connector} onConnect={onConnect} />
+        </div>
      </>
    );
  }

  if (connector instanceof JsonRpcConnector) {
    return (
-      <ConnectDialogContent>
-        <JsonRpcConnectorForm
-          connector={connector}
-          status={jsonRpcState.status}
-          error={jsonRpcState.error}
-          onConnect={onConnect}
-          appChainId={appChainId}
-          reset={reset}
-          riskMessage={riskMessage}
-        />
-      </ConnectDialogContent>
+      <JsonRpcConnectorForm
+        connector={connector}
+        status={jsonRpcState.status}
+        error={jsonRpcState.error}
+        onConnect={onConnect}
+        appChainId={appChainId}
+        reset={reset}
+        riskMessage={riskMessage}
+      />
    );
  }

  if (connector instanceof ViewConnector) {
    return (
-      <>
-        <ConnectDialogContent>
-          <ViewConnectorForm
-            connector={connector}
-            onConnect={onConnect}
-            reset={reset}
-          />
-        </ConnectDialogContent>
-        <ConnectDialogFooter />
-      </>
+      <ViewConnectorForm
+        connector={connector}
+        onConnect={onConnect}
+        reset={reset}
+      />
    );
  }

@@ -366,12 +333,12 @@ const ConnectionOption = ({
      onClick={onClick}
      size="lg"
      fill={true}
-      variant={['hosted', 'view'].includes(type) ? 'default' : 'primary'}
+      variant={['rest', 'view'].includes(type) ? 'default' : 'primary'}
      data-testid={`connector-${type}`}
    >
-      <span className="-mx-6 flex text-left justify-between items-center">
+      <span className="-mx-10 flex text-left justify-between items-center">
        {text}
-        <Icon name="chevron-right" />
+        <VegaIcon name={VegaIconNames.ARROW_RIGHT} />
      </span>
    </Button>
  );
@@ -387,9 +354,7 @@ const CustomUrlInput = ({
  const [urlInputExpanded, setUrlInputExpanded] = useState(false);
  return urlInputExpanded ? (
    <>
-      <p className="mb-2 text-neutral-600 dark:text-neutral-400">
-        {t('Custom wallet location')}
-      </p>
+      <p className="mb-2">{t('Custom wallet location')}</p>
      <FormGroup
        labelFor="wallet-url"
        label={t('Custom wallet location')}
@@ -401,12 +366,10 @@ const CustomUrlInput = ({
          name="wallet-url"
        />
      </FormGroup>
-      <p className="mb-2 text-neutral-600 dark:text-neutral-400">
-        {t('Choose wallet app to connect')}
-      </p>
+      <p className="mb-2">{t('Choose wallet app to connect')}</p>
    </>
  ) : (
-    <p className="mb-6 text-neutral-600 dark:text-neutral-400">
+    <p className="mb-6">
      {t(
        'Choose wallet app to connect, or to change port or server URL enter a '
      )}
@@ -0,0 +1,153 @@
+import { t } from '@vegaprotocol/i18n';
+import { Status } from '../use-injected-connector';
+import { ConnectDialogTitle } from './connect-dialog-elements';
+import type { ReactNode } from 'react';
+import {
+  Button,
+  ButtonLink,
+  Diamond,
+  Loader,
+  Tick,
+} from '@vegaprotocol/ui-toolkit';
+import { setAcknowledged } from '../storage';
+import { useVegaWallet } from '../use-vega-wallet';
+
+export const InjectedConnectorForm = ({
+  status,
+  onConnect,
+  riskMessage,
+  appChainId,
+  reset,
+  error,
+}: {
+  // connector: JsonRpcConnector;
+  appChainId: string;
+  status: Status;
+  error: Error | null;
+  onConnect: () => void;
+  reset: () => void;
+  riskMessage?: React.ReactNode;
+}) => {
+  const { disconnect } = useVegaWallet();
+
+  if (status === Status.Idle) {
+    return null;
+  }
+
+  if (status === Status.Error) {
+    return <Error error={error} appChainId={appChainId} onTryAgain={reset} />;
+  }
+
+  if (status === Status.GettingChainId) {
+    return (
+      <>
+        <ConnectDialogTitle>{t('Verifying chain')}</ConnectDialogTitle>
+        <Center>
+          <Loader />
+        </Center>
+      </>
+    );
+  }
+
+  if (status === Status.Connected) {
+    return (
+      <>
+        <ConnectDialogTitle>{t('Successfully connected')}</ConnectDialogTitle>
+        <Center>
+          <Tick />
+        </Center>
+      </>
+    );
+  }
+
+  if (status === Status.Connecting) {
+    return (
+      <>
+        <ConnectDialogTitle>{t('Connecting...')}</ConnectDialogTitle>
+        <Center>
+          <Diamond />
+        </Center>
+        <p className="text-center">
+          {t(
+            "Approve the connection from your Vega wallet app. If you have multiple wallets you'll need to choose which to connect with."
+          )}
+        </p>
+      </>
+    );
+  }
+
+  if (status === Status.AcknowledgeNeeded) {
+    const setConnection = () => {
+      setAcknowledged();
+      onConnect();
+    };
+    const handleDisagree = () => {
+      disconnect();
+      onConnect(); // this is dialog closing
+    };
+    return (
+      <>
+        <ConnectDialogTitle>{t('Understand the risk')}</ConnectDialogTitle>
+        {riskMessage}
+        <div className="grid grid-cols-2 gap-5">
+          <div>
+            <Button onClick={handleDisagree} fill>
+              {t('Cancel')}
+            </Button>
+          </div>
+          <div>
+            <Button onClick={setConnection} variant="primary" fill>
+              {t('I agree')}
+            </Button>
+          </div>
+        </div>
+      </>
+    );
+  }
+  return null;
+};
+
+const Center = ({ children }: { children: ReactNode }) => {
+  return (
+    <div className="flex justify-center items-center my-6">{children}</div>
+  );
+};
+
+const Error = ({
+  error,
+  appChainId,
+  onTryAgain,
+}: {
+  error: Error | null;
+  appChainId: string;
+  onTryAgain: () => void;
+}) => {
+  let title = t('Something went wrong');
+  let text: ReactNode | undefined = t('An unknown error occurred');
+  const tryAgain: ReactNode | null = (
+    <p className="text-center">
+      <ButtonLink onClick={onTryAgain}>{t('Try again')}</ButtonLink>
+    </p>
+  );
+
+  if (error) {
+    if (error.message === 'Invalid chain') {
+      title = t('Wrong network');
+      text = t(
+        'To complete your wallet connection, set your wallet network in your app to "%s".',
+        appChainId
+      );
+    } else if (error.message === 'window.vega not found') {
+      title = t('No wallet detected');
+      text = t('Vega browser extension not installed');
+    }
+  }
+
+  return (
+    <>
+      <ConnectDialogTitle>{title}</ConnectDialogTitle>
+      <p className="text-center mb-2 first-letter:uppercase">{text}</p>
+      {tryAgain}
+    </>
+  );
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
gordsport	a213632794	chore: update the PM action secret token	2023-07-13 20:53:48 +01:00
Mikołaj Młodzikowski	edbdbcf38e	feat(ci): provide fixes for releasing individual apps	2023-07-13 16:10:07 +02:00
Mikołaj Młodzikowski	94a067e34b	fix(ci): disable pull_request_target (#4315 )	2023-07-13 11:19:37 +02:00
Joe Tsang	8b6b904cd6	test(governance): un-skip governance tests (#4292 )	2023-07-13 10:10:48 +01:00
Mikołaj Młodzikowski	27cd8086e1	fix(ci): syntax on switch case	2023-07-12 17:47:46 +02:00
Mikołaj Młodzikowski	6aa109131e	feat(ci): allow individual releases of the applications (#4300 )	2023-07-12 17:37:49 +02:00
Ben	74777e54f9	chore(ci): revert run console-test on CICD (#4303 )	2023-07-12 16:26:52 +01:00
Ben	61e7450906	feat(trading): run console-test on CICD (#4271 )	2023-07-12 12:06:48 +01:00
Matthew Russell	6a55319e04	feat(trading,governance,wallet): browser wallet integration (#4121 )	2023-07-12 11:34:42 +01:00
Matthew Russell	5692d4e74c	Merge branch 'develop' of github.com:vegaprotocol/frontend-monorepo into develop	2023-07-12 11:01:22 +01:00
Maciek	ffe89d0fe0	feat(trading): add market banner for successor markets (#4269 )	2023-07-12 11:20:01 +02:00
Matthew Russell	57e1ecac6c	chore(trading): release v0.20.21-core-0.71.6	2023-07-12 09:01:59 +01:00
daro-maj	77e1390686	test(trading): fix capsule place order test (#4286 )	2023-07-12 08:54:40 +01:00
Matthew Russell	981c8649a2	fix(trading): replace oracle details and deal ticket pink with red (#4284 )	2023-07-11 14:26:24 +01:00
Bartłomiej Głownia	501ffbfc80	chore(trading): ignore parse source map warnings, fix trading readme (#4252 )	2023-07-11 10:41:54 +01:00
Mikołaj Młodzikowski	f391e8c351	fix(ci): add different settings to curl and print preview link	2023-07-10 15:53:38 +02:00
Edd	0e10b2108e	chore(explorer): update block explorer types for 72 (#4275 )	2023-07-10 14:12:12 +01:00
Bartłomiej Głownia	162a934408	feat(trading): amend market red and green colors (#4226 )	2023-07-07 14:52:38 +02:00
Joe Tsang	4581e117c4	test(cypress): clean up nx todos (#4273 )	2023-07-07 09:23:27 +01:00
Bartłomiej Głownia	e89b818e4c	feat(orders): reduce number of columns in orders table (#4238 )	2023-07-06 17:57:29 +02:00
daro-maj	0665ac85db	test(trading): add withdrawal delayed (#4268 )	2023-07-06 15:49:02 +02:00
Joe Tsang	3c71a86b48	chore(governance): skip test (#4263 )	2023-07-06 09:40:57 +01:00
Art	b381f16ace	fix(announcements): remember dismissed announcement (#4255 )	2023-07-05 16:59:22 +02:00